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

steam_helper: Build as 64 bit.

Browse Source 
CW-Bug-ID: #19504
This commit is contained in:
Paul Gofman 2021-10-05 15:49:21 +03:00
parent 7c53fcb494
commit e61fd8d59f
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/makefile_base.mak
View File

@ -647,7 +647,7 @@ $(DIST_WINEOPENXR_JSON64): $(WINEOPENXR_SRC)/wineopenxr64.json dist_prefix
STEAMEXE_CFLAGS = -Wno-attributes STEAMEXE_CFLAGS = -Wno-attributes
STEAMEXE_CXXFLAGS = -Wno-attributes STEAMEXE_CXXFLAGS = -Wno-attributes
STEAMEXE_LDFLAGS = -lsteam_api -lole32 -ldl -static-libgcc -static-libstdc++ STEAMEXE_LDFLAGS = -L$(STEAMEXE_SRC)/32/ -L$(STEAMEXE_SRC)/64/ -lsteam_api -lole32 -ldl -static-libgcc -static-libstdc++
STEAMEXE_WINEMAKER_ARGS = \ STEAMEXE_WINEMAKER_ARGS = \
"-I$(SRC)/lsteamclient/steamworks_sdk_142/" \ "-I$(SRC)/lsteamclient/steamworks_sdk_142/" \
@ -657,10 +657,15 @@ STEAMEXE_WINEMAKER_ARGS = \
STEAMEXE_DEPENDS = wine STEAMEXE_DEPENDS = wine
$(eval $(call rules-source,steamexe,$(SRCDIR)/steam_helper)) $(eval $(call rules-source,steamexe,$(SRCDIR)/steam_helper))
$(eval $(call rules-winemaker,steamexe,64,steam.exe))
$(eval $(call rules-winemaker,steamexe,32,steam.exe)) $(eval $(call rules-winemaker,steamexe,32,steam.exe))
$(OBJ)/.steamexe-post-build32: $(OBJ)/.steamexe-post-build32:
cp $(STEAMEXE_SRC)/libsteam_api.so $(DST_LIBDIR32)/ cp $(STEAMEXE_SRC)/32/libsteam_api.so $(DST_LIBDIR32)/
touch $@
$(OBJ)/.steamexe-post-build64:
cp $(STEAMEXE_SRC)/64/libsteam_api.so $(DST_LIBDIR64)/
touch $@ touch $@

5
proton
View File

@ -290,6 +290,7 @@ class Proton:
self.default_pfx_dir = self.path("files/share/default_pfx/") self.default_pfx_dir = self.path("files/share/default_pfx/")
self.user_settings_file = self.path("user_settings.py") self.user_settings_file = self.path("user_settings.py")
self.wine_bin = self.bin_dir + "wine" self.wine_bin = self.bin_dir + "wine"
self.wine64_bin = self.bin_dir + "wine64"
self.wineserver_bin = self.bin_dir + "wineserver" self.wineserver_bin = self.bin_dir + "wineserver"
self.dist_lock = FileLock(self.path("dist.lock"), timeout=-1) self.dist_lock = FileLock(self.path("dist.lock"), timeout=-1)
@ -1240,7 +1241,7 @@ class Session:
f.write(" \"" + arg + "\"") f.write(" \"" + arg + "\"")
f.write(")\n") f.write(")\n")
self.dump_dbg_env(f) self.dump_dbg_env(f)
f.write("\t\"" + g_proton.wine_bin + "\" steam.exe \"${@:-${DEF_CMD[@]}}\"\n") f.write("\t\"" + g_proton.wine64_bin + "\" steam.exe \"${@:-${DEF_CMD[@]}}\"\n")
os.chmod(tmpdir + "run", 0o755) os.chmod(tmpdir + "run", 0o755)
def run_proc(self, args, local_env=None): def run_proc(self, args, local_env=None):
@ -1261,7 +1262,7 @@ class Session:
else: else:
remote_debug_proc = None remote_debug_proc = None
self.run_proc([g_proton.wine_bin, "steam"] + sys.argv[2:] + self.cmdlineappend) self.run_proc([g_proton.wine64_bin, "steam"] + sys.argv[2:] + self.cmdlineappend)
if remote_debug_proc: if remote_debug_proc:
remote_debug_proc.kill() remote_debug_proc.kill()

0
steam_helper/libsteam_api.so → steam_helper/32/libsteam_api.so
View File

BIN
steam_helper/64/libsteam_api.so Executable file
View File

Binary file not shown.