diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-newt.xml | 10 | ||||
| -rwxr-xr-x | make/scripts/java-win64-dbg.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/java-win64.bat | 4 | ||||
| -rw-r--r-- | make/scripts/tests.bat | 6 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 10 |
5 files changed, 26 insertions, 8 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index 58f8d1962..820c50a3a 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -239,11 +239,13 @@ <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd"> <syslibset dir="/usr/local/lib" libs="X11"/> + <syslibset libs="Xrandr"/> <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> </linker> <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64"> <syslibset dir="/usr/local/lib" libs="X11"/> + <syslibset libs="Xrandr"/> <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> </linker> @@ -254,11 +256,13 @@ <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux"> <syslibset libs="X11"/> + <syslibset libs="Xrandr"/> <syslibset libs="Xxf86vm" /> </linker> <linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64"> <syslibset libs="X11"/> + <syslibset libs="Xrandr"/> <syslibset libs="Xxf86vm" /> </linker> @@ -531,8 +535,14 @@ <target name="c.build.newt.prepare.desktop" unless="setup.nodesktop"> <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.impl.windows.WindowsWindow" /> + <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.impl.windows.WindowsScreen" /> + <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.impl.windows.WindowsDisplay" /> <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.impl.macosx.MacWindow" /> + <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.impl.macosx.MacScreen" /> + <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.impl.macosx.MacDisplay" /> <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.impl.x11.X11Window" /> + <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.impl.x11.X11Screen" /> + <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.impl.x11.X11Display" /> </target> <target name="c.build.newt.prepare" depends="c.build.newt.prepare.KD,c.build.newt.prepare.IntelGDL,c.build.newt.prepare.BroadcomEGL,c.build.newt.prepare.desktop" /> diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index a3d7b6195..57281d6fd 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_21_x64
-set JAVA_HOME=c:\jdk1.6.0_21_x64
+set J2RE_HOME=c:\jre1.6.0_20_x64
+set JAVA_HOME=c:\jdk1.6.0_20_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/java-win64.bat b/make/scripts/java-win64.bat index eb40ca40c..96df81720 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_21_x64
-set JAVA_HOME=c:\jdk1.6.0_21_x64
+set J2RE_HOME=c:\jre1.6.0_20_x64
+set JAVA_HOME=c:\jdk1.6.0_20_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/tests.bat b/make/scripts/tests.bat index 15bc529dd..4049fc278 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -14,8 +14,10 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRob REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 -REM scripts\java-win32.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT +scripts\java-win64.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT -scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT +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 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting02NEWT diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index adaaafff0..7246a7ec4 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -29,7 +29,7 @@ spath=`dirname $0` # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT $* -$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $* +# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting03AWT $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* @@ -38,6 +38,12 @@ $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.Test # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot $* # $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot $* -$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestEventSourceNotAWTBug $* +#$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestEventSourceNotAWTBug $* + +#$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestScreenMode01NEWT $* + +$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestScreenMode02NEWT $* + + $spath/count-edt-start.sh java-run.log |