Changeset 52773 in vbox for trunk/src/VBox/Installer

Timestamp:

Sep 17, 2014 11:57:32 AM (11 years ago)

Author:

vboxsync

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

96148

Message:

Windows installer: moved setting VBOX_WITH_MSM_INSTALL to the global Config.kmk

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (1 diff)

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

@@ -52 +52 @@
 VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
 VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
-
-#
-# Use merge modules if we're not doing an official release.
-# This will increase the overall installer size significantly because
-# merge modules are not able to use a common .cab file to reduce their
-# size.
-#
-ifneq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
- VBOX_WITH_MSM_INSTALL := 1
- VBOX_INSTALLER_LANGUAGES = en_US
-endif
-
-ifeq ($(USERNAME),andy)
- VBOX_WITH_MSM_INSTALL := 1
- VBOX_INSTALLER_LANGUAGES = en_US
-endif
 
 #