diff options
| author | Sven Gothel <[email protected]> | 2010-10-29 13:46:43 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-10-29 13:46:43 +0200 |
| commit | 81ee164ec139337254ef0e8938c19119908de6ae (patch) | |
| tree | ba0141b67713f4f1e5bd7c89ebf9013484c70af9 /make/scripts | |
| parent | 8e1e785f26ff57b58fe6218f7ad1c9379760d367 (diff) | |
Fix ScreenMode ; Add FatalError to NewtCommon.c ; Fix Windows Build
Fix ScreenMode
- Avoid NPE/Out-of-memory: Return zero sized NewIntArrays instead of NULL.
Fix Windows Build
- ScreenMode still has a regression
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/java-win64-dbg.bat | 6 | ||||
| -rwxr-xr-x | make/scripts/java-win64.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.win64.bat | 2 | ||||
| -rw-r--r-- | make/scripts/tests.bat | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 57281d6fd..1a3bd5910 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.6.0_20_x64
-set JAVA_HOME=c:\jdk1.6.0_20_x64
+set J2RE_HOME=c:\jre1.6.0_21_x64
+set JAVA_HOME=c:\jdk1.6.0_21_x64
set ANT_PATH=C:\apache-ant-1.8.1
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
@@ -18,7 +18,7 @@ REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"
-set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.EDT" "-Dnativewindow.debug=all" "-Djogamp.common.utils.locks.Lock.timeout=600000" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
+set D_ARGS="-Dnewt.debug=all" "-Dnewt.debug.EDT" "-Dnativewindow.debug=all" "-Djogamp.common.utils.locks.Lock.timeout=600000" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display" "-Dnewt.test.Window.reparent.incompatible=true"
set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 96df81720..eb40ca40c 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.6.0_20_x64
-set JAVA_HOME=c:\jdk1.6.0_20_x64
+set J2RE_HOME=c:\jre1.6.0_21_x64
+set JAVA_HOME=c:\jdk1.6.0_21_x64
set ANT_PATH=C:\apache-ant-1.8.1
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 8dd932df4..15df3878a 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -14,4 +14,4 @@ REM -DuseKD=true REM -Djogl.cg=1
REM -Dbuild.noarchives=true
-ant -Dbuild.noarchives=true -Drootrel.build=build-win64 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
+ant -Dc.compiler.debug=true -Dbuild.noarchives=true -Drootrel.build=build-win64 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index 4049fc278..5d7944abc 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -15,8 +15,8 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode00NEWT REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT -scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT |