Changeset 106986 in vbox for trunk/src/VBox/Installer/win/Makefile.kmk

Timestamp:

Nov 13, 2024 1:12:38 PM (3 months ago)

Author:

vboxsync

Message:

Installer/win: ARM64 adjustments. jiraref:VBP-1442

File:

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

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

@@ -524 +524 @@
         -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
         -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
+        -E 'VBOX_WITH_ORACLE_QT=$(if $(VBOX_WITH_ORACLE_QT),yes,no)' \
+        -E 'VBOX_WITH_R0_MODULES=$(if $(VBOX_WITH_R0_MODULES),yes,no)' \
+        -E 'VBOX_WITH_MINIMAL_R0=$(if $(VBOX_WITH_MINIMAL_R0),yes,no)' \
         -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
         -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
@@ -719 +722 @@
                         $(VBOX_WIN_INST_REPACK_DIR)/ $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )
         $(QUIET)$(RM) -f -- "$$@"  "$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixlib" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wixlib"
+## @todo r=bird: Wtf do we duplicate most/all of VBOX_WIN_INST_ENV here?
         $(REDIRECT) \
                 -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \
@@ -774 +778 @@
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
                 -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
+                -E 'VBOX_WITH_ORACLE_QT=$(if $(VBOX_WITH_ORACLE_QT),yes,no)' \
+                -E 'VBOX_WITH_R0_MODULES=$(if $(VBOX_WITH_R0_MODULES),yes,no)' \
+                -E 'VBOX_WITH_MINIMAL_R0=$(if $(VBOX_WITH_MINIMAL_R0),yes,no)' \
                 -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
@@ -836 +843 @@
                 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/
         $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix"
+## @todo r=bird: Wtf do we duplicate most/all of VBOX_WIN_INST_ENV here?  This stuff is surely out of sync.
         $(REDIRECT) \
                 -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \