From ae1e9427147af12182816ce1277ed93929cb126c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Thu, 21 Jan 2021 10:12:02 +0100 Subject: [PATCH] build: Build dxvk within the docker container. --- build/makefile_base.mak | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 95a5eae2..59dc9f7b 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -1413,6 +1413,7 @@ DXVK_CONFIGURE_FILES32 := $(DXVK_OBJ32)/build.ninja DXVK_CONFIGURE_FILES64 := $(DXVK_OBJ64)/build.ninja # 64bit-configure. Remove coredata file if already configured (due to e.g. makefile changing) +$(DXVK_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL) $(DXVK_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(DXVK)/build-win64.txt wineopenxr64 | $(DXVK_OBJ64) if [ -e "$(abspath $(DXVK_OBJ64))"/build.ninja ]; then \ rm -f "$(abspath $(DXVK_OBJ64))"/meson-private/coredata.dat; \ @@ -1422,6 +1423,7 @@ $(DXVK_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(DXVK)/build-win64.txt wineopenxr64 meson --prefix="$(abspath $(DXVK_OBJ64))" --cross-file "$(abspath $(DXVK))/build-win64.txt" $(MESON_STRIP_ARG) --buildtype=release "$(abspath $(DXVK_OBJ64))" # 32-bit configure. Remove coredata file if already configured (due to e.g. makefile changing) +$(DXVK_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL) $(DXVK_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(DXVK)/build-win32.txt | $(DXVK_OBJ32) if [ -e "$(abspath $(DXVK_OBJ32))"/build.ninja ]; then \ rm -f "$(abspath $(DXVK_OBJ32))"/meson-private/coredata.dat; \ @@ -1446,6 +1448,7 @@ dxvk_configure32: $(DXVK_CONFIGURE_FILES32) dxvk: dxvk32 dxvk64 +dxvk64: SHELL = $(CONTAINER_SHELL) dxvk64: $(DXVK_CONFIGURE_FILES64) env PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" ninja -C "$(DXVK_OBJ64)" install mkdir -p "$(DST_DIR)/lib64/wine/dxvk" @@ -1459,6 +1462,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64) rm -f "$(DST_DIR)"/lib64/wine/dxvk/version && if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- dxvk ) > "$(DST_DIR)"/lib64/wine/dxvk/version; fi +dxvk32: SHELL = $(CONTAINER_SHELL) dxvk32: $(DXVK_CONFIGURE_FILES32) env PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" ninja -C "$(DXVK_OBJ32)" install mkdir -p "$(DST_DIR)"/lib/wine/dxvk