diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-14 20:49:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-14 20:49:08 +0100 |
| commit | d7d6a97d2aa6c71289cbcb7ec1caa07e08258deb (patch) | |
| tree | 066829917b9e196c5e3c985f8bba372c8f96ee37 | |
| parent | 713ea4c65f88cfa2c7944ce6013963c2b1277d60 (diff) | |
Fix scripts to run on macOS.
| -rw-r--r-- | platform/osx/set_paths.sh | 13 | ||||
| -rwxr-xr-x | run/dcpomatic | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh index 5a84a82d9..44bf3fa82 100644 --- a/platform/osx/set_paths.sh +++ b/platform/osx/set_paths.sh @@ -2,11 +2,10 @@ base=$HOME/dcpomatic env=$HOME/osx-environment sdk=$HOME/SDK -export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX10.9.sdk -arch x86_64" -export LINKFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX10.9.sdk -arch x86_64" +export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" +export LINKFLAGS="-L$base/lib -L$env/64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" export MACOSX_DEPLOYMENT_TARGET=10.9 -export CXXFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX10.9.sdk -arch x86_64" -export CFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX10.9.sdk -arch x86_64" -export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$base/lib:$env/64/lib -export PATH=$env/64/bin:$PATH -export PKG_CONFIG_PATH=$env/64/lib/pkgconfig:$base/lib/pkgconfig +export CXXFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" +export CFLAGS="-I$base/include -I$env/64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" +export PATH=$env/x86_64/bin:$PATH +export PKG_CONFIG_PATH=$env/x86_64/lib/pkgconfig:$base/lib/pkgconfig diff --git a/run/dcpomatic b/run/dcpomatic index dc382879a..dc6416848 100755 --- a/run/dcpomatic +++ b/run/dcpomatic @@ -3,7 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" build=$DIR/../build export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:$LD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/64/lib +export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/lib export DCPOMATIC_GRAPHICS=$DIR/../graphics binary=$build/src/tools/dcpomatic2 if [ "$1" == "--debug" ]; then |