diff options
Diffstat (limited to 'proton-unfuck_makefile.patch')
| -rw-r--r-- | proton-unfuck_makefile.patch | 115 |
1 files changed, 71 insertions, 44 deletions
diff --git a/proton-unfuck_makefile.patch b/proton-unfuck_makefile.patch index a3f48aed8e89..bb8ff4909a8c 100644 --- a/proton-unfuck_makefile.patch +++ b/proton-unfuck_makefile.patch @@ -1,5 +1,5 @@ diff --git a/build/makefile_base.mak b/build/makefile_base.mak -index 79ac5b2..d38c79e 100644 +index 00e2a13..4c74509 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -89,8 +89,8 @@ SELECT_DOCKER_IMAGE := @@ -22,7 +22,7 @@ index 79ac5b2..d38c79e 100644 SANITY_FLAGS := -fwrapv -fno-strict-aliasing COMMON_FLAGS := $(OPTIMIZE_FLAGS) $(SANITY_FLAGS) -@@ -213,6 +214,16 @@ GST_GOOD_OBJ64 := ./obj-gst-good64 +@@ -217,6 +218,16 @@ GST_GOOD_OBJ64 := ./obj-gst-good64 FAUDIO := $(SRCDIR)/FAudio FAUDIO_OBJ32 := ./obj-faudio32 FAUDIO_OBJ64 := ./obj-faudio64 @@ -39,7 +39,7 @@ index 79ac5b2..d38c79e 100644 LSTEAMCLIENT := $(SRCDIR)/lsteamclient LSTEAMCLIENT32 := ./syn-lsteamclient32/lsteamclient -@@ -229,6 +240,16 @@ WINE_DST32 := ./dist-wine32 +@@ -233,6 +244,16 @@ WINE_DST32 := ./dist-wine32 WINE_OBJ32 := ./obj-wine32 WINE_OBJ64 := ./obj-wine64 WINEMAKER := $(abspath $(WINE)/tools/winemaker/winemaker) @@ -56,7 +56,7 @@ index 79ac5b2..d38c79e 100644 # Wine outputs that need to exist for other steps (dist) WINE_OUT_BIN := $(DST_DIR)/bin/wine64 -@@ -236,9 +257,11 @@ WINE_OUT_SERVER := $(DST_DIR)/bin/wineserver +@@ -240,9 +261,11 @@ WINE_OUT_SERVER := $(DST_DIR)/bin/wineserver WINE_OUT := $(WINE_OUT_BIN) $(WINE_OUT_SERVER) # Tool-only build outputs needed for other projects WINEGCC32 := $(TOOLS_DIR32)/bin/winegcc @@ -68,7 +68,7 @@ index 79ac5b2..d38c79e 100644 WINEBUILD64 := $(TOOLS_DIR64)/bin/winebuild WINE_BUILDTOOLS64 := $(WINEGCC64) $(WINEBUILD64) -@@ -246,6 +269,12 @@ WINEWIDL_OBJ32 := ./obj-widl32 +@@ -250,6 +273,12 @@ WINEWIDL_OBJ32 := ./obj-widl32 WINEWIDL_OBJ64 := ./obj-widl64 WINEWIDL32 := $(WINEWIDL_OBJ32)/tools/widl/widl WINEWIDL64 := $(WINEWIDL_OBJ64)/tools/widl/widl @@ -81,7 +81,7 @@ index 79ac5b2..d38c79e 100644 VRCLIENT := $(SRCDIR)/vrclient_x64 VRCLIENT32 := ./syn-vrclient32 -@@ -261,22 +290,38 @@ VULKAN_H_OBJ32 := ./obj-vulkan-headers32 +@@ -265,22 +294,38 @@ VULKAN_H_OBJ32 := ./obj-vulkan-headers32 VULKAN_H_OBJ64 := ./obj-vulkan-headers64 VULKAN_H32 := $(TOOLS_DIR32)/include/vulkan/vulkan.h VULKAN_H64 := $(TOOLS_DIR64)/include/vulkan/vulkan.h @@ -122,7 +122,7 @@ index 79ac5b2..d38c79e 100644 BISON_VER = 3.3.2 BISON_TARBALL := bison-$(BISON_VER).tar.xz -@@ -285,6 +330,10 @@ BISON_OBJ32 := ./obj-bison32 +@@ -289,6 +334,10 @@ BISON_OBJ32 := ./obj-bison32 BISON_OBJ64 := ./obj-bison64 BISON_BIN32 := $(BISON_OBJ32)/built/bin/bison BISON_BIN64 := $(BISON_OBJ64)/built/bin/bison @@ -133,7 +133,7 @@ index 79ac5b2..d38c79e 100644 FONTS := $(SRCDIR)/fonts -@@ -388,11 +437,26 @@ DIST_GECKO64 := $(DIST_GECKO_DIR)/wine-gecko-$(GECKO_VER)-x86_64 +@@ -393,11 +442,26 @@ DIST_GECKO64 := $(DIST_GECKO_DIR)/wine-gecko-$(GECKO_VER)-x86_64 DIST_WINEMONO_DIR := $(DST_DIR)/share/wine/mono DIST_WINEMONO := $(DIST_WINEMONO_DIR)/wine-mono-$(WINEMONO_VER) DIST_FONTS := $(DST_DIR)/share/fonts @@ -161,7 +161,7 @@ index 79ac5b2..d38c79e 100644 DEPLOY_COPY_TARGETS := $(DIST_COPY_TARGETS) $(DIST_VERSION) $(DIST_LICENSE) $(DIST_OFL_LICENSE) REDIST_COPY_TARGETS := $(DEPLOY_COPY_TARGETS) $(DIST_COMPAT_MANIFEST) -@@ -468,7 +532,7 @@ $(DIST_FONTS): fonts +@@ -473,7 +537,7 @@ $(DIST_FONTS): fonts ALL_TARGETS += dist GOAL_TARGETS += dist @@ -170,7 +170,7 @@ index 79ac5b2..d38c79e 100644 echo `date '+%s'` `GIT_DIR=$(abspath $(SRCDIR)/.git) git describe --tags` > $(DIST_VERSION) cp $(DIST_VERSION) $(DST_BASE)/ rm -rf $(abspath $(DIST_PREFIX)) && \ -@@ -515,6 +579,8 @@ module64: +@@ -520,6 +584,8 @@ module64: module: module32 module64 @@ -179,7 +179,7 @@ index 79ac5b2..d38c79e 100644 ## ## glib ## -@@ -523,6 +589,10 @@ GLIB_CONFIGURE_FILES32 := $(GLIB_OBJ32)/build.ninja +@@ -528,6 +594,10 @@ GLIB_CONFIGURE_FILES32 := $(GLIB_OBJ32)/build.ninja GLIB_CONFIGURE_FILES64 := $(GLIB_OBJ64)/build.ninja GLIB_MESON_ARGS := -Dlibmount=false @@ -190,7 +190,7 @@ index 79ac5b2..d38c79e 100644 # 64-bit configure. Remove coredata file if already configured (due to e.g. makefile changing) $(GLIB_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64) -@@ -531,6 +601,7 @@ $(GLIB_CONFIGURE_FILES64): $(MAKEFILE_DEP) | $(GLIB_OBJ64) +@@ -536,6 +606,7 @@ $(GLIB_CONFIGURE_FILES64): $(MAKEFILE_DEP) | $(GLIB_OBJ64) rm -f "$(abspath $(GLIB_OBJ64))"/meson-private/coredata.dat; \ fi cd "$(abspath $(GLIB))" && \ @@ -198,7 +198,7 @@ index 79ac5b2..d38c79e 100644 meson --prefix="$(abspath $(TOOLS_DIR64))" --libdir="lib" $(GLIB_MESON_ARGS) $(MESON_STRIP_ARG) --buildtype=release "$(abspath $(GLIB_OBJ64))" # 32-bit configure. Remove coredata file if already configured (due to e.g. makefile changing) -@@ -540,6 +611,10 @@ $(GLIB_CONFIGURE_FILES32): $(MAKEFILE_DEP) | $(GLIB_OBJ32) +@@ -545,6 +616,10 @@ $(GLIB_CONFIGURE_FILES32): $(MAKEFILE_DEP) | $(GLIB_OBJ32) rm -f "$(abspath $(GLIB_OBJ32))"/meson-private/coredata.dat; \ fi cd "$(abspath $(GLIB))" && \ @@ -209,19 +209,29 @@ index 79ac5b2..d38c79e 100644 meson --prefix="$(abspath $(TOOLS_DIR32))" --libdir="lib" $(GLIB_MESON_ARGS) $(MESON_STRIP_ARG) --buildtype=release "$(abspath $(GLIB_OBJ32))" ## glib goals -@@ -584,6 +659,8 @@ glib32: $(GLIB_CONFIGURE_FILES32) - ## +@@ -585,6 +660,8 @@ glib32: $(GLIB_CONFIGURE_FILES32) + GST_COMMON_MESON_ARGS := \ + -Db_lto=true \ + -Db_pie=true \ -Dexamples=disabled \ -Dtests=disabled \ - -Dtools=disabled \ -@@ -597,6 +674,10 @@ GST_COMMON_MESON_ARGS := \ - GSTREAMER_MESON_ARGS := \ + -Dgtk_doc=disabled \ +@@ -626,6 +703,9 @@ $(GST_ORC_CONFIGURE_FILES32): $(MAKEFILE_DEP) glib32 | $(GST_ORC_OBJ32) + fi + cd "$(abspath $(GST_ORC))" && \ + PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \ ++ CFLAGS="-m32 $(COMMON_FLAGS)" \ ++ CXXFLAGS="-m32 $(COMMON_FLAGS)" \ ++ PKG_CONFIG="i686-pc-linux-gnu-pkg-config" \ + PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ + meson --prefix="$(abspath $(TOOLS_DIR32))" --libdir="lib" $(GST_ORC_MESON_ARGS) $(MESON_STRIP_ARG) "$(abspath $(GST_ORC_OBJ32))" + +@@ -667,6 +747,10 @@ GSTREAMER_MESON_ARGS := \ -Dgst_parse=false \ -Dbenchmarks=disabled \ + -Dtools=disabled \ + -Dbash-completion=disabled \ + -Dptp-helper-permissions=capabilities \ + -Ddbghelp=disabled \ @@ -229,7 +239,7 @@ index 79ac5b2..d38c79e 100644 $(GST_COMMON_MESON_ARGS) GSTREAMER_CONFIGURE_FILES32 := $(GSTREAMER_OBJ32)/build.ninja -@@ -621,6 +702,9 @@ $(GSTREAMER_CONFIGURE_FILES32): $(MAKEFILE_DEP) glib32 | $(GSTREAMER_OBJ32) +@@ -691,6 +775,9 @@ $(GSTREAMER_CONFIGURE_FILES32): $(MAKEFILE_DEP) gst_orc32 | $(GSTREAMER_OBJ32) fi cd "$(abspath $(GSTREAMER))" && \ PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \ @@ -239,15 +249,15 @@ index 79ac5b2..d38c79e 100644 PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ meson --prefix="$(abspath $(TOOLS_DIR32))" --libdir="lib" $(GSTREAMER_MESON_ARGS) $(MESON_STRIP_ARG) --buildtype=release "$(abspath $(GSTREAMER_OBJ32))" -@@ -681,6 +765,7 @@ GST_BASE_MESON_ARGS := \ - -Dx11=disabled \ +@@ -756,6 +843,7 @@ GST_BASE_MESON_ARGS := \ -Dxshm=disabled \ -Dxvideo=disabled \ + -Dtools=disabled \ + -Dpackage-name="GStreamer Base Plugins (Proton)" \ $(GST_COMMON_MESON_ARGS) GST_BASE_CONFIGURE_FILES32 := $(GST_BASE_OBJ32)/build.ninja -@@ -705,6 +790,9 @@ $(GST_BASE_CONFIGURE_FILES32): $(MAKEFILE_DEP) gstreamer32 | $(GST_BASE_OBJ32) +@@ -780,6 +868,9 @@ $(GST_BASE_CONFIGURE_FILES32): $(MAKEFILE_DEP) gstreamer32 | $(GST_BASE_OBJ32) fi cd "$(abspath $(GST_BASE))" && \ PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \ @@ -257,15 +267,15 @@ index 79ac5b2..d38c79e 100644 PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ meson --prefix="$(abspath $(TOOLS_DIR32))" --libdir="lib" $(GST_BASE_MESON_ARGS) $(MESON_STRIP_ARG) --buildtype=release "$(abspath $(GST_BASE_OBJ32))" -@@ -790,6 +878,7 @@ GST_GOOD_MESON_ARGS := \ - -Dwavenc=disabled \ +@@ -870,6 +961,7 @@ GST_GOOD_MESON_ARGS := \ -Dximagesrc=disabled \ -Dy4m=disabled \ -+ -Dpackage-name="GStreamer Good Plugins (Proton)" \ + -Dtools=disabled \ ++ -Dpackage-name="GStreamer Good Plugins (Proton)" \ $(GST_COMMON_MESON_ARGS) GST_GOOD_CONFIGURE_FILES32 := $(GST_GOOD_OBJ32)/build.ninja -@@ -814,6 +903,9 @@ $(GST_GOOD_CONFIGURE_FILES32): $(MAKEFILE_DEP) gst_base32 | $(GST_GOOD_OBJ32) +@@ -894,6 +986,9 @@ $(GST_GOOD_CONFIGURE_FILES32): $(MAKEFILE_DEP) gst_base32 | $(GST_GOOD_OBJ32) fi cd "$(abspath $(GST_GOOD))" && \ PATH="$(abspath $(TOOLS_DIR32))/bin:$(PATH)" \ @@ -275,7 +285,7 @@ index 79ac5b2..d38c79e 100644 PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ meson --prefix="$(abspath $(TOOLS_DIR32))" --libdir="lib" $(GST_GOOD_MESON_ARGS) $(MESON_STRIP_ARG) --buildtype=release "$(abspath $(GST_GOOD_OBJ32))" -@@ -845,6 +937,7 @@ gst_good32: $(GST_GOOD_CONFIGURE_FILES32) +@@ -929,6 +1024,7 @@ gst_good32: $(GST_GOOD_CONFIGURE_FILES32) cp -a $(TOOLS_DIR32)/lib/libgst* $(DST_DIR)/lib/ && \ cp -a $(TOOLS_DIR32)/lib/gstreamer-1.0 $(DST_DIR)/lib/ @@ -283,7 +293,7 @@ index 79ac5b2..d38c79e 100644 ## ## ffmpeg -@@ -862,13 +955,15 @@ $(FFMPEG_CONFIGURE_FILES64): $(FFMPEG)/configure $(MAKEFILE_DEP) | $(FFMPEG_OBJ6 +@@ -946,13 +1042,15 @@ $(FFMPEG_CONFIGURE_FILES64): $(FFMPEG)/configure $(MAKEFILE_DEP) | $(FFMPEG_OBJ6 $(abspath $(FFMPEG))/configure \ --cc=$(CC_QUOTED) --cxx=$(CXX_QUOTED) \ --prefix=$(abspath $(TOOLS_DIR64)) \ @@ -300,7 +310,7 @@ index 79ac5b2..d38c79e 100644 --disable-swscale \ --disable-postproc \ --disable-avfilter \ -@@ -894,17 +989,19 @@ $(FFMPEG_CONFIGURE_FILES64): $(FFMPEG)/configure $(MAKEFILE_DEP) | $(FFMPEG_OBJ6 +@@ -978,17 +1076,19 @@ $(FFMPEG_CONFIGURE_FILES64): $(FFMPEG)/configure $(MAKEFILE_DEP) | $(FFMPEG_OBJ6 $(FFMPEG_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) $(FFMPEG_CONFIGURE_FILES32): $(FFMPEG)/configure $(MAKEFILE_DEP) | $(FFMPEG_OBJ32) cd $(dir $@) && \ @@ -322,7 +332,7 @@ index 79ac5b2..d38c79e 100644 --disable-swscale \ --disable-postproc \ --disable-avfilter \ -@@ -947,14 +1044,14 @@ ffmpeg64: $(FFMPEG_CONFIGURE_FILES64) +@@ -1031,14 +1131,14 @@ ffmpeg64: $(FFMPEG_CONFIGURE_FILES64) +$(MAKE) -C $(FFMPEG_OBJ64) +$(MAKE) -C $(FFMPEG_OBJ64) install mkdir -pv $(DST_DIR)/lib64 @@ -339,7 +349,7 @@ index 79ac5b2..d38c79e 100644 endif # ifeq ($(WITH_FFMPEG),1) -@@ -980,19 +1077,22 @@ FAUDIO_CONFIGURE_FILES32 := $(FAUDIO_OBJ32)/Makefile +@@ -1064,19 +1164,22 @@ FAUDIO_CONFIGURE_FILES32 := $(FAUDIO_OBJ32)/Makefile FAUDIO_CONFIGURE_FILES64 := $(FAUDIO_OBJ64)/Makefile $(FAUDIO_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) @@ -368,7 +378,7 @@ index 79ac5b2..d38c79e 100644 faudio32: SHELL = $(CONTAINER_SHELL32) faudio32: $(FAUDIO_CONFIGURE_FILES32) -@@ -1183,36 +1283,48 @@ WINE32_MAKE_ARGS := \ +@@ -1267,36 +1370,48 @@ WINE32_MAKE_ARGS := \ # 64bit-configure $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64) @@ -425,7 +435,15 @@ index 79ac5b2..d38c79e 100644 CC=$(CC_QUOTED) \ CXX=$(CXX_QUOTED) -@@ -1367,6 +1479,8 @@ vrclient32: $(VRCLIENT_CONFIGURE_FILES32) | $(WINE_BUILDTOOLS32) $(filter $(MAKE +@@ -1372,7 +1487,6 @@ $(VRCLIENT_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64) + $(VRCLIENT_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(VRCLIENT) $(VRCLIENT)/vrclient_x64 | $(VRCLIENT_OBJ64) $(WINEMAKER) + cd $(VRCLIENT) && \ + $(WINEMAKER) --nosource-fix --nolower-include --nodlls --nomsvcrt \ +- --nosource-fix --nolower-include --nodlls --nomsvcrt \ + -I"$(abspath $(TOOLS_DIR64))"/include/ \ + -I"$(abspath $(TOOLS_DIR64))"/include/wine/ \ + -I"$(abspath $(TOOLS_DIR64))"/include/wine/windows/ \ +@@ -1451,6 +1565,8 @@ vrclient32: $(VRCLIENT_CONFIGURE_FILES32) | $(WINE_BUILDTOOLS32) $(filter $(MAKE ## Create & configure object directory for cmake @@ -434,7 +452,7 @@ index 79ac5b2..d38c79e 100644 CMAKE_CONFIGURE_FILES32 := $(CMAKE_OBJ32)/Makefile CMAKE_CONFIGURE_FILES64 := $(CMAKE_OBJ64)/Makefile -@@ -1418,12 +1532,16 @@ cmake32-intermediate: $(CMAKE_CONFIGURE_FILES32) $(filter $(MAKECMDGOALS),cmake3 +@@ -1502,12 +1618,16 @@ cmake32-intermediate: $(CMAKE_CONFIGURE_FILES32) $(filter $(MAKECMDGOALS),cmake3 +$(MAKE) -C $(CMAKE_OBJ32) install touch $(CMAKE_BIN32) @@ -451,7 +469,7 @@ index 79ac5b2..d38c79e 100644 $(BISON): if [ -e "$(SRCDIR)/../bison/$(BISON_TARBALL)" ]; then \ mkdir -p $(dir $@); \ -@@ -1488,6 +1606,8 @@ bison32-intermediate: $(BISON_CONFIGURE_FILES32) $(filter $(MAKECMDGOALS),bison3 +@@ -1572,6 +1692,8 @@ bison32-intermediate: $(BISON_CONFIGURE_FILES32) $(filter $(MAKECMDGOALS),bison3 +$(MAKE) -C $(BISON_OBJ32) install touch $(BISON_BIN32) @@ -460,7 +478,7 @@ index 79ac5b2..d38c79e 100644 ## ## dxvk ## -@@ -1508,7 +1628,7 @@ $(DXVK_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(DXVK)/build-win64.txt | $(DXVK_OBJ6 +@@ -1592,7 +1714,7 @@ $(DXVK_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(DXVK)/build-win64.txt | $(DXVK_OBJ6 fi cd "$(abspath $(DXVK))" && \ PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" \ @@ -469,7 +487,7 @@ index 79ac5b2..d38c79e 100644 # 32-bit configure. Remove coredata file if already configured (due to e.g. makefile changing) $(DXVK_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(DXVK)/build-win32.txt | $(DXVK_OBJ32) -@@ -1517,7 +1637,7 @@ $(DXVK_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(DXVK)/build-win32.txt | $(DXVK_OBJ3 +@@ -1601,7 +1723,7 @@ $(DXVK_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(DXVK)/build-win32.txt | $(DXVK_OBJ3 fi cd "$(abspath $(DXVK))" && \ PATH="$(abspath $(SRCDIR))/glslang/bin/:$(PATH)" \ @@ -478,7 +496,7 @@ index 79ac5b2..d38c79e 100644 ## dxvk goals DXVK_TARGETS = dxvk dxvk_configure dxvk32 dxvk64 dxvk_configure32 dxvk_configure64 -@@ -1536,7 +1656,7 @@ dxvk_configure32: $(DXVK_CONFIGURE_FILES32) +@@ -1620,7 +1742,7 @@ dxvk_configure32: $(DXVK_CONFIGURE_FILES32) dxvk: dxvk32 dxvk64 dxvk64: $(DXVK_CONFIGURE_FILES64) @@ -487,7 +505,7 @@ index 79ac5b2..d38c79e 100644 mkdir -p "$(DST_DIR)/lib64/wine/dxvk" cp "$(DXVK_OBJ64)"/bin/dxgi.dll "$(DST_DIR)"/lib64/wine/dxvk cp "$(DXVK_OBJ64)"/bin/d3d11.dll "$(DST_DIR)"/lib64/wine/dxvk -@@ -1549,7 +1669,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64) +@@ -1633,7 +1755,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64) dxvk32: $(DXVK_CONFIGURE_FILES32) @@ -496,7 +514,16 @@ index 79ac5b2..d38c79e 100644 mkdir -p "$(DST_DIR)"/lib/wine/dxvk cp "$(DXVK_OBJ32)"/bin/dxgi.dll "$(DST_DIR)"/lib/wine/dxvk/ cp "$(DXVK_OBJ32)"/bin/d3d11.dll "$(DST_DIR)"/lib/wine/dxvk/ -@@ -1568,24 +1688,24 @@ VULKAN_H_CONFIGURE_FILES32 := $(VULKAN_H_OBJ32)/Makefile +@@ -1641,7 +1763,7 @@ dxvk32: $(DXVK_CONFIGURE_FILES32) + cp "$(DXVK_OBJ32)"/bin/d3d10_1.dll "$(DST_DIR)"/lib/wine/dxvk/ + cp "$(DXVK_OBJ32)"/bin/d3d10core.dll "$(DST_DIR)"/lib/wine/dxvk/ + cp "$(DXVK_OBJ32)"/bin/d3d9.dll "$(DST_DIR)"/lib/wine/dxvk/ +- cp "$(DXVK_OBJ32)"/bin/dxvk_config.dll "$(DST_DIR)"/lib/wine/dxvk ++ cp "$(DXVK_OBJ32)"/bin/dxvk_config.dll "$(DST_DIR)"/lib/wine/dxvk/ + if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- dxvk ) > "$(DST_DIR)"/lib/wine/dxvk/version; fi + + endif # NO_DXVK +@@ -1652,24 +1774,24 @@ VULKAN_H_CONFIGURE_FILES32 := $(VULKAN_H_OBJ32)/Makefile VULKAN_H_CONFIGURE_FILES64 := $(VULKAN_H_OBJ64)/Makefile $(VULKAN_H_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) @@ -527,7 +554,7 @@ index 79ac5b2..d38c79e 100644 # SPIRV-Headers -@@ -1593,24 +1713,24 @@ SPIRV_H_CONFIGURE_FILES32 := $(SPIRV_H_OBJ32)/Makefile +@@ -1677,24 +1799,24 @@ SPIRV_H_CONFIGURE_FILES32 := $(SPIRV_H_OBJ32)/Makefile SPIRV_H_CONFIGURE_FILES64 := $(SPIRV_H_OBJ64)/Makefile $(SPIRV_H_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) @@ -558,7 +585,7 @@ index 79ac5b2..d38c79e 100644 # widl; required for vkd3d, which is built before wine -@@ -1618,14 +1738,18 @@ WINEWIDL_CONFIGURE_FILES64 := $(WINEWIDL_OBJ64)/Makefile +@@ -1702,14 +1824,18 @@ WINEWIDL_CONFIGURE_FILES64 := $(WINEWIDL_OBJ64)/Makefile WINEWIDL_CONFIGURE_FILES32 := $(WINEWIDL_OBJ32)/Makefile $(WINEWIDL_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32) @@ -580,7 +607,7 @@ index 79ac5b2..d38c79e 100644 LDFLAGS=-L$(abspath $(TOOLS_DIR32))/lib \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ CC=$(CC_QUOTED) \ -@@ -1637,14 +1761,18 @@ $(WINEWIDL32): $(WINEWIDL_CONFIGURE_FILES32) +@@ -1721,14 +1847,18 @@ $(WINEWIDL32): $(WINEWIDL_CONFIGURE_FILES32) make tools/widl $(WINEWIDL_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64) @@ -601,7 +628,7 @@ index 79ac5b2..d38c79e 100644 CFLAGS=-I$(abspath $(TOOLS_DIR64))"/include -g $(COMMON_FLAGS)" \ LDFLAGS=-L$(abspath $(TOOLS_DIR64))/lib \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \ -@@ -1672,7 +1800,7 @@ $(VKD3D_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(VULKAN_H32) $(SPIRV_H32) $(VKD3D)/ +@@ -1756,7 +1886,7 @@ $(VKD3D_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(VULKAN_H32) $(SPIRV_H32) $(VKD3D)/ $(abspath $(VKD3D))/configure \ --disable-tests \ --prefix=$(abspath $(TOOLS_DIR32)) \ |