diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-04 23:14:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-04 23:14:21 +0100 |
| commit | b66b0060a8134c0d00d3df365d8835d5fbe00455 (patch) | |
| tree | a75a69512d9a5444ad257b15a249774e87aee0c9 | |
| parent | 50d58ffa621aa02b312bf4c3c381fc4b950d2c31 (diff) | |
Fix set_paths.sh to be used on ci.
| -rw-r--r-- | platform/osx/set_paths.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh index ef03bd972..0ac055798 100644 --- a/platform/osx/set_paths.sh +++ b/platform/osx/set_paths.sh @@ -1,11 +1,11 @@ -base=$HOME/dcpomatic +base=$HOME/workspace env=$HOME/osx-environment sdk=$HOME/SDK -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 CPPFLAGS= LDFLAGS="-L$base/lib -L$env/x86_64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" +export LINKFLAGS="-L$base/lib -L$env/x86_64/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" export MACOSX_DEPLOYMENT_TARGET=10.10 -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 CXXFLAGS="-I$base/include -I$env/x86_64/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64" +export CFLAGS="-I$base/include -I$env/x86_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 |