diff options
| author | Sven Gothel <[email protected]> | 2013-04-18 08:31:11 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-04-18 08:31:11 +0200 |
| commit | d173feb60d085399194549102d4b3d77512c3f73 (patch) | |
| tree | 77aaef10eca29c3b91fdca5621bcfdfa57558672 /make | |
| parent | f8adb848c0d6b61a8a34dfcdaf13ca773000fbb4 (diff) | |
Bug 721: NEWT/X11 RandR 1.3 Support - Part 1 - Delegate RandR functionality to pluggable impl. for RandR 1.1 and 1.3 (todo)
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-newt.xml | 24 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index c601bc120..d728b42c7 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -584,19 +584,20 @@ <patternset id="c.src.files.newt"> <include name="${rootrel.src.c}/NewtCommon.c" /> <!-- include name="${rootrel.src.c}/timespec.c" /--> <!-- currently used for X11 and OSX with special PERF DEBUG MODE--> - <include name="${rootrel.src.c}/WindowsWindow.c" if="isWindows"/> - <include name="${rootrel.src.c}/MacWindow.m" if="isOSX"/> - <include name="${rootrel.src.c}/NewtMacWindow.m" if="isOSX"/> - <include name="${rootrel.src.c}/AndroidWindow.c" if="isAndroid"/> - <include name="${rootrel.src.c}/X11Display.c" if="isX11"/> + <include name="${rootrel.src.c}/WindowsWindow.c" if="isWindows"/> + <include name="${rootrel.src.c}/MacWindow.m" if="isOSX"/> + <include name="${rootrel.src.c}/NewtMacWindow.m" if="isOSX"/> + <include name="${rootrel.src.c}/AndroidWindow.c" if="isAndroid"/> + <include name="${rootrel.src.c}/X11Display.c" if="isX11"/> <!-- include name="${rootrel.src.c}/X11Event.c" if="isX11"/--> <!-- include name="${rootrel.src.c}/XCBEvent.c" if="isX11"/--> - <include name="${rootrel.src.c}/X11Screen.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}/bcm_egl.c" if="setup.addNativeBroadcom"/> - <include name="${rootrel.src.c}/bcm_vc_iv.c" if="setup.addNativeBroadcom"/> + <include name="${rootrel.src.c}/X11Screen.c" if="isX11"/> + <include name="${rootrel.src.c}/X11ScreenRandR11.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}/bcm_egl.c" if="setup.addNativeBroadcom"/> + <include name="${rootrel.src.c}/bcm_vc_iv.c" if="setup.addNativeBroadcom"/> </patternset> <echo message="Compiling @{output.lib.name}" /> @@ -700,6 +701,7 @@ <javah destdir="${src.generated.c}/MacOSX" classpath="${javah.classpath}" class="jogamp.newt.driver.macosx.DisplayDriver" /> <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.WindowDriver" /> <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.ScreenDriver" /> + <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.ScreenRandR11" /> <javah destdir="${src.generated.c}/X11" classpath="${javah.classpath}" class="jogamp.newt.driver.x11.DisplayDriver" /> </target> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 23dbf3fd0..d9d5cd622 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -289,7 +289,7 @@ function testawtswt() { #testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWTAnalyzeBug455 $* -testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsGLJPanelAWT $* +#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsGLJPanelAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsGLJPanelAWTBug450 $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNewtAWTWrapper $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $* @@ -378,7 +378,7 @@ testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsGLJPanelAWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindowInvisiblePointer01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT -#testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT $* +testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00bNEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01bNEWT |