From bea8c7d7302ef96fe64f473386e19f5594512dd2 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Wed, 12 Aug 2020 09:34:25 -0500 Subject: [PATCH] Makefile: Also copy .so files This fixes module=ntdll target, which needs to copy both ntdll.dll and ntdll.so. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dbd29e95..69bb094b 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,11 @@ module: configure mkdir -p vagrant_share/$(module)/lib/wine/ vagrant_share/$(module)/lib64/wine/ vagrant ssh -c 'make -C $(BUILD_DIR)/ $(UNSTRIPPED) module=$(module) module && \ cp $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(module)$(MODULE_SFX)* /vagrant/$(module)/lib/wine/ && \ - cp $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module)$(MODULE_SFX)* /vagrant/$(module)/lib64/wine/' + cp $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module)$(MODULE_SFX)* /vagrant/$(module)/lib64/wine/ && \ + if [ -e $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module).so ]; then \ + cp $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(module).so /vagrant/$(module)/lib/wine/ && \ + cp $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module).so /vagrant/$(module)/lib64/wine/; \ + fi' rm -f vagrant_share/$(module)/lib*/wine/*.fake dxvk: configure