Changeset 95994 in vbox

Timestamp:

Aug 3, 2022 9:26:34 AM (2 years ago)

Author:

vboxsync

Message:

Add/3D/Config.kmk: VBOX_WITH_NOCRT_STATIC mode adjustments. bugref:10261

File:

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

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

@@ -34 +34 @@
 TEMPLATE_VBoxMesa3DGuestR3Dll          = VBox Mesa 3D Guest User Mode DLL
 TEMPLATE_VBoxMesa3DGuestR3Dll_EXTENDS  = NewerVccVBoxGuestR3Dll
+if defined(VBOX_WITH_NOCRT_STATIC) && "$(KBUILD_TARGET)" == "win"
+TEMPLATE_VBoxMesa3DGuestR3Dll_TOOL.x86   = $(VBOX_VCC_TOOL_STEM)X86-NOINC
+TEMPLATE_VBoxMesa3DGuestR3Dll_TOOL.win.x86   = $(VBOX_VCC_TOOL_STEM)X86-NOINC
+TEMPLATE_VBoxMesa3DGuestR3Dll_TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64-NOINC
+endif
 TEMPLATE_VBoxMesa3DGuestR3Dll_INST     = $(INST_ADDITIONS)
 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
@@ -74 +79 @@
         VBOX_WITH_MESA3D_SVGA_HALFZ \
         VBOX_WITH_MESA3D_SVGA_INSTANCING
+ifdef VBOX_WITH_NOCRT_STATIC
+TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS    += \
+        IPRT_NO_CRT_FOR_3RD_PARTY
+endif
 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \
         _USE_MATH_DEFINES \
@@ -86 +95 @@
         $(VBOX_PATH_MESA)/src/gallium/include \
         $(VBOX_PATH_3D)/win/VBoxWddmUmHlp
+ifdef VBOX_WITH_NOCRT_STATIC
+TEMPLATE_VBoxMesa3DGuestR3Dll_INCS    += \
+        $(VBOX_PATH_3D)/include
+endif
+ifdef VBOX_WITH_NOCRT_STATIC
+TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS    += $(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
+endif
 
 #