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

proton: Use DYLD_LIBRARY_PATH for mac

Browse Source
This commit is contained in:
Andrew Eikum 2018-03-06 12:13:24 -06:00
parent 50c129c318
commit f11e36aac0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proton
View File

@ -15,6 +15,11 @@ CURRENT_PREFIX_VERSION="3.0-1"
PFX="Proton: " PFX="Proton: "
if "Darwin" in os.uname()[0]:
ld_path_var = "DYLD_LIBRARY_PATH"
else:
ld_path_var = "LD_LIBRARY_PATH"
def log(msg): def log(msg):
sys.stdout.write(PFX + msg + os.linesep) sys.stdout.write(PFX + msg + os.linesep)
sys.stdout.flush() sys.stdout.flush()
@ -82,10 +87,10 @@ else:
os.remove(lfile_path) os.remove(lfile_path)
lfile = open(lfile_path, "w") lfile = open(lfile_path, "w")
if "LD_LIBRARY_PATH" in os.environ: if ld_path_var in os.environ:
env["LD_LIBRARY_PATH"] = lib64dir + ":" + libdir + ":" + env["LD_LIBRARY_PATH"] env[ld_path_var] = lib64dir + ":" + libdir + ":" + env[ld_path_var]
else: else:
env["LD_LIBRARY_PATH"] = lib64dir + ":" + libdir env[ld_path_var] = lib64dir + ":" + libdir
env["WINEDLLPATH"] = lib64dir + "/wine:" + libdir + "/wine" env["WINEDLLPATH"] = lib64dir + "/wine:" + libdir + "/wine"
@ -267,7 +272,7 @@ def dump_dbg_script(path, cmd, descr):
f.write("\tPATH=\"" + env["PATH"] + "\" \\\n") f.write("\tPATH=\"" + env["PATH"] + "\" \\\n")
f.write("\tWINEDEBUG=-all\\\n") f.write("\tWINEDEBUG=-all\\\n")
f.write("\tWINEDLLPATH=\"" + env["WINEDLLPATH"] + "\" \\\n") f.write("\tWINEDLLPATH=\"" + env["WINEDLLPATH"] + "\" \\\n")
f.write("\tLD_LIBRARY_PATH=\"" + env["LD_LIBRARY_PATH"] + "\" \\\n") f.write("\t" + ld_path_var + "=\"" + env[ld_path_var] + "\" \\\n")
f.write("\tWINEPREFIX=\"" + env["WINEPREFIX"] + "\" \\\n") f.write("\tWINEPREFIX=\"" + env["WINEPREFIX"] + "\" \\\n")
if "PROTON_VR_RUNTIME" in env: if "PROTON_VR_RUNTIME" in env:
f.write("\tPROTON_VR_RUNTIME=\"" + env["PROTON_VR_RUNTIME"] + "\" \\\n") f.write("\tPROTON_VR_RUNTIME=\"" + env["PROTON_VR_RUNTIME"] + "\" \\\n")