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

configure: Rename --no-steam-runtime to --no-proton-sdk.

Browse Source
This commit is contained in:
Rémi Bernon 2021-04-19 15:33:46 +02:00
parent 9d5b7eb0cc
commit a8b3580679
No known key found for this signature in database
GPG Key ID: 38D0E5827B54E5C9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -181,7 +181,7 @@ protonsdk_version value to use):
Or, if you are building without the Steam runtime, then instead use: Or, if you are building without the Steam runtime, then instead use:
../proton/configure.sh --no-steam-runtime ../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 obj-wine64/Makefile obj-wine32/Makefile` and check the files

20
configure.sh
View File

@ -98,7 +98,7 @@ function configure() {
arg_steamrt="soldier" arg_steamrt="soldier"
arg_protonsdk_image="" arg_protonsdk_image=""
arg_no_steamrt="" arg_no_protonsdk=""
arg_build_name="" arg_build_name=""
arg_docker_opts="" arg_docker_opts=""
arg_help="" arg_help=""
@ -146,8 +146,8 @@ function parse_args() {
elif [[ $arg = --steam-runtime ]]; then elif [[ $arg = --steam-runtime ]]; then
val_used=1 val_used=1
arg_steamrt="$val" arg_steamrt="$val"
elif [[ $arg = --no-steam-runtime ]]; then elif [[ $arg = --no-proton-sdk ]]; then
arg_no_steamrt=1 arg_no_protonsdk=1
else else
err "Unrecognized option $arg" err "Unrecognized option $arg"
return 1 return 1
@ -182,7 +182,7 @@ function parse_args() {
} }
usage() { usage() {
"$1" "Usage: $0 { --no-steam-runtime | --proton-sdk-image=<image> --steam-runtime=<name> }" "$1" "Usage: $0 { --no-proton-sdk | --proton-sdk-image=<image> --steam-runtime=<name> }"
"$1" " Generate a Makefile for building Proton. May be run from another directory to create" "$1" " Generate a Makefile for building Proton. May be run from another directory to create"
"$1" " out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)" "$1" " out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)"
"$1" "" "$1" ""
@ -203,8 +203,8 @@ usage() {
"$1" " create this image." "$1" " create this image."
"$1" " --steam-runtime=soldier Name of the steam runtime release to build for (soldier, scout)." "$1" " --steam-runtime=soldier Name of the steam runtime release to build for (soldier, scout)."
"$1" "" "$1" ""
"$1" " --no-steam-runtime Do not automatically invoke any runtime SDK as part of the build." "$1" " --no-proton-sdk Do not automatically invoke any runtime SDK as part of the build."
"$1" " Build steps may still be manually run in a runtime environment." "$1" " Build steps may still be manually run in a runtime environment."
exit 1; exit 1;
} }
@ -213,10 +213,10 @@ parse_args "$@" || usage err
[[ -z $arg_help ]] || usage info [[ -z $arg_help ]] || usage info
# Sanity check arguments # Sanity check arguments
if [[ -n $arg_no_steamrt && -n $arg_protonsdk_image ]]; then if [[ -n $arg_no_protonsdk && -n $arg_protonsdk_image ]]; then
die "Cannot specify --proton-sdk-image as well as --no-steam-runtime" die "Cannot specify --proton-sdk-image as well as --no-proton-sdk"
elif [[ -z $arg_no_steamrt && -z $arg_protonsdk_image ]]; then elif [[ -z $arg_no_protonsdk && -z $arg_protonsdk_image ]]; then
die "Must specify either --no-steam-runtime or --proton-sdk-image" die "Must specify either --no-proton-sdk or --proton-sdk-image"
fi fi
configure "$arg_protonsdk_image" "$arg_steamrt" configure "$arg_protonsdk_image" "$arg_steamrt"