aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-03-14 14:19:42 +0100
committerSven Gothel <[email protected]>2023-03-14 14:19:42 +0100
commitd1aea2def5aa526f0a78f3f034ceb9ab1b0d3905 (patch)
treef032949396a6bf2041bdbcb322b5c4af5dbe49d0 /make
parent4b63ffc8c475604d9ea1cc588ee33dfe7980ba86 (diff)
make/scripts/setenv.jogl.sh: Add JOAL_LIB_DIR to LD_LIBRARY_PATH (used if not testing using jars but classpath)
Diffstat (limited to 'make')
-rwxr-xr-xmake/scripts/setenv-jogl.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh
index cbc85760d..39d47da4f 100755
--- a/make/scripts/setenv-jogl.sh
+++ b/make/scripts/setenv-jogl.sh
@@ -75,6 +75,7 @@ if [ ! -e "$JOAL_BUILDDIR" ] ; then
echo JOAL_BUILDDIR "$JOAL_BUILDDIR" does not exist \(warning\)
fi
JOAL_JAR="$JOAL_BUILDDIR"/jar/joal.jar
+JOAL_LIB_DIR="$JOAL_BUILDDIR"/obj
if [ -z "$ANT_PATH" ] ; then
ANT_PATH=$(dirname $(dirname $(which ant)))
@@ -116,8 +117,8 @@ export JOGAMP_ALL_AWT_CLASSPATH JOGAMP_ALL_NOAWT_CLASSPATH JOGAMP_MOBILE_CLASSPA
JOGAMP_CLASSPATH=.:"$GLUEGEN_JAR":"$JOAL_JAR":"$JOGL_CLASSPATH":"$SWT_CLASSPATH":"$JUNIT_JAR":"$ANT_JARS":"$SEMVER_JAR":"$GLUEGEN_TESTUTIL_JAR"
export JOGAMP_CLASSPATH
-export JOGAMP_LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$GLUEGEN_OS":"$JOGL_LIB_DIR"
-export JOGAMP_DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH":"$GLUEGEN_OS":"$JOGL_LIB_DIR"
+export JOGAMP_LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$GLUEGEN_OS":"$JOGL_LIB_DIR":"$JOAL_LIB_DIR"
+export JOGAMP_DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH":"$GLUEGEN_OS":"$JOGL_LIB_DIR":"$JOAL_LIB_DIR"
echo JOGAMP_ALL_AWT_CLASSPATH: "$JOGAMP_ALL_AWT_CLASSPATH"
echo JOGAMP_ALL_NOAWT_CLASSPATH: "$JOGAMP_ALL_NOAWT_CLASSPATH"