Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-26 14:45:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

build: Move protonsdk_version default value to configure.sh.

Browse Source
This commit is contained in:
Rémi Bernon 2021-05-27 16:58:39 +02:00
parent a8b3580679
commit 0e897ff8b7
No known key found for this signature in database
GPG Key ID: 38D0E5827B54E5C9
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -41,11 +41,15 @@ ifneq ($(unstripped),)
DEPLOY_DIR := $(DEPLOY_DIR)_unstripped DEPLOY_DIR := $(DEPLOY_DIR)_unstripped
endif endif
protonsdk_version := 0.20210126.1-1
CONFIGURE_CMD := ../proton/configure.sh \ CONFIGURE_CMD := ../proton/configure.sh \
--proton-sdk-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) \
--build-name="$(_build_name)" --build-name="$(_build_name)"
ifneq ($(protonsdk_version),)
CONFIGURE_CMD += --proton-sdk-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version)
else
protonsdk_version := $(shell grep '^arg_protonsdk_image=' configure.sh|xargs echo|cut -d: -f2)
endif
all: help all: help

13
README.md
View File

@ -172,19 +172,22 @@ After setting up the build machine, it is time to run the configure script
which will generate the Makefile to build your project. Run these steps. You which will generate the Makefile to build your project. Run these steps. You
may of course use whatever paths you like. may of course use whatever paths you like.
To build Proton within the Steam Runtime (see `Makefile` for the correct To build Proton using the official Proton SDK images:
protonsdk_version value to use):
mkdir build/ mkdir build/
cd build cd build
../proton/configure.sh --proton-sdk-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) ../proton/configure.sh
Or, if you are building without the Steam runtime, then instead use: If you want to build with a custom version of the Proton SDK images, then instead use:
../proton/configure.sh --proton-sdk-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:<version>
Or, if you want to build without the Proton SDK, then instead use:
../proton/configure.sh --no-proton-sdk ../proton/configure.sh --no-proton-sdk
**Tip**: If you are building without the Steam runtime, you should now run **Tip**: If you are building without the Steam runtime, you should now run
`make obj-wine64/Makefile obj-wine32/Makefile` and check the files `make wine-configure64 wine-configure32` and check the files
`obj-wine64/config.log` and `obj-wine32/config.log` for missing packages. `obj-wine64/config.log` and `obj-wine32/config.log` for missing packages.
Search for `won't be supported`. A couple of missing packages are normal: Search for `won't be supported`. A couple of missing packages are normal:
`opencv`, `oss`. More than that may indicate a problem. Please see your `opencv`, `oss`. More than that may indicate a problem. Please see your

3
configure.sh
View File

@ -97,7 +97,7 @@ function configure() {
# #
arg_steamrt="soldier" arg_steamrt="soldier"
arg_protonsdk_image="" arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20210126.1-1"
arg_no_protonsdk="" arg_no_protonsdk=""
arg_build_name="" arg_build_name=""
arg_docker_opts="" arg_docker_opts=""
@ -208,7 +208,6 @@ usage() {
exit 1; exit 1;
} }
[[ $# -gt 0 ]] || usage info
parse_args "$@" || usage err parse_args "$@" || usage err
[[ -z $arg_help ]] || usage info [[ -z $arg_help ]] || usage info

4
docker/README.md
View File

@ -40,8 +40,8 @@ To update the official Proton SDK images:
images and version them with the same tag as the Git tag. images and version them with the same tag as the Git tag.
4) Once the images have been published, update the default 4) Once the images have been published, update the default
`protonsdk_version` version number in `Makefile` to use the newly `arg_protonsdk_image` version number in `configure.sh` to use the
built images by default. newly built images by default.
Any change or addition to GPL-ed source first requires to update or add Any change or addition to GPL-ed source first requires to update or add
the corresponding source to <https://repo.steampowered.com/proton-sdk>. the corresponding source to <https://repo.steampowered.com/proton-sdk>.