make: Copy vkd3d DLLs as Wine builtin DLLs.

This commit is contained in:
Rémi Bernon 2025-01-21 11:00:38 +01:00 committed by Arkadiusz Hiler
parent c12229bda5
commit b201603f0d
3 changed files with 12 additions and 6 deletions

View File

@ -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 $@
##

View File

@ -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

View File

@ -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)