diff options
| author | Sven Gothel <[email protected]> | 2011-08-25 00:01:07 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-25 00:01:07 +0200 |
| commit | 66f8b612106d0a462d1a6382409fce0ad692f746 (patch) | |
| tree | 53dfce1f84d6d76b3cc49203867f01a9b872453a /make | |
| parent | b8b25bb01b826e1216551c8f3d192bcec670e265 (diff) | |
NEWT/X11 XCB testxcb-test
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-newt.xml | 4 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index 74263e456..38e5622fd 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -269,6 +269,8 @@ <syslibset libs="X11"/> <syslibset libs="Xrandr"/> <syslibset libs="Xxf86vm" /> + <syslibset libs="X11-xcb" /> + <syslibset libs="xcb" /> </linker> <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7"> @@ -469,7 +471,7 @@ <include name="${rootrel.src.c}/WindowsWindow.c" if="isWindows"/> <include name="${rootrel.src.c}/*.m" if="isOSX"/> <include name="${rootrel.src.c}/AndroidWindow.c" if="isAndroid"/> - <include name="${rootrel.src.c}/X11Window.c" if="isX11"/> + <include name="${rootrel.src.c}/X11Window*.c" if="isX11"/> <include name="${rootrel.src.c}/KDWindow.c" if="setup.addNativeKD"/> <include name="${rootrel.src.c}/IntelGDL.c" if="setup.addNativeIntelGDL"/> <include name="${rootrel.src.c}/BroadcomEGL.c" if="setup.addNativeBroadcomEGL"/> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 5ba1c6e0e..7aa8ba185 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -77,7 +77,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GraphicsConfiguration" #D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.GraphicsConfiguration" #D_ARGS="-Djogl.debug.GLCanvas" - D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler -Djogl.debug.GLSLCode" + D_ARGS="-Dnativewindow.x11.mt-bug=true -Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL" #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" #D_ARGS="-Djogl.debug.GLDebugMessageHandler" @@ -143,7 +143,7 @@ function testawtmt() { #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $* #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.TestGLWindows02NEWTAnimated $* #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT @@ -152,7 +152,7 @@ function testawtmt() { #testawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT -testnoawt com.jogamp.opengl.test.junit.newt.ManualScreenMode03NEWT +#testnoawt com.jogamp.opengl.test.junit.newt.ManualScreenMode03NEWT #testawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT -time 1000000 #testawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT #testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $* |