diff options
| author | Sven Gothel <[email protected]> | 2013-12-30 21:30:04 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-12-30 21:30:04 +0100 |
| commit | d066602cf50f54f83b22b1b2c214100f1c34cc35 (patch) | |
| tree | 74481e2297cd9b47f63b6a3920383a476b469056 | |
| parent | 225c1956b1a9e20f348363673295abb3e6b20898 (diff) | |
OSX Test Scripts: Use dedicated location for libav/ffmpeg libraries for DYLD_LIBRARY_PATH
'/usr/local/lib' may cause hacoc w/ other preinstalled libs, see: http://forum.jogamp.org/JTabbedPane-Canvas3D-bug-tp4030983p4031081.html
| -rwxr-xr-x | make/scripts/tests-osx-x64-custom.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x64-java6.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/make/scripts/tests-osx-x64-custom.sh b/make/scripts/tests-osx-x64-custom.sh index 88587f086..16a56285b 100755 --- a/make/scripts/tests-osx-x64-custom.sh +++ b/make/scripts/tests-osx-x64-custom.sh @@ -1,6 +1,6 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH spath=`dirname $0` diff --git a/make/scripts/tests-osx-x64-java6.sh b/make/scripts/tests-osx-x64-java6.sh index fe2d2c4ec..b8190f0d7 100755 --- a/make/scripts/tests-osx-x64-java6.sh +++ b/make/scripts/tests-osx-x64-java6.sh @@ -1,6 +1,6 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH JAVA_HOME=`/usr/libexec/java_home -version 1.6` PATH=$JAVA_HOME/bin:$PATH diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 1204b8a7b..5d9cd6f66 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -1,6 +1,6 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH JAVA_HOME=`/usr/libexec/java_home -version 1.7` #JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` |