projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix macOS environment setup.
[dcpomatic.git]
/
run
/
environment
diff --git
a/run/environment
b/run/environment
index aa4f77187b63c7b96edabeeb37f74aaf39c41bcc..dac7bef55e4354c2f09372ab6ca2a77bffdb4aa6 100644
(file)
--- a/
run/environment
+++ b/
run/environment
@@
-4,6
+4,6
@@
export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/usr/local/lib64:/usr/local/
if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then
export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH
fi
if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then
export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH
fi
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:
$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:
/Users/ci/workspace/lib
+export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/Users/ci/workspace/lib
export DCPOMATIC_GRAPHICS=$DIR/../graphics
export DCPOMATIC_GRAPHICS=$DIR/../graphics