diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-newt.xml | 14 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index ac791add2..541077b9d 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -526,9 +526,10 @@ </linker> <linker id="linker.cfg.linux.newt.egl_gbm" extends="linker.cfg.linux"> - <syslibset libs="EGL"/> - <syslibset libs="gbm"/> <syslibset libs="drm"/> + <syslibset libs="gbm"/> + <syslibset libs="EGL"/> + <syslibset libs="GLESv2"/> </linker> <linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux"> @@ -556,8 +557,12 @@ <syslibset libs="Xi"/> <!--syslibset libs="xcb" /--> <!--syslibset libs="X11-xcb" /--> - <syslibset libs="gbm"/> <!-- FIXME --> - <syslibset libs="drm"/> <!-- FIXME --> + <syslibset libs="gbm"/> + <!-- + <syslibset libs="drm"/> + <syslibset libs="gbm"/> + <syslibset libs="EGL"/> + <syslibset libs="GLESv2"/> --> </linker> <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6"> @@ -897,6 +902,7 @@ <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}/egl_gbm.c" if="setup.addNativeEGLGBM"/> + <include name="${rootrel.src.c}/egl_gbm_drmflip.c" if="setup.addNativeEGLGBM"/> </patternset> <echo message="Compiling @{output.lib.name}" /> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 3d8ac7738..ddfa6c113 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -120,6 +120,8 @@ function jrun() { #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all" #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.disable.opengldesktop" + D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.disable.opengldesktop" #D_ARGS="-Dnativewindow.debug.JAWT -Djogamp.debug.UnsafeUtil" #D_ARGS="-Dnativewindow.debug.OSXUtil -Dnativewindow.debug.JAWT -Djogl.debug.GLContext" @@ -367,8 +369,7 @@ function jrun() { export USE_CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH #export USE_CLASSPATH=$JOGAMP_MOBILE_CLASSPATH #export USE_CLASSPATH=.:$GLUEGEN_JAR:$JOGL_BUILDDIR/jar/atomic/jogl.jar:$JOGL_BUILDDIR/jar/atomic/jogl-gldesktop.jar:$JOGL_BUILDDIR/jar/atomic/jogl-os-x11.jar:$JOGL_BUILDDIR/jar/atomic/jogl-util.jar:$JOGL_BUILDDIR/jar/atomic/nativewindow.jar:$JOGL_BUILDDIR/jar/atomic/nativewindow-os-x11.jar:$JOGL_BUILDDIR/jar/atomic/newt.jar:$JOGL_BUILDDIR/jar/atomic/newt-driver-x11.jar:$JOGL_BUILDDIR/jar/atomic/newt-ogl.jar:$JOGL_BUILDDIR/jar/jogl-test.jar:$JUNIT_JAR:$ANT_JARS - #X_ARGS="-Djava.awt.headless=true $X_ARGS" - X_ARGS="-Djava.awt.headless=false $X_ARGS" + X_ARGS="-Djava.awt.headless=true $X_ARGS" fi if [ $USE_BUILDDIR -eq 1 ] ; then |