Changeset 79990 in vbox

Timestamp:

Jul 26, 2019 2:24:32 AM (6 years ago)

Author:

vboxsync

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

132424

Message:

Installer/win/: Prep for disabling raw-mode on windows. bugref:9517

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -623 +623 @@
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
+                -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
@@ -767 +768 @@
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
+                -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \

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

@@ -303 +303 @@
               Source="$(env.PATH_OUT)\bin\VBoxRes.dll" />
 
+<?if $(env.VBOX_WITH_RAW_MODE) = "yes" ?>
         <File Id="file_VMMRC.rc" Name="VMMRC.rc"
               Source="$(env.PATH_OUT)\bin\VMMRC.rc" />
         <File Id="file_VBoxDDRC.rc" Name="VBoxDDRC.rc"
               Source="$(env.PATH_OUT)\bin\VBoxDDRC.rc" />
+<?endif ?>
 
         <File Id="file_VMMR0.r0" Name="VMMR0.r0"