Changeset 103999 in vbox for trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk

Timestamp:

Mar 22, 2024 12:38:39 PM (11 months ago)

Author:

vboxsync

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

162386

Message:

Addition/3D,Additions/WINNT/Graphics: Updates for mesa-24.0.2 (not enabled yet). bugref:10606

File:

• trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk

@@ -33 +33 @@
 
 VBoxNine_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
+if $(VBOX_MESA_V_MAJOR) >= 24
+ VBoxNine_DEFS     = \
+        VBOX_MESA_STATIC_DRIVER
+endif
 #  -wd4100: unreferenced formal parameter
 #  -wd4200: nonstandard extension used : zero-sized array in struct/union
@@ -41 +45 @@
 VBoxNine_INCS     = \
         $(VBOX_PATH_MESA)/src/gallium/frontends/nine
+if $(VBOX_MESA_V_MAJOR) >= 24
+ VBoxNine_INCS    += \
+        $(VBOX_PATH_3D)/win/include \
+        $(VBOX_PATH_3D)/win/VBoxSVGA \
+        $(VBOX_PATH_MESA)/src/gallium/drivers/svga \
+        $(VBOX_PATH_MESA)/src/gallium/drivers/svga/include \
+        $(VBOX_PATH_MESA)/src/gallium/winsys/svga/drm
+endif
 VBoxNine_SOURCES  = \
         nine/nine_memory_helper.c \
         VBoxNine.c \
-        VBoxNine.rc \
-        VBoxNine.def
+        VBoxNine.rc
+if $(VBOX_MESA_V_MAJOR) < 24
+ VBoxNine_SOURCES += \
+        VBoxNine.def
+else
+ VBoxNine_SOURCES += \
+        VBoxNine_static_drv.def \
+        ../VBoxSVGA/VBoxSVGA.c \
+        ../VBoxSVGA/winsys/vmw_screen.c \
+        ../VBoxSVGA/winsys/vmw_screen_wddm.c \
+        ../VBoxSVGA/winsys/vmw_screen_ioctl.c
+endif
 VBoxNine_LIBS     = \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
@@ -52 +74 @@
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib$(VBOX_SUFF_LIB) \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaNineLib$(VBOX_SUFF_LIB)
+if $(VBOX_MESA_V_MAJOR) >= 24
+ VBoxNine_LIBS    += \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGAWinsysLib$(VBOX_SUFF_LIB) \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGALib$(VBOX_SUFF_LIB)
+endif
 
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
@@ -69 +96 @@
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaNineLib-x86$(VBOX_SUFF_LIB)
+if $(VBOX_MESA_V_MAJOR) >= 24
+ VBoxNine-x86_LIBS    += \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGAWinsysLib-x86$(VBOX_SUFF_LIB) \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGALib-x86$(VBOX_SUFF_LIB)
+endif
 VBoxNine-x86_DEFS         = $(VBoxNine_DEFS) VBOX_WOW64