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

Timestamp:

May 17, 2018 5:37:09 PM (7 years ago)

Author:

vboxsync

Message:

Installer/Windows: bugref:9049: Support for split GUI functionality.

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -598 +598 @@
                 -E 'VBOX_WITH_SDS=$(if $(VBOX_WITH_SDS),yes,no)' \
                 -E 'VBOX_WITH_UNATTENDED=$(if $(VBOX_WITH_UNATTENDED),yes,no)' \
+                -E 'VBOX_GUI_WITH_SHARED_LIBRARY=$(if $(VBOX_GUI_WITH_SHARED_LIBRARY),yes,no)' \
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \

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

@@ -326 +326 @@
               Source="$(env.PATH_OUT)\bin\VirtualBox.exe">
         </File>
-    <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
-        <File Id="file_VirtualBox.dll" Name="VirtualBox.dll"
-              Source="$(env.PATH_OUT)\bin\VirtualBox.dll">
-        </File>
-    <?endif ?>
+        <?if $(env.VBOX_GUI_WITH_SHARED_LIBRARY) = "yes" ?>
+                <File Id="file_VirtualBoxVM.exe" Name="VirtualBoxVM.exe"
+                    Source="$(env.PATH_OUT)\bin\VirtualBoxVM.exe">
+                </File>
+                <File Id="file_VBoxGlobal.dll" Name="VBoxGlobal.dll"
+                    Source="$(env.PATH_OUT)\bin\VBoxGlobal.dll">
+                </File>
+        <?endif ?>
+        <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+            <?if $(env.VBOX_GUI_WITH_SHARED_LIBRARY) = "yes" ?>
+                <File Id="file_VirtualBoxVM.dll" Name="VirtualBoxVM.dll"
+                    Source="$(env.PATH_OUT)\bin\VirtualBoxVM.dll">
+                </File>
+            <?else ?>
+                <File Id="file_VirtualBox.dll" Name="VirtualBox.dll"
+                    Source="$(env.PATH_OUT)\bin\VirtualBox.dll">
+                </File>
+            <?endif ?>
+        <?endif ?>
         <File Id="file_Qt5Core$(var.VBOX_QT_INFIX).dll" Name="Qt5Core$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt5Core$(var.VBOX_QT_INFIX).dll" />