Changeset 98195 in vbox for trunk/src

Timestamp:

Jan 22, 2023 12:46:54 AM (2 years ago)

Author:

vboxsync

Message:

Add/common/*.kmk: s/NewVBoxGuestR3Exe/VBoxGuestR3Exe/ bugref:10348

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxControl/Makefile.kmk (modified) (1 diff)
• VBoxService/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk

@@ -36 +36 @@
 #
 PROGRAMS += VBoxControl
-if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) ## @todo use VBoxGuestR3Exe everywhere
 VBoxControl_TEMPLATE = VBoxGuestR3Exe
-else
-VBoxControl_TEMPLATE = NewVBoxGuestR3Exe
-endif
 if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) # (See the main Windows Additions makefile.)
  VBoxControl_INSTTYPE = none

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -34 +34 @@
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 
+
 #
 # Target lists.
@@ -39 +40 @@
 PROGRAMS += VBoxService
 
+
+#
+# Globals?
+#
 # Enable the timesync service within VBoxService.
 VBOX_WITH_VBOXSERVICE_TIMESYNC      := 1
@@ -78 +83 @@
 endif
 
+
 #
 # VBoxService
 #
-if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) ## @todo use VBoxGuestR3Exe everywhere
 VBoxService_TEMPLATE      = VBoxGuestR3Exe
-else
-VBoxService_TEMPLATE      = NewVBoxGuestR3Exe
-endif
-
-# Define features to be activate.
-VBoxService_DEFS         += \
+
+VBoxService_DEFS          = \
         $(if $(VBOX_WITH_VBOXSERVICE_CONTROL),VBOX_WITH_VBOXSERVICE_CONTROL,) \
         $(if $(VBOX_WITH_VBOXSERVICE_CPUHOTPLUG),VBOX_WITH_VBOXSERVICE_CPUHOTPLUG,) \
@@ -96 +97 @@
         $(if $(VBOX_WITH_VBOXSERVICE_TIMESYNC),VBOX_WITH_VBOXSERVICE_TIMESYNC,) \
         $(if $(VBOX_WITH_VBOXSERVICE_TOOLBOX),VBOX_WITH_VBOXSERVICE_TOOLBOX,) \
-        $(if $(VBOX_WITH_VBOXSERVICE_VMINFO),VBOX_WITH_VBOXSERVICE_VMINFO,)
-
-# Import global defines.
-VBoxService_DEFS         += \
+        $(if $(VBOX_WITH_VBOXSERVICE_VMINFO),VBOX_WITH_VBOXSERVICE_VMINFO,) \
         $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
-
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
 VBoxService_DEFS         += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"