From 84012c12aac681e1c89e5675cc4e0b8621527911 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Mon, 19 Dec 2022 14:47:25 +0100 Subject: [PATCH] Do not use the vkd3d version emebededd in Wine, but rebuild from its submodule. --- Makefile.in | 12 ++++++++++-- proton | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6540be32..ca8a365c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -692,9 +692,15 @@ WINE_CONFIGURE_ARGS = \ --with-mingw \ --disable-tests -WINE_CONFIGURE_ARGS64 = --enable-win64 +WINE_CONFIGURE_ARGS32 = \ + VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST32)/include -I$(VKD3D_DST32)/include/vkd3d" \ + VKD3D_PE_LIBS="-L$(VKD3D_DST32)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" -WINE_DEPENDS = gst_orc gstreamer gst_base +WINE_CONFIGURE_ARGS64 = --enable-win64 \ + VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST64)/include -I$(VKD3D_DST64)/include/vkd3d" \ + VKD3D_PE_LIBS="-L$(VKD3D_DST64)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" + +WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d $(eval $(call rules-source,wine,$(SRCDIR)/wine)) $(eval $(call rules-autoconf,wine,32)) @@ -823,11 +829,13 @@ $(eval $(call rules-autoconf,vkd3d,64,CROSS)) $(OBJ)/.vkd3d-post-build64: mkdir -p $(DST_DIR)/lib64/vkd3d/ + $(call install-strip,$(VKD3D_DST64)/bin/libvkd3d-1.dll,$(DST_LIBDIR64)/vkd3d) $(call install-strip,$(VKD3D_DST64)/bin/libvkd3d-shader-1.dll,$(DST_LIBDIR64)/vkd3d) touch $@ $(OBJ)/.vkd3d-post-build32: mkdir -p $(DST_DIR)/lib/vkd3d/ + $(call install-strip,$(VKD3D_DST32)/bin/libvkd3d-1.dll,$(DST_LIBDIR32)/vkd3d) $(call install-strip,$(VKD3D_DST32)/bin/libvkd3d-shader-1.dll,$(DST_LIBDIR32)/vkd3d) touch $@ diff --git a/proton b/proton index b34b5874..54f01763 100755 --- a/proton +++ b/proton @@ -899,6 +899,10 @@ class CompatData: prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) #copy vkd3d files into place + try_copy(g_proton.lib64_dir + "vkd3d/libvkd3d-1.dll", "drive_c/windows/system32", + prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) + try_copy(g_proton.lib_dir + "vkd3d/libvkd3d-1.dll", "drive_c/windows/syswow64", + prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) try_copy(g_proton.lib64_dir + "vkd3d/libvkd3d-shader-1.dll", "drive_c/windows/system32", prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) try_copy(g_proton.lib_dir + "vkd3d/libvkd3d-shader-1.dll", "drive_c/windows/syswow64",