Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-07-27 07:31:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Update wine to proton_7.0-dev.

Browse Source
This commit is contained in:
Andrew Eikum 2021-12-15 10:53:45 -06:00
parent 0a711b32b3
commit 8c558d53c2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default_pfx.py
View File

@ -59,15 +59,13 @@ def setup_dll_symlinks(default_pfx_dir, dist_dir):
if os.path.isfile(filename) and file_is_wine_builtin_dll(filename): if os.path.isfile(filename) and file_is_wine_builtin_dll(filename):
bitness = dll_bitness(filename) bitness = dll_bitness(filename)
if bitness == 32: if bitness == 32:
libdir = os.path.join(dist_dir, 'lib/wine') libdir = os.path.join(dist_dir, 'lib/wine/i386-windows')
elif bitness == 64: elif bitness == 64:
libdir = os.path.join(dist_dir, 'lib64/wine') libdir = os.path.join(dist_dir, 'lib64/wine/x86_64-windows')
else: else:
continue continue
if os.path.exists(os.path.join(libdir, file_)): if os.path.exists(os.path.join(libdir, file_)):
target = os.path.join(libdir, file_) target = os.path.join(libdir, file_)
elif os.path.exists(os.path.join(libdir, 'fakedlls', file_)):
target = os.path.join(libdir, 'fakedlls', file_)
else: else:
continue continue
os.unlink(filename) os.unlink(filename)

11
proton
View File

@ -58,7 +58,16 @@ def log(msg):
def file_is_wine_builtin_dll(path): def file_is_wine_builtin_dll(path):
if os.path.islink(path): if os.path.islink(path):
contents = os.readlink(path) contents = os.readlink(path)
if os.path.dirname(contents).endswith(('/lib/wine/i386-unix', '/lib/wine/i386-windows', '/lib64/wine/x86_64-unix', '/lib64/wine/x86_64-windows')): if os.path.dirname(contents).endswith((
'/lib/wine',
'/lib64/wine',
'/lib/wine/fakedlls',
'/lib64/wine/fakedlls',
'/lib/wine/i386-unix',
'/lib/wine/i386-windows',
'/lib64/wine/x86_64-unix',
'/lib64/wine/x86_64-windows'
)):
# This may be a broken link to a dll in a removed Proton install # This may be a broken link to a dll in a removed Proton install
return True return True
if not os.path.exists(path): if not os.path.exists(path):