Changeset 42220 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

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

Author:

vboxsync

Message:

More VS2010 preps.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -76 +76 @@
  VirtualBox_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
 endif
-VirtualBox_SDKS.win = WINPSDK DXSDK
+VirtualBox_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) DXSDK
 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd os2) # X11 + os2 ## @todo solaris
  VirtualBox_SDKS += LIBSDL
@@ -217 +217 @@
 
 VirtualBox_LIBS.win       = \
-        $(PATH_SDK_WINPSDK_LIB)/Htmlhelp.Lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
         $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
@@ -225 +225 @@
 
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
- VirtualBox_LIBS.win       += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
+ VirtualBox_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
  VirtualBox_LIBS.solaris   += GL
  VirtualBox_LIBS.linux     += GL