projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50d58ff
)
Fix set_paths.sh to be used on ci.
author
Carl Hetherington
<cth@carlh.net>
Thu, 4 Feb 2021 22:14:07 +0000
(23:14 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 4 Feb 2021 22:14:21 +0000
(23:14 +0100)
platform/osx/set_paths.sh
patch
|
blob
|
history
diff --git
a/platform/osx/set_paths.sh
b/platform/osx/set_paths.sh
index ef03bd9727f69fbcbfda13075d82e1d701d6dd79..0ac055798b186457f1054e555ad5b7bdad1f57fe 100644
(file)
--- 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
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 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
export PATH=$env/x86_64/bin:$PATH
export PKG_CONFIG_PATH=$env/x86_64/lib/pkgconfig:$base/lib/pkgconfig