Fix set_paths.sh to be used on ci.
authorCarl Hetherington <cth@carlh.net>
Thu, 4 Feb 2021 22:14:07 +0000 (23:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 4 Feb 2021 22:14:21 +0000 (23:14 +0100)
platform/osx/set_paths.sh

index ef03bd9727f69fbcbfda13075d82e1d701d6dd79..0ac055798b186457f1054e555ad5b7bdad1f57fe 100644 (file)
@@ -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