Mirrors/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-06-13 13:47:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Disable dxvk by default on OS X

Browse Source
This commit is contained in:
John Schoenick
2018-08-28 14:45:54 -07:00
parent 4b65a3531c
commit 154cda1b7f
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure.sh
View File

@ -27,6 +27,10 @@ die() { err "$@"; exit 1; }
finish() { stat "$@"; exit 0; }
cmd() { showcmd "$@"; "$@"; }
# Environment
OSX=""
[[ $(uname || true) != Darwin ]] || OSX=1
#
# Configure
#
@ -76,13 +80,23 @@ function configure() {
# Don't die after this point or we'll have rather unhelpfully deleted the Makefile
[[ ! -e "$MAKEFILE" ]] || rm "$MAKEFILE"
# Config
echo >> "$MAKEFILE" "# Generated by: $THIS_COMMAND"
echo >> "$MAKEFILE" ""
echo >> "$MAKEFILE" "SRCDIR := $(escape_for_make "$srcdir")"
echo >> "$MAKEFILE" "SRCDIR := $(escape_for_make "$srcdir")"
# DXVK?
if [[ -n $OSX && ! -n $arg_force_dxvk ]]; then
echo >> "$MAKEFILE" "NO_DXVK := 1"
fi
# SteamRT
echo >> "$MAKEFILE" "STEAMRT64_MODE := $(escape_for_make "$steamrt64_type")"
echo >> "$MAKEFILE" "STEAMRT64_IMAGE := $(escape_for_make "$steamrt64_name")"
echo >> "$MAKEFILE" "STEAMRT32_MODE := $(escape_for_make "$steamrt32_type")"
echo >> "$MAKEFILE" "STEAMRT32_IMAGE := $(escape_for_make "$steamrt32_name")"
# Include base
echo >> "$MAKEFILE" ""
echo >> "$MAKEFILE" "include \$(SRCDIR)/build/makefile_base.mak"
@ -97,6 +111,7 @@ function configure() {
arg_steamrt32=""
arg_steamrt64=""
arg_no_steamrt=""
arg_force_dxvk=""
invalid_args=""
function parse_args() {
local arg;
@ -127,7 +142,9 @@ function parse_args() {
fi
# The args
if [[ $arg = --steam-runtime32 ]]; then
if [[ $arg = --osx-force-dxvk ]]; then
arg_force_dxvk=1
elif [[ $arg = --steam-runtime32 ]]; then
val_used=1
arg_steamrt32="$val"
elif [[ $arg = --steam-runtime64 ]]; then
@ -173,6 +190,10 @@ usage() {
"$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" ""
"$1" " Options"
"$1" " --osx-force-dxvk Attempt to build DXVK on OS X - not currently functioning,"
"$1" " development use"
"$1" ""
"$1" " Steam Runtime"
"$1" " Proton builds that are to be installed & run under the steam client must be built with"
"$1" " the Steam Runtime SDK to ensure compatibility. See BUILDING.md for more information."
@ -193,6 +214,7 @@ usage() {
[[ $# -gt 0 ]] || usage info
parse_args "$@" || usage err
# Sanity check arguments
if [[ -n $arg_no_steamrt && (-n $arg_steamrt32 || -n $arg_steamrt64) ]]; then
die "Cannot specify a Steam Runtime SDK as well as --no-steam-runtime"
elif [[ -z $arg_no_steamrt && ( -z $arg_steamrt32 || -z $arg_steamrt64 ) ]]; then