Changeset 93067 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 23, 2021 1:14:12 PM (3 years ago)

Author:

vboxsync

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

149074

Message:

VBoxHeadless,VirtualBoxVM: Picked the wrong binary for the NEM fallback mode, it belongs to the hardened stub of course and not the dylib loaded later on..., bugref:9044 bugref:10138

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/Makefile.kmk (modified) (2 diffs)
• VirtualBox/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

@@ -27 +27 @@
 PROGRAMS += VBoxHeadlessHardened
 VBoxHeadlessHardened_TEMPLATE = VBOXR3HARDENEDEXE
+VBoxHeadlessHardened_DEFS    += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
 VBoxHeadlessHardened_SOURCES = VBoxHeadlessHardened.cpp
 VBoxHeadlessHardened_NAME = VBoxHeadless
@@ -42 +43 @@
 endif
 VBoxHeadless_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
-VBoxHeadless_DEFS     += \
-        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \
-        $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
+VBoxHeadless_DEFS     += $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,)
 VBoxHeadless_INCS      = \
         $(VBOX_GRAPHICS_INCS) \

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -57 +57 @@
 VirtualBoxHardenedVM_INST.darwin = $(INST_VIRTUALBOX)Contents/Resources/VirtualBoxVM.app/Contents/MacOS/
 VirtualBoxHardenedVM_NAME = VirtualBoxVM
+VirtualBoxHardenedVM_DEFS += $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
 VirtualBoxHardenedVM_SOURCES = src/hardenedmain.cpp
 VirtualBoxHardenedVM_LDFLAGS.win = /SUBSYSTEM:$(if-expr "$(KBUILD_TYPE)" != "release",console,windows)
@@ -181 +182 @@
         $(if $(VBOX_GUI_WITH_CUSTOMIZATIONS1),VBOX_GUI_WITH_CUSTOMIZATIONS1) \
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
-        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
-        $(if $(VBOX_WITH_DRIVERLESS_NEM_FALLBACK),VBOX_WITH_DRIVERLESS_NEM_FALLBACK,)
+        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_DEBUGGER_GUI
  VirtualBoxVM_DEFS          += VBOX_WITH_DEBUGGER_GUI