diff options
| -rwxr-xr-x | etc/profile.jogl | 8 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/etc/profile.jogl b/etc/profile.jogl index 2902bccb2..9b38d6a06 100755 --- a/etc/profile.jogl +++ b/etc/profile.jogl @@ -70,13 +70,7 @@ else fi export JOGL_BUILD_DIR -JOGL_LIB_DIR="" -if [ $AUTOBUILD -eq 0 ] ; then - JOGL_LIB_DIR=$JOGL_BUILD_DIR/nativewindow/obj:$JOGL_BUILD_DIR/jogl/obj:$JOGL_BUILD_DIR/newt/obj -else - # Autobuild - JOGL_LIB_DIR=$THISDIR/lib -fi +JOGL_LIB_DIR=$JOGL_BUILD_DIR/lib export JOGL_LIB_DIR if [ ! -z "$JOGL_PROFILE" ] ; then diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 21a3c6254..0d2aef8c5 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -76,7 +76,7 @@ function jrun() { #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" #D_ARGS="-Dnewt.debug.Window -Djogl.debug.Animator -Dnewt.debug.Screen" - D_ARGS="-Dnewt.debug.Window" + #D_ARGS="-Dnewt.debug.Window" #D_ARGS="-Xprof" #D_ARGS="-Djogl.debug.Animator" #D_ARGS="-Dnativewindow.debug=all" @@ -92,6 +92,11 @@ function jrun() { #D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState" + #D_ARGS="-Djogamp.debug.JARUtil" + #D_ARGS="-Djogamp.debug.TempFileCache" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JARUtil" + D_ARGS="-Djogamp.debug.JNILibLoader" + #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false" #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true" #X_ARGS="-verbose:jni" @@ -107,6 +112,8 @@ function jrun() { echo echo "Test Start: $*" echo + echo LD_LIBRARY_PATH $LD_LIBRARY_PATH + echo echo $javaexe $X_ARGS $D_ARGS $C_ARG $* #LD_LIBRARY_PATH=/usr/local/projects/Xorg.modular/build-x86_64/lib:$LD_LIBRARY_PATH \ #LD_LIBRARY_PATH=/opt-linux-x86_64/x11lib-1.3:$LD_LIBRARY_PATH \ @@ -152,14 +159,14 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT -testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00bNEWT |