Changeset 51098 in vbox for trunk/src

Timestamp:

Apr 17, 2014 1:40:41 PM (11 years ago)

Author:

vboxsync

Message:

Build fix.

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (2 diffs)

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

@@ -328 +328 @@
 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi: \
                 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixobj \
-                $(if $(VBOX_WITH_MSM_INSTALL), \
-                        $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                                $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
-                                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm)),)
                 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
                 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
@@ -580 +576 @@
 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj: \
                         $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxs \
+                        $(PATH_SUB_CURRENT)/UserInterface.wxi \
+                        $(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 \