Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-10-16 23:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Build prefix at first-run time, not build-time

Browse Source
This commit is contained in:
Andrew Eikum 2018-01-25 13:22:24 -06:00
parent fd300c22e4
commit 9e15bad61c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_proton.sh
View File

@ -109,12 +109,6 @@ PATH="$TOOLS_DIR32/bin:$PATH" $I386_WRAPPER winebuild --dll --fake-module -E vrc
cp -a vrclient.dll.so "$DST_DIR"/lib/wine/
cp -a vrclient.dll.fake "$DST_DIR"/lib/wine/fakedlls/vrclient.dll
echo "Creating default wine prefix..."
cd "$TOP"
rm -rf "$DST_DIR"/share/default_pfx
WINEPREFIX="$DST_DIR"/share/default_pfx $AMD64_WRAPPER "$DST_DIR/bin/wine64" wineboot
WINEPREFIX="$DST_DIR"/share/default_pfx $AMD64_WRAPPER "$DST_DIR/bin/wineserver" -w
echo "Packaging..."
cd "$TOP"

16
proton
View File

@ -32,6 +32,9 @@ if not ("STEAM_COMPAT_DATA_PATH" in os.environ):
log("No compat data path?")
sys.exit(1)
if "STEAM_COMPAT_CONFIG" in os.environ:
config = os.environ["STEAM_COMPAT_CONFIG"]
basedir = os.path.dirname(sys.argv[0])
bindir = basedir + "/dist/bin/"
libdir = basedir + "/dist/lib64:" + basedir + "/dist/lib"
@ -48,8 +51,6 @@ if not os.path.exists(basedir + "/dist") or \
tar.close()
shutil.copy(basedir + "/version", basedir + "/dist/")
prefix = os.environ["STEAM_COMPAT_DATA_PATH"] + "/pfx/"
env = dict(os.environ)
env["WINEDEBUG"] = "-all"
@ -65,14 +66,19 @@ if not lfile_path is None:
else:
lfile = None
env["WINEPREFIX"] = prefix
if "LD_LIBRARY_PATH" in os.environ:
env["LD_LIBRARY_PATH"] = libdir + ":" + env["LD_LIBRARY_PATH"]
else:
env["LD_LIBRARY_PATH"] = libdir
if "STEAM_COMPAT_CONFIG" in os.environ:
config = os.environ["STEAM_COMPAT_CONFIG"]
if not os.path.isdir(basedir + "/dist/share/default_pfx"):
#make default prefix
env["WINEPREFIX"] = basedir + "/dist/share/default_pfx"
run_wine([wine_path, "wineboot"])
run_wine([bindir + "/wineserver", "-w"])
prefix = os.environ["STEAM_COMPAT_DATA_PATH"] + "/pfx/"
env["WINEPREFIX"] = prefix
if not os.path.isdir(prefix):
#copy default prefix into place