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

Timestamp:

Apr 11, 2014 9:23:43 AM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Fixed building if VBOX_WITH_QTGUI is not defined.

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -125 +125 @@
         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.wixobj.dep \
         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
-        $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
+        $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
         $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
@@ -490 +490 @@
                                 $(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 \
+                                $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
                                 $(VBOX_MSI_DEPENDENCIES)) \
                         $(VBOX_VERSION_STAMP) \
@@ -581 +581 @@
                         $(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 \
+                        $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
                         $(VBOX_MSI_DEPENDENCIES) \
                         $(VBOX_VERSION_STAMP) \
@@ -769 +769 @@
                         -target-amd64 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \
                         $(if $(VBOX_WITH_MSM_INSTALL),,-target-all $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)) \
-                        -stub $(PATH_STAGE_BIN)/VBoxStub.exe)
+                        -stub $(PATH_STAGE_BIN)/VBoxStub.exe
         $(call VBOX_SIGN_FILE_FN,$@)
 endif

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

@@ -44 +44 @@
     </Directory> <!-- Directory "drivers" -->
 
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
     <!-- National Language Support directory -->
     <Directory Id="dir_VBoxAppNLS" Name="nls">
@@ -51 +52 @@
         </Component>
     </Directory>
+<?endif ?>
 
 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>

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

@@ -290 +290 @@
         <ComponentRef Id="cp_Docs" />
     <?endif ?>
+    <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <ComponentRef Id="cp_NLS" />
+    <?endif ?>
     <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
         <ComponentRef Id="cp_MainCOM_x86" />