Changeset 42220 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 19, 2012 1:11:05 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79238

Message:

More VS2010 preps.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -296 +296 @@
   VBoxTestOGL_SOURCES = OpenGLTest/OpenGLTestApp.cpp
   VBoxTestOGL_LIBS = \
-    $(if $(VBOX_WITH_CROGL), \
-      $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
-      $(VBOX_LIB_OGL_HOSTCRUTIL),) \
-    $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
-    $(LIB_RUNTIME)
+        $(if $(VBOX_WITH_CROGL), \
+            $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
+            $(VBOX_LIB_OGL_HOSTCRUTIL),) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
+        $(LIB_RUNTIME)
   VBoxTestOGL_DEFS += \
+    VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
     $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
     $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,) \
-    VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \
     $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
   ifdef VBOX_WITH_VIDEOHWACCEL
-   VBoxTestOGL_QT_MODULES += Core Gui OpenGL
+   VBoxTestOGL_QT_MODULES     += Core Gui OpenGL
    VBoxTestOGL_LDFLAGS.darwin += -framework OpenGL
-   VBoxTestOGL_LIBS.win += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+   VBoxTestOGL_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    if1of ($(KBUILD_TARGET), solaris linux freebsd)
     # must come after VBoxOGL2D, therefore don't set the arch-specific LIBS variable here!