Changeset 93359 in vbox for trunk

Timestamp:

Jan 20, 2022 11:25:36 AM (3 years ago)

Author:

vboxsync

Message:

Config.kmk,Devices/Makefile.kmk: Add includes for the directx headers when compiling on non Windows hosts based on the dxvk-native library, bugref:10013

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4751 +4751 @@
  SDK_VBOX_TPMS_INCS         ?= $(SDK_VBOX_TPMS_DEFAULT_INCS)
  SDK_VBOX_TPMS_LIBS         ?= $(PATH_STAGE_LIB)/VBox-libtpms$(VBOX_SUFF_LIB)
+endif
+
+ifdef VBOX_WITH_DXVK
+ SDK_VBOX_DXVK               = .
+ SDK_VBOX_DXVK_DEFAULT_INCS := \
+  $(PATH_ROOT)/src/libs/dxvk-native-1.9.2a/include/native/directx \
+  $(PATH_ROOT)/src/libs/dxvk-native-1.9.2a/include/native/windows
+ SDK_VBOX_DXVK_INCS         ?= $(SDK_VBOX_DXVK_DEFAULT_INCS)
+ # Loaded dynamically
+ SDK_VBOX_DXVK_LIBS         ?=
 endif
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -330 +330 @@
        Graphics/DevVGA-SVGA3d-dx.cpp \
        Graphics/DevVGA-SVGA3d-dx-shader.cpp
-   if "$(KBUILD_TARGET)" == "win"
+   if1of ($(KBUILD_TARGET), linux win)
+    VBoxDD_SDKS.linux   += VBOX_DXVK
     VBoxDD_DEFS         += VMSVGA3D_DX_BACKEND
     VBoxDD_SOURCES      += \