From: Carl Hetherington Date: Sun, 4 Feb 2024 11:21:06 +0000 (+0100) Subject: Make set_paths.sh work on x86_64 and arm64. X-Git-Tag: v2.16.75~20 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=12cbc5c8076775aae280f6609576e1400f939005 Make set_paths.sh work on x86_64 and arm64. --- diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh index 91d67ba94..65fcdedf3 100644 --- a/platform/osx/set_paths.sh +++ b/platform/osx/set_paths.sh @@ -1,5 +1,9 @@ base=$HOME/workspace -env=$HOME/osx-environment/x86_64/10.10 +if [[ "$(uname -m)" == arm64 ]]; then + env=$HOME/osx-environment/arm64/11.0 +else + env=$HOME/osx-environment/x86_64/10.10 +fi sdk=$HOME/SDK export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"