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

Timestamp:

Apr 9, 2014 8:55:05 PM (11 years ago)

Author:

vboxsync

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

93229

Message:

Build fix.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxMergeApp.wxi (modified) (3 diffs)

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

@@ -459 +459 @@
 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixobj: \
                         $(PATH_SUB_CURRENT)/VirtualBox.wxs \
+                        $(PATH_SUB_CURRENT)/UserInterface.wxi \
                         $(if $(VBOX_WITH_MSM_INSTALL), \
                                 $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
                                         $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm), \
+                                $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
+                                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
+                                $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                                 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
-                                $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
-                                $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi) \
+                                $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
                         $(VBOX_VERSION_STAMP) \
                         | $$$$(dir $$$$@)

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -65 +65 @@
             </File>
             <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
-<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
+    <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
             <!-- MS C/C++ v10.0 32 bit Runtime DLL files. -->
             <File Id="file_msvcr100.dll_x86" Name="msvcr100.dll"
@@ -73 +73 @@
                   Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll"
                   DiskId="$(var.Property_DiskIdCommon)" />
-<?endif?>
-<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
+    <?endif?>
+    <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
             <!-- MS C/C++ v11.0 Runtime DLL files. -->
             <File Id="file_msvcr110.dll_x86" Name="msvcr110.dll"
@@ -82 +82 @@
                   Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"
                   DiskId="$(var.Property_DiskIdCommon)" />
-<?endif?>
+    <?endif?>
         </Component>
     </Directory>