Changeset 42291 in vbox

Timestamp:

Jul 20, 2012 6:47:09 PM (13 years ago)

Author:

vboxsync

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

79350

Message:

2nd build fix attempt.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBox.wxs (modified) (2 diffs)

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

@@ -451 +451 @@
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
-                -E 'VBOX_USE_$(VBOX_VCC_TOOL_STEM)=yes' \
+                -E 'VBOX_VCC_TOOL_STEM=$(VBOX_VCC_TOOL_STEM)' \
                 -- \
                 $(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -527 +527 @@
 <?endif?>
 
-<?if $(env.VBOX_USE_VCC100) = "yes" ?>
+<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
                         <!-- MS C/C++ v10.0 Runtime DLL files. -->
                         <File Id="file_msvcr100.dll" Name="msvcr100.dll"
@@ -534 +534 @@
                               Source="$(env.PATH_OUT)\bin\msvcp100.dll" />
 <?endif?>
-<?if $(env.VBOX_USE_VCC110) = "yes" ?>
+<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
                         <!-- MS C/C++ v11.0 Runtime DLL files. -->
                         <File Id="file_msvcr110.dll" Name="msvcr110.dll"