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

proton: Use wine64 for all winedbg invocations

Browse Source
This commit is contained in:
Andrew Eikum 2018-06-18 10:25:04 -05:00
parent d3e34b0178
commit 17bb46c5af
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proton
View File

@ -330,11 +330,6 @@ def dump_dbg_env(f):
f.write("\tSTEAM_COMPAT_CLIENT_INSTALL_PATH=\"" + env["STEAM_COMPAT_CLIENT_INSTALL_PATH"] + "\" \\\n") f.write("\tSTEAM_COMPAT_CLIENT_INSTALL_PATH=\"" + env["STEAM_COMPAT_CLIENT_INSTALL_PATH"] + "\" \\\n")
def dump_dbg_scripts(): def dump_dbg_scripts():
if game_arch == ARCH_X86_64:
wine_name = "\"" + bindir + "wine64\""
else:
wine_name = "\"" + bindir + "wine\""
exe_name = os.path.basename(sys.argv[2]) exe_name = os.path.basename(sys.argv[2])
with open("/tmp/proton_winedbg", "w") as f: with open("/tmp/proton_winedbg", "w") as f:
@ -342,7 +337,7 @@ def dump_dbg_scripts():
f.write("#Run winedbg with args\n\n") f.write("#Run winedbg with args\n\n")
f.write("cd \"" + os.getcwd() + "\"\n") f.write("cd \"" + os.getcwd() + "\"\n")
dump_dbg_env(f) dump_dbg_env(f)
f.write("\t" + wine_name + " winedbg \"$@\"\n") f.write("\t\"" + wine_path + "\" winedbg \"$@\"\n")
os.chmod("/tmp/proton_winedbg", 0755) os.chmod("/tmp/proton_winedbg", 0755)
with open("/tmp/proton_winedbg_run", "w") as f: with open("/tmp/proton_winedbg_run", "w") as f:
@ -359,7 +354,7 @@ def dump_dbg_scripts():
f.write(" \"" + arg + "\"") f.write(" \"" + arg + "\"")
f.write(")\n") f.write(")\n")
dump_dbg_env(f) dump_dbg_env(f)
f.write("\t" + wine_name + " winedbg \"${@:-${DEF_CMD[@]}}\"\n") f.write("\t\"" + wine_path + "\" winedbg \"${@:-${DEF_CMD[@]}}\"\n")
os.chmod("/tmp/proton_winedbg_run", 0755) os.chmod("/tmp/proton_winedbg_run", 0755)
with open("/tmp/proton_gdb_attach", "w") as f: with open("/tmp/proton_gdb_attach", "w") as f:
@ -374,7 +369,7 @@ def dump_dbg_scripts():
f.write("fi\n") f.write("fi\n")
f.write("WPID_DEC=$(printf %d 0x$WPID_HEX)\n") f.write("WPID_DEC=$(printf %d 0x$WPID_HEX)\n")
dump_dbg_env(f) dump_dbg_env(f)
f.write("\t" + wine_name + " winedbg --gdb $WPID_DEC\n") f.write("\t\"" + wine_path + "\" winedbg --gdb $WPID_DEC\n")
os.chmod("/tmp/proton_gdb_attach", 0755) os.chmod("/tmp/proton_gdb_attach", 0755)
with open("/tmp/proton_gdb_run", "w") as f: with open("/tmp/proton_gdb_run", "w") as f:
@ -391,7 +386,7 @@ def dump_dbg_scripts():
f.write(" \"" + arg + "\"") f.write(" \"" + arg + "\"")
f.write(")\n") f.write(")\n")
dump_dbg_env(f) dump_dbg_env(f)
f.write("\t" + wine_name + " winedbg --gdb \"${@:-${DEF_CMD[@]}}\"\n") f.write("\t\"" + wine_path + "\" winedbg --gdb \"${@:-${DEF_CMD[@]}}\"\n")
os.chmod("/tmp/proton_gdb_run", 0755) os.chmod("/tmp/proton_gdb_run", 0755)
with open("/tmp/proton_run", "w") as f: with open("/tmp/proton_run", "w") as f:
@ -409,9 +404,9 @@ def dump_dbg_scripts():
f.write(")\n") f.write(")\n")
dump_dbg_env(f) dump_dbg_env(f)
if game_arch == ARCH_UNKNOWN: if game_arch == ARCH_UNKNOWN:
f.write("\t" + wine_name + " start \"${@:-${DEF_CMD[@]}}\"\n") f.write("\t\"" + wine_path + "\" start \"${@:-${DEF_CMD[@]}}\"\n")
else: else:
f.write("\t" + wine_name + " \"${@:-${DEF_CMD[@]}}\"\n") f.write("\t\"" + wine_path + "\" \"${@:-${DEF_CMD[@]}}\"\n")
os.chmod("/tmp/proton_run", 0755) os.chmod("/tmp/proton_run", 0755)
#determine mode #determine mode