Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-02-04 01:30:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

build: Use new dxvk_config library instead of importing into wined3d

Browse Source
This commit is contained in:
Andrew Eikum 2019-12-10 09:28:14 -06:00
parent 17ae1c4447
commit f7f6f6b4db
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/makefile_base.mak
View File

@ -1188,6 +1188,7 @@ dxvk64: $(DXVK_CONFIGURE_FILES64)
cp "$(DXVK_OBJ64)"/bin/d3d10_1.dll "$(DST_DIR)"/lib64/wine/dxvk
cp "$(DXVK_OBJ64)"/bin/d3d10core.dll "$(DST_DIR)"/lib64/wine/dxvk
cp "$(DXVK_OBJ64)"/bin/d3d9.dll "$(DST_DIR)"/lib64/wine/dxvk
cp "$(DXVK_OBJ64)"/bin/dxvk_config.dll "$(DST_DIR)"/lib64/wine/dxvk
if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- dxvk ) > "$(DST_DIR)"/lib64/wine/dxvk/version; fi
@ -1200,6 +1201,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
if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- dxvk ) > "$(DST_DIR)"/lib/wine/dxvk/version; fi
endif # NO_DXVK

2
dxvk

@ -1 +1 @@
Subproject commit 3b180e3bb68d6345356c671abe7aa9839c385254
Subproject commit fc569626a6c83c9c0a008e98d5d664be60a93e8f

4
proton
View File

@ -342,10 +342,10 @@ class CompatData:
try_copy(g_proton.lib64_dir + "wine/dxvk/openvr_api_dxvk.dll", self.prefix_dir + "/drive_c/windows/system32/")
if "wined3d" in g_session.compat_config:
dxvkfiles = []
dxvkfiles = ["dxvk_config"]
wined3dfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1", "d3d9"]
else:
dxvkfiles = ["d3d11", "d3d10", "d3d10core", "d3d10_1"]
dxvkfiles = ["dxvk_config", "d3d11", "d3d10", "d3d10core", "d3d10_1"]
wined3dfiles = []
if "d9vk" in g_session.compat_config:
dxvkfiles.append("d3d9")

2
wine

@ -1 +1 @@
Subproject commit 46ce156f1b5c0b77d140ecf32108e564f7443d3c
Subproject commit 336c38747c309dcd63f369a7239b292e870e0069