Changeset 99213 in vbox for trunk/src/VBox/Additions/3D/Config.kmk

Timestamp:

Mar 29, 2023 8:26:03 PM (21 months ago)

Author:

vboxsync

Message:

Add/3D/Config.kmk: Fix for linking regression from r156294, where VBOX_LIB_VBGL_R3_SHARED(_X86) got into the LIBS list of the parent template. This breaks VBoxNine and others using VBoxMesa3DGuestR3DllMinVista, because they have to provide their own version of some of the stuff in there due to CreateFile and friends being off limits in some of the execution contexts. bugref:10348

File:

• trunk/src/VBox/Additions/3D/Config.kmk (modified) (5 diffs)

trunk/src/VBox/Additions/3D/Config.kmk

@@ -39 +39 @@
 VBOX_PATH_VMSVGA_INC := $(VBOX_PATH_MESA)/src/gallium/drivers/svga/include
 
+
 #
 # Base template for Mesa3D code and code which uses Mesa3D libraries.
@@ -45 +46 @@
 TEMPLATE_VBoxMesa3DGuestR3Dll_EXTENDS  = NewerVccVBoxGuestR3Dll
 TEMPLATE_VBoxMesa3DGuestR3Dll_INST     = $(INST_ADDITIONS)
+TEMPLATE_VBoxMesa3DGuestR3Dll_SDKS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) $(VBOX_WINDDK_GST_W8)
 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
         VBOX_WITH_MESA3D
 ifdef VBOX_WITH_VMSVGA
- TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS   += \
-        VBOX_WITH_VMSVGA
- # treat as error: warning C4013: 'close' undefined; assuming extern returning int
- TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS  = $(TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS) -we4013
+ TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS   += VBOX_WITH_VMSVGA
 endif
-TEMPLATE_VBoxMesa3DGuestR3Dll_SDKS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \
-        $(VBOX_WINDDK_GST_W8)
 # VirtualBox specific modifications of the Mesa3D code.
 # All modified places can be found by searching for VBOX
@@ -96 +93 @@
         WINAPI=__stdcall \
         _WIN32
+ifdef VBOX_WITH_VMSVGA
+ # treat as error: warning C4013: 'close' undefined; assuming extern returning int
+ TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS  = $(TEMPLATE_NewerVccVBoxGuestR3Dll_CFLAGS) -we4013
+endif
 TEMPLATE_VBoxMesa3DGuestR3Dll_INCS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \
         $(VBOX_PATH_MESA)/include \
@@ -105 +106 @@
         $(VBOX_PATH_3D)/win/VBoxWddmUmHlp
 ifdef VBOX_WITH_NOCRT_STATIC # Only the softfloat libs are added here as mesa includes a softfloat.h and we wish for no conflicts.
- TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.x86 += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86) \
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.x86 = \
+        $(filter-out $(VBOX_LIB_VBGL_R3_SHARED_X86),$(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86)) \
         $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
         $(SDK_VBoxSoftFloatGuestR3Shared_LIBS.x86)
- TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.$(KBUILD_TARGET_ARCH) += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.$(KBUILD_TARGET)) \
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.$(KBUILD_TARGET_ARCH) = \
+        $(filter-out $(VBOX_LIB_VBGL_R3_SHARED),$(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.$(KBUILD_TARGET))) \
         $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
         $(SDK_VBoxSoftFloatGuestR3Shared_LIBS.$(KBUILD_TARGET_ARCH))
@@ -126 +129 @@
 endif
 
+
 #
 # Variant of VBoxMesa3DGuestR3Dll that requires Windows Vista or later.