Changeset 106894 in vbox for trunk/src/VBox/VMM/Makefile.kmk

Timestamp:

Nov 8, 2024 3:54:02 PM (2 months ago)

Author:

vboxsync

Message:

VMM: Only the ring-0 import lib is needed in only-builds (e.g. extpack), since the VBoxVMM can have multiple variants is accessed via a function table. VBP-1447

File:

• trunk/src/VBox/VMM/Makefile.kmk (modified) (8 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -35 +35 @@
 
 # Include sub-makefiles.
-ifndef VBOX_ONLY_EXTPACKS
+ifndef VBOX_ONLY_BUILD
  include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
@@ -56 +56 @@
 # The VMM DLL.
 #
-ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+ifndef VBOX_ONLY_BUILD
  DLLS += VBoxVMM
 endif
@@ -382 +382 @@
  # The VMM DLL - ARMv8 variant.
  #
- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+ ifndef VBOX_ONLY_BUILD
   DLLS += VBoxVMMArm
  endif
@@ -769 +769 @@
 endif # VBOX_WITH_IEM_RECOMPILER
 
-if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
+if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_BUILD)
  #
  # Debug type info hack for VMCPU, VM and similar.
@@ -826 +826 @@
 
 
-#
-# VMMR3Imp.lib
-#
-IMPORT_LIBS += VMMR3Imp
-$(call VBOX_GENERATE_IMPORT_TARGET_FN,VMMR3Imp,VBoxVMM,VMMR3/VMMR3.def)
+##
+## VMMR3Imp.lib - obsolete.
+##
+#IMPORT_LIBS += VMMR3Imp
+#$(call VBOX_GENERATE_IMPORT_TARGET_FN,VMMR3Imp,VBoxVMM,VMMR3/VMMR3.def)
 
 
@@ -836 +836 @@
 # VMMR0.r0
 #
-if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_EXTPACKS)
+if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
  ifdef VBOX_WITH_VBOXR0_AS_DLL
   DLLS    += VMMR0
@@ -1034 +1034 @@
  endif
 
-endif # defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_EXTPACKS)
-
-
-
-ifndef VBOX_ONLY_EXTPACKS
+endif # defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_ONLY_BUILD)
+
+
+
+ifndef VBOX_ONLY_BUILD
  #
  # SSMStandalone.lib/a for linking with VBoxSVC and other executables.
@@ -1049 +1049 @@
         VMMR3/SSM.cpp \
         VMMR3/CPUMR3Db.cpp
-endif # !VBOX_ONLY_EXTPACKS
-
-
-if   !defined(VBOX_ONLY_EXTPACKS) \
+endif # !VBOX_ONLY_BUILD
+
+
+if   !defined(VBOX_ONLY_BUILD) \
   && (   defined(VBOX_WITH_DTRACE_R3) \
       || defined(VBOX_WITH_DTRACE_R0) \