From b201603f0ddf9ea1de3be51fd36cf8aade23d873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 21 Jan 2025 11:00:38 +0100
Subject: [PATCH] make: Copy vkd3d DLLs as Wine builtin DLLs.

---
 Makefile.in              | 16 ++++++++++------
 make/rules-common.mk     |  1 +
 make/rules-wine-tools.mk |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d6db3110..84a3da14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -572,16 +572,20 @@ $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d))
 $(eval $(call rules-autoconf,vkd3d,i386,windows))
 $(eval $(call rules-autoconf,vkd3d,x86_64,windows))
 
-$(OBJ)/.vkd3d-x86_64-post-build:
+$(OBJ)/.vkd3d-x86_64-post-build: $(OBJ)/.wine-$(HOST_ARCH)-tools
 	mkdir -p $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows
-	mv $(VKD3D_x86_64_DST)/bin/libvkd3d-1.dll $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows
-	mv $(VKD3D_x86_64_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows
+	$(call make-builtin,$(VKD3D_x86_64_DST)/bin/libvkd3d-1.dll)
+	$(call make-builtin,$(VKD3D_x86_64_DST)/bin/libvkd3d-shader-1.dll)
+	cp $(VKD3D_x86_64_DST)/bin/libvkd3d-1.dll $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows
+	cp $(VKD3D_x86_64_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_x86_64_LIBDIR)/vkd3d/x86_64-windows
 	touch $@
 
-$(OBJ)/.vkd3d-i386-post-build:
+$(OBJ)/.vkd3d-i386-post-build: $(OBJ)/.wine-$(HOST_ARCH)-tools
 	mkdir -p $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows
-	mv $(VKD3D_i386_DST)/bin/libvkd3d-1.dll $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows
-	mv $(VKD3D_i386_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows
+	$(call make-builtin,$(VKD3D_i386_DST)/bin/libvkd3d-1.dll)
+	$(call make-builtin,$(VKD3D_i386_DST)/bin/libvkd3d-shader-1.dll)
+	cp $(VKD3D_i386_DST)/bin/libvkd3d-1.dll $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows
+	cp $(VKD3D_i386_DST)/bin/libvkd3d-shader-1.dll $(VKD3D_i386_LIBDIR)/vkd3d/i386-windows
 	touch $@
 
 ##
diff --git a/make/rules-common.mk b/make/rules-common.mk
index 5448c07b..55a821b5 100644
--- a/make/rules-common.mk
+++ b/make/rules-common.mk
@@ -32,6 +32,7 @@ all-configure: $(1)-configure
 $$(OBJ)/.$(1)-$(3)-build: CCACHE_BASEDIR = $$($(2)_SRC)
 $$(OBJ)/.$(1)-$(3)-build: $$(OBJ)/.$(1)-source
 $$(OBJ)/.$(1)-$(3)-build: $$(OBJ)/.$(1)-$(3)-configure
+$$(OBJ)/.$(1)-$(3)-build: $$(patsubst %,$$(OBJ)/.%-$(3)-post-build,$$($(2)_DEPENDS) $$($(2)_$(3)_DEPENDS))
 
 $$(OBJ)/.$(1)-$(3)-post-build: $$(OBJ)/.$(1)-$(3)-build
 
diff --git a/make/rules-wine-tools.mk b/make/rules-wine-tools.mk
index 52079992..53067166 100644
--- a/make/rules-wine-tools.mk
+++ b/make/rules-wine-tools.mk
@@ -31,3 +31,4 @@ endif
 endef
 
 rules-wine-tools = $(call create-rules-wine-tools,$(1),$(call toupper,$(1)),$(2),$(3))
+make-builtin = $(WINE_$(HOST_ARCH)_OBJ)/tools/winebuild/winebuild --builtin $(1)