Changeset 42154 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Jul 13, 2012 11:00:53 PM (13 years ago)

Author:

vboxsync

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

79125

Message:

VS2010 preps.

Location:

trunk/src/VBox/Installer/win

Files:

• InstallHelper/Makefile.kmk (modified) (1 diff)
• Stub/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

@@ -34 +34 @@
  VBoxInstallHelper_SOURCES += internal/VBoxSerial.cpp
 endif
-VBoxInstallHelper_SDKS     = WINPSDK W2K3DDK
-VBoxInstallHelper_LIBS     = $(PATH_SDK_W2K3DDK_LIB)/Msi.lib
+VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
+ VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
+else
+ VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
+endif
 ifdef VBOX_WITH_NETFLT
  VBoxInstallHelper_LIBS   += \
         $(PATH_STAGE_LIB)/WinNetConfig.lib \
         $(PATH_STAGE_LIB)/VBoxDrvCfg.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/Newdev.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
-        $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
 endif
 

trunk/src/VBox/Installer/win/Stub/Makefile.kmk

@@ -34 +34 @@
 VBoxStub_SDKS += \
         VBOX_NTDLL
+if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
 VBoxStub_LIBS = \
         $(VBOX_LIB_RUNTIME_STATIC) \
-        $(PATH_SDK_W2K3DDK_LIB)\Msi.lib
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
+else
+VBoxStub_LIBS = \
+        $(VBOX_LIB_RUNTIME_STATIC) \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
+endif
 
 VBoxStub.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)