diff options
| author | Sven Gothel <[email protected]> | 2011-09-28 19:04:53 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-09-28 19:04:53 +0200 |
| commit | 22e869ae8b6a44e2f06f73b557a0b8d3bb0da49f (patch) | |
| tree | ba1fc3121f5481147caf83d944af3a9ca008d96a /make/scripts | |
| parent | cc9ab3d4e1ed2c7b9d38a9599a37abd05be36cc0 (diff) | |
Android/Demos: Add ElektronenMultiplizierer (fix shader and keylistener add/remove)
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x[-rw-r--r--] | make/scripts/adb-install-all.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | make/scripts/adb-uninstall-all.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/make/scripts/adb-install-all.sh b/make/scripts/adb-install-all.sh index e266ae22d..ac18a84ed 100644..100755 --- a/make/scripts/adb-install-all.sh +++ b/make/scripts/adb-install-all.sh @@ -1,4 +1,4 @@ -adb install ../../gluegen/build-android-armv7/gluegen-rt.apk +#adb install ../../gluegen/build-android-armv7/gluegen-rt.apk adb install ../build-android-armv7/jar/jogl.all-android.apk adb install ../build-android-armv7/jar/jogl.android-launcher.apk adb install ../build-android-armv7/jar/jogl.test.apk diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh index db079fcf0..059b1d5aa 100644..100755 --- a/make/scripts/adb-uninstall-all.sh +++ b/make/scripts/adb-uninstall-all.sh @@ -1,4 +1,4 @@ -adb uninstall com.jogamp.common +#adb uninstall com.jogamp.common adb uninstall javax.media.opengl adb uninstall com.jogamp.android.launcher adb uninstall com.jogamp.opengl.test diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index a3e8c92f3..2182ad0dd 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -69,7 +69,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GraphicsConfiguration" #D_ARGS="-Dnewt.debug.EDT" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" - D_ARGS="-Djogl.debug=all -Dnewt.debug=all" + #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" @@ -246,11 +246,11 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $* -testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* +#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* # # regressions |