From 4dbb8731219212e27c9afb769a1c62b32bd230a6 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 5 Aug 2011 05:32:15 +0200 Subject: deployment resturcturing: combine nativewindow/jogl/newt ; newt: 'driver' separation ; android cleanup remaining all-in-one jnlp's / jars: jogl-all-awt.jnlp -> jogl.all.jar jogl-all-noawt.jnlp -> jogl.all-noawt.jar jogl-all-mobile.jnlp -> jogl.all-mobile.jar native for all above: jogl-all-natives-linux-amd64.jar jogl.all-android.apk jogl.all-android.jar more may follow for each supported platfrom ++++ - newt: proper 'driver' separation - all drivers reside now in jogamp.newt.driver.* - remove intptr.cfg / use gluegen's --- .classpath | 1 + doc/deployment/JOGL-DEPLOYMENT.html | 68 ++-- etc/profile.jogl | 63 +-- jnlp-files/applet-version-jnlp.html | 4 +- jnlp-files/applet-version-lancheronly.html | 4 +- jnlp-files/applet-version.jnlp | 2 +- jnlp-files/application-version.jnlp | 2 +- jnlp-files/javaws-version.jnlp | 2 +- jnlp-files/jogl-all-awt.jnlp | 35 +- jnlp-files/jogl-all-noawt.jnlp | 35 +- jnlp-files/jogl-awt.jnlp | 24 -- jnlp-files/jogl-core.jnlp | 68 ---- jnlp-files/nativewindow-all-awt.jnlp | 65 --- jnlp-files/nativewindow-awt.jnlp | 22 -- jnlp-files/nativewindow.jnlp | 77 ---- jnlp-files/newt-all-awt.jnlp | 65 --- jnlp-files/newt-all-noawt.jnlp | 65 --- jnlp-files/newt-awt.jnlp | 22 -- jnlp-files/newt-jogl.jnlp | 22 -- jnlp-files/newt.jnlp | 79 ---- make/build-common.xml | 297 +++++++++----- make/build-jogl.xml | 289 ++++---------- make/build-nativewindow.xml | 52 +-- make/build-newt.xml | 205 +++++----- make/build-test.xml | 18 +- make/build.xml | 138 ++++++- make/config/intptr.cfg | 17 - make/config/jogl/cg-common.cfg | 1 + make/config/jogl/cglext.cfg | 3 +- make/config/jogl/egl.cfg | 5 +- make/config/jogl/eglext.cfg | 5 +- make/config/jogl/gl-es1.cfg | 2 +- make/config/jogl/gl-es2.cfg | 2 +- make/config/jogl/gl-gl4bc.cfg | 1 - make/config/jogl/gl-headers.cfg | 1 + make/config/jogl/gl-if-gl2.cfg | 1 - make/config/jogl/gl-if-gl3.cfg | 1 - make/config/jogl/gl-if-gl3bc.cfg | 1 - make/config/jogl/gl-if-gl4.cfg | 1 - make/config/jogl/gl3-headers.cfg | 1 + make/config/jogl/gl3ext-headers.cfg | 1 + make/config/jogl/glu-gl2.cfg | 3 +- make/config/jogl/glxext.cfg | 1 - make/config/jogl/wgl-win32.cfg | 2 - make/config/jogl/wglext.cfg | 1 - make/config/nativewindow/jawt-win32.cfg | 3 +- make/config/nativewindow/jawt-x11.cfg | 3 +- make/config/nativewindow/win32-lib.cfg | 5 +- make/config/nativewindow/x11-lib.cfg | 3 +- make/joglversion | 1 + make/nativewindowversion | 1 + make/newtversion | 1 + make/scripts/lstjars.sh | 78 ++-- make/scripts/make.jogl.all.linux-armv7-cross.sh | 6 +- make/scripts/make.jogl.all.linux-x86.sh | 9 +- make/scripts/make.jogl.all.linux-x86_64.sh | 6 +- make/scripts/make.jogl.all.macosx.sh | 1 - make/scripts/make.jogl.all.win32.bat | 7 +- make/scripts/make.jogl.all.win64.bat | 7 +- make/scripts/tests.sh | 2 +- make/stub_includes/egl/EGL/eglplatform.h | 2 +- make/versions.xml | 1 + src/jogl/native/GLDebugMessageHandler.c | 1 + .../media/nativewindow/NativeWindowFactory.java | 5 +- .../classes/com/jogamp/newt/util/MainThread.java | 2 +- src/newt/classes/jogamp/newt/DisplayImpl.java | 14 +- src/newt/classes/jogamp/newt/ScreenImpl.java | 14 +- src/newt/classes/jogamp/newt/WindowImpl.java | 14 +- src/newt/classes/jogamp/newt/awt/AWTCanvas.java | 312 --------------- src/newt/classes/jogamp/newt/awt/AWTDisplay.java | 67 ---- src/newt/classes/jogamp/newt/awt/AWTEDTUtil.java | 108 ----- src/newt/classes/jogamp/newt/awt/AWTScreen.java | 65 --- src/newt/classes/jogamp/newt/awt/AWTWindow.java | 244 ------------ .../jogamp/newt/awt/opengl/VersionApplet.java | 174 -------- .../android/event/AndroidNewtEventFactory.java | 175 ++++++++ .../classes/jogamp/newt/driver/awt/AWTCanvas.java | 312 +++++++++++++++ .../classes/jogamp/newt/driver/awt/AWTDisplay.java | 67 ++++ .../classes/jogamp/newt/driver/awt/AWTEDTUtil.java | 108 +++++ .../classes/jogamp/newt/driver/awt/AWTScreen.java | 65 +++ .../classes/jogamp/newt/driver/awt/AWTWindow.java | 244 ++++++++++++ .../newt/driver/awt/opengl/VersionApplet.java | 174 ++++++++ .../jogamp/newt/driver/broadcom/egl/Display.java | 81 ++++ .../jogamp/newt/driver/broadcom/egl/Screen.java | 62 +++ .../jogamp/newt/driver/broadcom/egl/Window.java | 165 ++++++++ .../jogamp/newt/driver/intel/gdl/Display.java | 104 +++++ .../jogamp/newt/driver/intel/gdl/Screen.java | 68 ++++ .../jogamp/newt/driver/intel/gdl/Window.java | 148 +++++++ .../classes/jogamp/newt/driver/kd/KDDisplay.java | 84 ++++ .../classes/jogamp/newt/driver/kd/KDScreen.java | 58 +++ .../classes/jogamp/newt/driver/kd/KDWindow.java | 148 +++++++ .../jogamp/newt/driver/macosx/MacDisplay.java | 100 +++++ .../jogamp/newt/driver/macosx/MacScreen.java | 57 +++ .../jogamp/newt/driver/macosx/MacWindow.java | 439 +++++++++++++++++++++ .../jogamp/newt/driver/windows/WindowsDisplay.java | 94 +++++ .../jogamp/newt/driver/windows/WindowsScreen.java | 114 ++++++ .../jogamp/newt/driver/windows/WindowsWindow.java | 209 ++++++++++ .../classes/jogamp/newt/driver/x11/X11Display.java | 119 ++++++ .../classes/jogamp/newt/driver/x11/X11Screen.java | 270 +++++++++++++ .../classes/jogamp/newt/driver/x11/X11Window.java | 150 +++++++ .../egl/android/event/AndroidNewtEventFactory.java | 175 -------- .../classes/jogamp/newt/egl/broadcom/Display.java | 81 ---- .../classes/jogamp/newt/egl/broadcom/Screen.java | 62 --- .../classes/jogamp/newt/egl/broadcom/Window.java | 165 -------- src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java | 84 ---- src/newt/classes/jogamp/newt/egl/kd/KDScreen.java | 58 --- src/newt/classes/jogamp/newt/egl/kd/KDWindow.java | 148 ------- .../classes/jogamp/newt/intel/gdl/Display.java | 104 ----- src/newt/classes/jogamp/newt/intel/gdl/Screen.java | 68 ---- src/newt/classes/jogamp/newt/intel/gdl/Window.java | 148 ------- .../classes/jogamp/newt/macosx/MacDisplay.java | 100 ----- src/newt/classes/jogamp/newt/macosx/MacScreen.java | 57 --- src/newt/classes/jogamp/newt/macosx/MacWindow.java | 439 --------------------- .../jogamp/newt/windows/WindowsDisplay.java | 94 ----- .../classes/jogamp/newt/windows/WindowsScreen.java | 114 ------ .../classes/jogamp/newt/windows/WindowsWindow.java | 209 ---------- src/newt/classes/jogamp/newt/x11/X11Display.java | 119 ------ src/newt/classes/jogamp/newt/x11/X11Screen.java | 270 ------------- src/newt/classes/jogamp/newt/x11/X11Window.java | 150 ------- src/newt/native/BroadcomEGL.c | 16 +- src/newt/native/IntelGDL.c | 24 +- src/newt/native/KDWindow.c | 20 +- src/newt/native/MacWindow.m | 62 +-- src/newt/native/WindowsWindow.c | 58 +-- src/newt/native/X11Window.c | 108 ++--- 124 files changed, 4469 insertions(+), 5009 deletions(-) delete mode 100644 jnlp-files/jogl-awt.jnlp delete mode 100644 jnlp-files/jogl-core.jnlp delete mode 100644 jnlp-files/nativewindow-all-awt.jnlp delete mode 100644 jnlp-files/nativewindow-awt.jnlp delete mode 100644 jnlp-files/nativewindow.jnlp delete mode 100644 jnlp-files/newt-all-awt.jnlp delete mode 100644 jnlp-files/newt-all-noawt.jnlp delete mode 100644 jnlp-files/newt-awt.jnlp delete mode 100644 jnlp-files/newt-jogl.jnlp delete mode 100644 jnlp-files/newt.jnlp delete mode 100644 make/config/intptr.cfg delete mode 100644 src/newt/classes/jogamp/newt/awt/AWTCanvas.java delete mode 100644 src/newt/classes/jogamp/newt/awt/AWTDisplay.java delete mode 100644 src/newt/classes/jogamp/newt/awt/AWTEDTUtil.java delete mode 100644 src/newt/classes/jogamp/newt/awt/AWTScreen.java delete mode 100644 src/newt/classes/jogamp/newt/awt/AWTWindow.java delete mode 100644 src/newt/classes/jogamp/newt/awt/opengl/VersionApplet.java create mode 100644 src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java create mode 100644 src/newt/classes/jogamp/newt/driver/awt/AWTCanvas.java create mode 100644 src/newt/classes/jogamp/newt/driver/awt/AWTDisplay.java create mode 100644 src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java create mode 100644 src/newt/classes/jogamp/newt/driver/awt/AWTScreen.java create mode 100644 src/newt/classes/jogamp/newt/driver/awt/AWTWindow.java create mode 100644 src/newt/classes/jogamp/newt/driver/awt/opengl/VersionApplet.java create mode 100644 src/newt/classes/jogamp/newt/driver/broadcom/egl/Display.java create mode 100644 src/newt/classes/jogamp/newt/driver/broadcom/egl/Screen.java create mode 100644 src/newt/classes/jogamp/newt/driver/broadcom/egl/Window.java create mode 100644 src/newt/classes/jogamp/newt/driver/intel/gdl/Display.java create mode 100644 src/newt/classes/jogamp/newt/driver/intel/gdl/Screen.java create mode 100644 src/newt/classes/jogamp/newt/driver/intel/gdl/Window.java create mode 100644 src/newt/classes/jogamp/newt/driver/kd/KDDisplay.java create mode 100644 src/newt/classes/jogamp/newt/driver/kd/KDScreen.java create mode 100644 src/newt/classes/jogamp/newt/driver/kd/KDWindow.java create mode 100644 src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java create mode 100644 src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java create mode 100644 src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java create mode 100644 src/newt/classes/jogamp/newt/driver/windows/WindowsDisplay.java create mode 100644 src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java create mode 100644 src/newt/classes/jogamp/newt/driver/windows/WindowsWindow.java create mode 100644 src/newt/classes/jogamp/newt/driver/x11/X11Display.java create mode 100644 src/newt/classes/jogamp/newt/driver/x11/X11Screen.java create mode 100644 src/newt/classes/jogamp/newt/driver/x11/X11Window.java delete mode 100644 src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java delete mode 100644 src/newt/classes/jogamp/newt/egl/broadcom/Display.java delete mode 100644 src/newt/classes/jogamp/newt/egl/broadcom/Screen.java delete mode 100644 src/newt/classes/jogamp/newt/egl/broadcom/Window.java delete mode 100644 src/newt/classes/jogamp/newt/egl/kd/KDDisplay.java delete mode 100644 src/newt/classes/jogamp/newt/egl/kd/KDScreen.java delete mode 100644 src/newt/classes/jogamp/newt/egl/kd/KDWindow.java delete mode 100644 src/newt/classes/jogamp/newt/intel/gdl/Display.java delete mode 100644 src/newt/classes/jogamp/newt/intel/gdl/Screen.java delete mode 100644 src/newt/classes/jogamp/newt/intel/gdl/Window.java delete mode 100644 src/newt/classes/jogamp/newt/macosx/MacDisplay.java delete mode 100644 src/newt/classes/jogamp/newt/macosx/MacScreen.java delete mode 100644 src/newt/classes/jogamp/newt/macosx/MacWindow.java delete mode 100644 src/newt/classes/jogamp/newt/windows/WindowsDisplay.java delete mode 100644 src/newt/classes/jogamp/newt/windows/WindowsScreen.java delete mode 100644 src/newt/classes/jogamp/newt/windows/WindowsWindow.java delete mode 100644 src/newt/classes/jogamp/newt/x11/X11Display.java delete mode 100644 src/newt/classes/jogamp/newt/x11/X11Screen.java delete mode 100644 src/newt/classes/jogamp/newt/x11/X11Window.java diff --git a/.classpath b/.classpath index bb012ba81..3a9a4693f 100644 --- a/.classpath +++ b/.classpath @@ -26,6 +26,7 @@ + diff --git a/doc/deployment/JOGL-DEPLOYMENT.html b/doc/deployment/JOGL-DEPLOYMENT.html index b54bc6406..b64bffa61 100644 --- a/doc/deployment/JOGL-DEPLOYMENT.html +++ b/doc/deployment/JOGL-DEPLOYMENT.html @@ -38,54 +38,36 @@

Desktop All in One

-

With AWT and NEWT

+

With AWT

    -
  • newt-all-awt.jnlp
    +
  • jogl-all-awt.jnlp
      -
    • jogl-all-awt.jnlp
      -
        -
      • gluegen-rt.jnlp
        • -
      • nativewindow-all-awt.jnlp
        • -
      -
      • +
    • gluegen-rt.jnlp
-

With AWT - Without NEWT

+

Without AWT

    -
  • jogl-all-awt.jnlp
    +
  • jogl-all-noawt.jnlp
    • gluegen-rt.jnlp
      • -
    • nativewindow-all-awt.jnlp
-

- It loads the JAR files for the native libraries,
- as well as the other All In One JAR files - for AWT support. -

- -

Without AWT

+

Mobile

    -
  • newt-all-noawt.jnlp
    +
  • jogl-all-mobile.jnlp
      -
    • jogl-all-noawt.jnlp
      -
        -
      • gluegen-rt.jnlp
        • -
      • nativewindow.jnlp
        • -
      -
      • +
    • gluegen-rt.jnlp
-

It loads the JAR files for the native libraries,
as well as the other All In One JAR files - for Without AWT support. + for AWT support.

@@ -108,9 +90,7 @@ JOGL native libraries
  • libjogl_desktop.so
    • -
  • libjogl_gl2es12.so
    • -
  • libjogl_es1.so
    • -
  • libjogl_es2.so
    • +
  • libjogl_mobile.so
  • libjogl_cg.so
@@ -141,18 +121,19 @@ With AWT:
    -
  • nativewindow.all.jar
  • jogl.all.jar
    • -
  • newt.all.jar (optional - redundant if no NEWT is used)
Without AWT:
    -
  • nativewindow.all-noawt.jar
  • jogl.all-noawt.jar
    • -
  • newt.all-noawt.jar
+ Mobile: +
    +
  • jogl.all-mobile.jar
    • +
  • jogl.all-android.jar
    • +

Atomic Deployment

@@ -190,17 +171,19 @@
  • JOGL [pick your platform]:
      -
    • jogl.egl.jar
    • jogl.os.x11.jar
    • jogl.os.win.jar
    • jogl.os.osx.jar
      • +
    • none
  • Newt [pick your platform] (optional):
      -
    • newt.os.x11.jar
      • -
    • newt.os.win.jar
      • -
    • newt.os.osx.jar
      • +
    • newt.driver.x11.jar
      • +
    • newt.driver.win.jar
      • +
    • newt.driver.osx.jar
      • +
    • newt.driver.kd.jar
      • +
    • none
    • @@ -211,13 +194,9 @@
    • Embedded Device Profiles
        -
      • jogl.gles1.jar
        -
          -
        • jogl.gles1.dbg.jar
          • -
        • -
      • jogl.gles2.jar
        +
      • jogl.glmobile.jar
          • -
        • jogl.gles2.dbg.jar
          • +
        • jogl.glmobile.dbg.jar
      • @@ -227,7 +206,6 @@
      • jogl.gldesktop.dbg.jar
      -
    • jogl.gl2es12.jar (for desktop ES1/ES2 emulation)
    diff --git a/etc/profile.jogl b/etc/profile.jogl index 13cbc0553..14c0f7065 100755 --- a/etc/profile.jogl +++ b/etc/profile.jogl @@ -2,14 +2,14 @@ function print_usage() { - echo "Usage: $0 {JOGL_ALLALL|JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ES1_MIN|JOGL_ES1_MAX|JOGL_ES2_MIN|JOGL_ES2_MAX|JOGL_GLDESKTOP_MIN|JOGL_GLDESKTOP_MAX} [jogl-build-dir]" + echo "Usage: $0 {JOGL_ALL|JOGL_ALL_NOAWT|JOGL_ALL_MOBILE} [jogl-build-dir]" } function concat_jogl_list() { ITEMDIR=$1 shift - for j in $ITEMDIR/nativewindow $ITEMDIR/jogl $ITEMDIR/newt $ITEMDIR ; do + for j in $ITEMDIR $ITEMDIR/jar ; do for i in $* ; do if [ -e $j/$i ] ; then if [ -z "$JOGL_LIST" ] ; then @@ -30,33 +30,18 @@ uname -a | grep -i LINUX && OSS=x11 uname -a | grep -i Darwin && OSS=osx uname -a | grep -i CYGWIN && OSS=win -JOGL_AWT="jogl.awt.jar jogl.util.awt.jar newt.awt.jar nativewindow.awt.jar" - -JOGL_CORE="nativewindow.core.jar nativewindow.os.$OSS.jar jogl.core.jar jogl.os.$OSS.jar newt.core.jar newt.os.$OSS.jar newt.ogl.jar jogl.util.jar" - JOGL_TEST="jogl.test.jar" -JOGL_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar jogl.util.gldesktop.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gldesktop.jar jogl.util.gldesktop.jar jogl.util.fixedfuncemu.jar jogl.cg.jar" -JOGL_JAR_ALL="$JOGL_JAR_ALL_NOAWT $JOGL_AWT" -JOGL_LIB_ALL="libjogl_desktop.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so" - -JOGL_JAR_ES1_MIN="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar" -JOGL_JAR_ES1_MAX="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.egl.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT" -JOGL_LIB_ES1_MIN="libjogl_es1.so libnewt.so" -JOGL_LIB_ES1_MAX="libjogl_es1.so libnewt.so libjogl_awt.so libnativewindow_x11.so libnativewindow_awt.so" +JOGL_JAR_ALL="jogl.all.jar" +JOGL_JAR_ALL_NOAWT="jogl.all-noawt.jar" +JOGL_JAR_ALL_MOBILE="jogl.all-mobile.jar" -JOGL_JAR_ES2_MIN="$JOGL_CORE jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.util.fixedfuncemu.jar" -JOGL_JAR_ES2_MAX="$JOGL_CORE jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.util.fixedfuncemu.jar jogl.glu.tess.jar $JOGL_AWT" -JOGL_LIB_ES2_MIN="libjogl_es2.so libnewt.so" -JOGL_LIB_ES2_MAX="libjogl_es2.so libnewt.so libjogl_awt.so libnativewindow_x11.so libnativewindow_awt.so" +JOGL_LIB_ALL="libnativewindow_x11.so libnativewindow_awt.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so" +JOGL_LIB_ALL_NOAWT="libnativewindow_x11.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so" +JOGL_LIB_ALL_MOBILE="libjogl_mobile.so libnewt.so" -JOGL_JAR_GLDESKTOP_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar" -JOGL_JAR_GLDESKTOP_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gldesktop.jar jogl.gldesktop.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gldesktop.jar jogl.util.gldesktop.jar $JOGL_AWT jogl.cg.jar" -JOGL_LIB_GLDESKTOP_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" -JOGL_LIB_GLDESKTOP_MAX="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so" - -export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ES1_MIN JOGL_JAR_ES1_MAX JOGL_JAR_ES2_MIN JOGL_JAR_ES2_MAX JOGL_JAR_GLDESKTOP_MIN JOGL_JAR_GLDESKTOP_MAX -export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GLDESKTOP_MIN JOGL_LIB_GLDESKTOP_MAX +export JOGL_JAR_ALL JOGL_JAR_ALL_NOAWT JOGL_JAR_ALL_MOBILE +export JOGL_LIB_ALL JOGL_LIB_ALL_NOAWT JOGL_LIB_ALL_MOBILE THISDIR=`dirname $0` @@ -96,36 +81,14 @@ export JOGL_LIB_DIR if [ ! -z "$JOGL_PROFILE" ] ; then case "$JOGL_PROFILE" in - JOGL_ALLALL) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR gluegen-rt.jar nativewindow.all.jar jogl.all.jar newt.all.jar $JOGL_TEST) - ;; JOGL_ALL) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST) + JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL test/build/$JOGL_TEST) ;; JOGL_ALL_NOAWT) JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT) ;; - JOGL_ES1_MIN) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ES1_MIN) - JOGL_VBO_BUG=true ; export JOGL_VBO_BUG # ES emulation has buggy VBO impl. - ;; - JOGL_ES1_MAX) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ES1_MAX) - JOGL_VBO_BUG=true ; export JOGL_VBO_BUG # ES emulation has buggy VBO impl. - ;; - JOGL_ES2_MIN) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ES2_MIN) - JOGL_VBO_BUG=true ; export JOGL_VBO_BUG # ES emulation has buggy VBO impl. - ;; - JOGL_ES2_MAX) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ES2_MAX) - JOGL_VBO_BUG=true ; export JOGL_VBO_BUG # ES emulation has buggy VBO impl. - ;; - JOGL_GLDESKTOP_MIN) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GLDESKTOP_MIN) - ;; - JOGL_GLDESKTOP_MAX) - JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_GLDESKTOP_MAX) + JOGL_ALL_MOBILE) + JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_MOBILE) ;; esac diff --git a/jnlp-files/applet-version-jnlp.html b/jnlp-files/applet-version-jnlp.html index 218f21fa5..eb3089ce1 100644 --- a/jnlp-files/applet-version-jnlp.html +++ b/jnlp-files/applet-version-jnlp.html @@ -19,9 +19,7 @@ JNLP Applet with AppletLauncher fallback version. width=800 height=600 archive="JOGL_CODEBASE_TAG/../util/applet-launcher.jar, - JOGL_CODEBASE_TAG/newt.all.jar, JOGL_CODEBASE_TAG/jogl.all.jar, - JOGL_CODEBASE_TAG/nativewindow.all.jar, JOGL_CODEBASE_TAG/gluegen-rt.jar"> @@ -29,7 +27,7 @@ JNLP Applet with AppletLauncher fallback version. - + diff --git a/jnlp-files/applet-version-lancheronly.html b/jnlp-files/applet-version-lancheronly.html index 718e9eba8..eb6c195bd 100644 --- a/jnlp-files/applet-version-lancheronly.html +++ b/jnlp-files/applet-version-lancheronly.html @@ -19,9 +19,7 @@ AppletLauncher only version. width=800 height=600 archive="JOGL_CODEBASE_TAG/../util/applet-launcher.jar, - JOGL_CODEBASE_TAG/newt.all.jar, JOGL_CODEBASE_TAG/jogl.all.jar, - JOGL_CODEBASE_TAG/nativewindow.all.jar, JOGL_CODEBASE_TAG/gluegen-rt.jar"> @@ -29,7 +27,7 @@ AppletLauncher only version. - + diff --git a/jnlp-files/applet-version.jnlp b/jnlp-files/applet-version.jnlp index c621b46bb..622c7bb7a 100644 --- a/jnlp-files/applet-version.jnlp +++ b/jnlp-files/applet-version.jnlp @@ -12,7 +12,7 @@ - + - + diff --git a/jnlp-files/javaws-version.jnlp b/jnlp-files/javaws-version.jnlp index fa14f95ab..4074477ef 100755 --- a/jnlp-files/javaws-version.jnlp +++ b/jnlp-files/javaws-version.jnlp @@ -12,7 +12,7 @@ - + diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp index 822c26abf..871464251 100644 --- a/jnlp-files/jogl-all-awt.jnlp +++ b/jnlp-files/jogl-all-awt.jnlp @@ -17,50 +17,55 @@ - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp index 55b548f50..99e7816d6 100644 --- a/jnlp-files/jogl-all-noawt.jnlp +++ b/jnlp-files/jogl-all-noawt.jnlp @@ -17,50 +17,55 @@ - - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + diff --git a/jnlp-files/jogl-awt.jnlp b/jnlp-files/jogl-awt.jnlp deleted file mode 100644 index ffdaee0cc..000000000 --- a/jnlp-files/jogl-awt.jnlp +++ /dev/null @@ -1,24 +0,0 @@ - - - - Java(tm) Binding to the OpenGL(r) API (AWT) - JogAmp Community - - Java Binding to the OpenGL API - JSR-231 2.0.0 - AWT - Java programming language binding for the OpenGL 3D graphics API - AWT. - - - - - - - - - - - - - - - diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp deleted file mode 100644 index 464c65c94..000000000 --- a/jnlp-files/jogl-core.jnlp +++ /dev/null @@ -1,68 +0,0 @@ - - - - Java(tm) Binding to the OpenGL(r) API (CORE) - JogAmp Community - - Java Binding to the OpenGL API - JSR-231 2.0.0 - CORE - Java programming language binding for the OpenGL 3D graphics API - CORE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jnlp-files/nativewindow-all-awt.jnlp b/jnlp-files/nativewindow-all-awt.jnlp deleted file mode 100644 index 57a189530..000000000 --- a/jnlp-files/nativewindow-all-awt.jnlp +++ /dev/null @@ -1,65 +0,0 @@ - - - - Java(tm) NativeWindow Interface API (ALL.AWT) - JogAmp Community - - Java API for a binding to a native windowing system - 2.0 - ALL.AWT - Java API for a binding to a native windowing system - 2.0 - ALL.AWT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp deleted file mode 100644 index d37446c5a..000000000 --- a/jnlp-files/nativewindow-awt.jnlp +++ /dev/null @@ -1,22 +0,0 @@ - - - - Java(tm) NativeWindow Interface API (AWT) - JogAmp Community - - Java API for a binding to a native windowing system - 2.0 - AWT - Java API for a binding to a native windowing system - 2.0 - AWT - - - - - - - - - - - - - diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/nativewindow.jnlp deleted file mode 100644 index a2b0c79de..000000000 --- a/jnlp-files/nativewindow.jnlp +++ /dev/null @@ -1,77 +0,0 @@ - - - - Java(tm) NativeWindow Interface API (CORE) - JogAmp Community - - Java API for a binding to a native windowing system - 2.0 - CORE - Java API for a binding to a native windowing system - 2.0 - CORE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jnlp-files/newt-all-awt.jnlp b/jnlp-files/newt-all-awt.jnlp deleted file mode 100644 index c4444ff63..000000000 --- a/jnlp-files/newt-all-awt.jnlp +++ /dev/null @@ -1,65 +0,0 @@ - - - - NEWT - New Windowing Toolkit (ALL.AWT) - JogAmp Community - - NEWT - A NativeWindow Interface implementation - ALL.AWT - NEWT - A NativeWindow Interface implementation - ALL.AWT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jnlp-files/newt-all-noawt.jnlp b/jnlp-files/newt-all-noawt.jnlp deleted file mode 100644 index c67c7ac08..000000000 --- a/jnlp-files/newt-all-noawt.jnlp +++ /dev/null @@ -1,65 +0,0 @@ - - - - NEWT - New Windowing Toolkit (ALL.NO_AWT) - JogAmp Community - - NEWT - A NativeWindow Interface implementation - ALL.NO_AWT - NEWT - A NativeWindow Interface implementation - ALL.NO_AWT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jnlp-files/newt-awt.jnlp b/jnlp-files/newt-awt.jnlp deleted file mode 100644 index fc5b7f178..000000000 --- a/jnlp-files/newt-awt.jnlp +++ /dev/null @@ -1,22 +0,0 @@ - - - - NEWT - New Windowing Toolkit (AWT) - JogAmp Community - - NEWT - A NativeWindow Interface implementation - AWT - NEWT - A NativeWindow Interface implementation - AWT - - - - - - - - - - - - - diff --git a/jnlp-files/newt-jogl.jnlp b/jnlp-files/newt-jogl.jnlp deleted file mode 100644 index cd0f5d633..000000000 --- a/jnlp-files/newt-jogl.jnlp +++ /dev/null @@ -1,22 +0,0 @@ - - - - NEWT - New Windowing Toolkit (JOGL) - JogAmp Community - - NEWT - A NativeWindow Interface implementation - JOGL - NEWT - A NativeWindow Interface implementation - JOGL - - - - - - - - - - - - - diff --git a/jnlp-files/newt.jnlp b/jnlp-files/newt.jnlp deleted file mode 100644 index 9decf249d..000000000 --- a/jnlp-files/newt.jnlp +++ /dev/null @@ -1,79 +0,0 @@ - - - - NEWT - New Windowing Toolkit (CORE) - JogAmp Community - - NEWT - A NativeWindow Interface implementation - CORE - NEWT - A NativeWindow Interface implementation - CORE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/make/build-common.xml b/make/build-common.xml index b0759f3a4..040e9e5e7 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -16,6 +16,7 @@ + @@ -87,20 +88,27 @@ + - - - - - - + + + + + + + + + + + - + + @@ -130,6 +139,9 @@ + + + @@ -227,161 +239,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + - - - + + + + - + - + + + - - + + - + + + + + + - - - + + + + - + + + - - - + - + + - - - + + - + + - - - + + - + - - + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${swt.jar}${path.separator}${jogl.all.jar}${path.separator}${jogl.test.jar}"/> - + + + - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 9747c67cf..a6aa04e5a 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -35,10 +35,6 @@ - property in gluegen.properties; again see the example file in this - directory. - - - Optional properties: - - -Djogl.cg=1 when combined with the build or javadoc targets will cause - - the experimental binding to NVidia's Cg language to be built. - - - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the - ANT build, including the GlueGen and StaticGLInfo tasks, the building of - the Java generated sources, the first and second phase Java compiles, and @@ -46,10 +42,13 @@ - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for - the original OS detection code. - - - Some environment defs affecting compilation + - Some environment defs affecting native compilation (only) + setup.noNativeDesktop - drop native desktop bindings (glx, wgl, ..) + + setup.addNativeOpenMAX - add experimental binding to Khrono's OpenMAX - - setup.nodesktop is set iff: - !isWindows && !isOSX && !isX11 + setup.addNativeNVidiaCG - add experimental binding to NVidia's Cg language + (enabled for windows, osx and X11 per default) - Internal settings, may not be necessary to set them manually, since all JAR archives are orthogonal. @@ -66,6 +65,14 @@ + + + + + + + + + - - - - - + @@ -176,15 +182,7 @@ - - - - - - - + @@ -691,7 +689,7 @@ - + @@ -781,7 +779,7 @@ - from the C GL headers. This involves setting the taskdef and creating - the classpath reference id then running the task on each header. --> - + @@ -1039,7 +1037,7 @@ @@ -1189,6 +1187,12 @@ + + + + + + @@ -1238,7 +1242,7 @@ - + @@ -1275,8 +1279,8 @@ - - + + @@ -1287,27 +1291,16 @@ - + - - + + - - - - - - - - - - - @@ -1349,15 +1342,15 @@ - - + + - + @@ -1395,7 +1388,7 @@ - + @@ -1406,35 +1399,28 @@ - + - - - - - - + - + - + @@ -1446,7 +1432,7 @@ - + @@ -1457,9 +1443,9 @@ + includes="${java.part.nonjava}"/> + includes="${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" /> @@ -1467,7 +1453,7 @@ @@ -1478,148 +1464,105 @@ - - - - - - - - + + - + - + - - - - - - - - + + + includes="${java.part.egl} ${java.part.es1} ${java.part.es2}" + excludes="${java.part.awt} ${java.part.es1.dbg} ${java.part.es2.dbg}"/> - + - - - + includes="${java.part.es1.dbg} ${java.part.es2.dbg}"/> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - - + + - + - + - + - + - + - + + + + + + + @@ -1633,24 +1576,8 @@ - on the platform specific build targets. To circumvent any - errors, ensure that the source is built first. --> - - - - - - - - - + - - - - - - - - - - - - - + - - - - - - - - - - - - - + - - diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 2353fd3d8..e3fcdb5e2 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -42,10 +42,8 @@ - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for - the original OS detection code. - - - Some environment defs affecting compilation - - - setup.nodesktop is set iff: - !isWindows && !isOSX && !isX11 + - Some environment defs affecting native compilation + setup.noNativeAWT - Internal settings, may not be necessary to set them manually, since all JAR archives are orthogonal. @@ -66,15 +64,6 @@ --> - - - - - - - - - + + + + + + @@ -514,7 +509,7 @@ - + @@ -709,7 +704,7 @@ @@ -721,7 +716,7 @@ - + @@ -729,45 +724,30 @@ - + - + - - - - - - - - - - - - - + + - + - diff --git a/make/build-newt.xml b/make/build-newt.xml index c6bd9c861..c5c05386a 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -44,14 +44,17 @@ - - Some environment defs affecting compilation + - Some environment defs affecting native compilation + setup.noNativeDesktop + setup.addNativeKD + setup.addNativeIntelGDL + setup.addNativeBroadcomEGL + - Internal settings, may not be necessary to set them manually, since all JAR archives are orthogonal. setup.noAWT setup.noOpenGL - - setup.nodesktop is set iff: - !isWindows && !isOSX && !isX11 - --> @@ -73,9 +76,10 @@ - - - + + + + @@ -83,9 +87,10 @@ - - - + + + + @@ -93,26 +98,35 @@ + + + + + value="com/jogamp/newt/awt/** com/jogamp/newt/event/awt/** jogamp/newt/awt/** ${java.part.driver.awt}"/> - + - + - + - + - + + + - + @@ -125,12 +139,7 @@ - - - - - + @@ -193,14 +202,14 @@ - + @@ -366,6 +375,13 @@ + + + + + + + @@ -430,7 +446,7 @@ - + @@ -463,9 +479,9 @@ - - - + + + @@ -506,10 +522,10 @@ - - - - + + + + @@ -547,34 +563,26 @@ - - - + + - - - - - + + + - - - + - - - - - - - - - - + + + + + + + + + - - @@ -615,49 +623,56 @@ - + - + - + + includes="${java.part.driver.x11}"/> - - - - + + + + + includes="${java.part.driver.macosx}"/> - + + includes="${java.part.driver.android}"/> - + + includes="${java.part.driver.kd}"/> + + + + + + - - - - - - + + + - + @@ -667,29 +682,11 @@ - - - - - - - - - - - - - - - - + - @@ -709,7 +706,7 @@ source="${target.sourcelevel}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > - + @@ -723,7 +720,7 @@ source="${target.sourcelevel}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > - + @@ -737,7 +734,7 @@ source="${target.sourcelevel}" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > - + diff --git a/make/build-test.xml b/make/build-test.xml index 9dfc526c9..ed7584feb 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -71,10 +71,10 @@ - - - + + + @@ -87,7 +87,7 @@ memoryMaximumSize="${javac.memorymax}" includeAntRuntime="false" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> - + @@ -135,7 +135,7 @@ failonerror="false" output="${test.class.result.file}"> - + @@ -286,7 +398,7 @@ source="${target.sourcelevel}" maxmemory="1024m" bottom="${javadoc.bottom}" > - + @@ -307,7 +419,7 @@ source="${target.sourcelevel}" maxmemory="1024m" bottom="${javadoc.bottom}" > - + @@ -329,7 +441,7 @@ source="${target.sourcelevel}" maxmemory="1024m" bottom="${javadoc.bottom}" > - + @@ -350,7 +462,7 @@ source="${target.sourcelevel}" maxmemory="1024m" bottom="${javadoc.bottom}" > - + diff --git a/make/config/intptr.cfg b/make/config/intptr.cfg deleted file mode 100644 index c946e4851..000000000 --- a/make/config/intptr.cfg +++ /dev/null @@ -1,17 +0,0 @@ -CustomCCode #ifdef _WIN32 -CustomCCode #ifdef _MSC_VER -CustomCCode /* This typedef is apparently needed for Microsoft compilers before VC8, -CustomCCode and on Windows CE */ -CustomCCode #if (_MSC_VER < 1400) || defined(UNDER_CE) -CustomCCode #ifdef _WIN64 -CustomCCode typedef long long intptr_t; -CustomCCode #else -CustomCCode typedef int intptr_t; -CustomCCode #endif -CustomCCode #endif -CustomCCode #else -CustomCCode #include -CustomCCode #endif -CustomCCode #else -CustomCCode #include -CustomCCode #endif diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg index 7ec47390f..606f86b9d 100644 --- a/make/config/jogl/cg-common.cfg +++ b/make/config/jogl/cg-common.cfg @@ -119,6 +119,7 @@ RuntimeExceptionType CgException # generated C code # +CustomCCode #include /* android */ CustomCCode #include CustomCCode #include CustomCCode diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg index 721fe911b..34a59dda3 100644 --- a/make/config/jogl/cglext.cfg +++ b/make/config/jogl/cglext.cfg @@ -23,8 +23,9 @@ GetProcAddressTableExpr _context.getCGLExtProcAddressTable() # Ignore everything that doesn't start with cgl or CGL IgnoreNot ^(cgl|CGL).+ +CustomCCode #include +CustomCCode #include Include gl-headers.cfg -Include ../intptr.cfg CustomJavaCode CGLExt public boolean isFunctionAvailable(String glFunctionName); CustomJavaCode CGLExt public boolean isExtensionAvailable(String glExtensionName); diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg index ea299bfcc..ee74b46e6 100644 --- a/make/config/jogl/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -21,10 +21,11 @@ GetProcAddressTableExpr _table ArgumentIsString eglGetProcAddress 0 ReturnsString eglQueryString +CustomCCode #include /* android */ +CustomCCode #include +CustomCCode #include CustomCCode #include -Include ../intptr.cfg - CustomJavaCode EGL private static EGLProcAddressTable _table = new EGLProcAddressTable(new GLProcAddressResolver()); CustomJavaCode EGL public static void resetProcAddressTable(DynamicLookupHelper lookup) { CustomJavaCode EGL _table.reset(lookup); diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg index 3af90d3af..2e422ff72 100644 --- a/make/config/jogl/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -20,6 +20,9 @@ EmitProcAddressTable true ProcAddressTableClassName EGLExtProcAddressTable GetProcAddressTableExpr _context.getEGLExtProcAddressTable() +CustomCCode #include /* android */ +CustomCCode #include +CustomCCode #include CustomCCode /* Define EGL_EGLEXT_PROTOTYPES so that the EGL extension prototypes in CustomCCode "eglext.h" are parsed. */ CustomCCode #define EGL_EGLEXT_PROTOTYPES @@ -27,8 +30,6 @@ CustomCCode CustomCCode #include CustomCCode #include -Include ../intptr.cfg - # There are some #defines in eglext.h that GlueGen and PCPP don't currently handle CustomJavaCode EGLExt /** Part of EGL_KHR_image */ CustomJavaCode EGLExt public static final long EGL_NO_IMAGE = 0; diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 88ce09569..518dc07b5 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -78,6 +78,7 @@ CustomJavaCode GLES1Impl glClearDepthf((float)depth); } CustomJavaCode GLES1Impl public void glDepthRange(double zNear, double zFar) { CustomJavaCode GLES1Impl glDepthRangef((float)zNear, (float)zFar); } +CustomCCode #include /* android */ CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "glext.h" are parsed. */ CustomCCode #define GL_GLEXT_PROTOTYPES @@ -87,7 +88,6 @@ CustomCCode /* #define GL_APICALL __declspec(dllimport) */ CustomCCode #include CustomCCode #include CustomCCode #include -Include ../intptr.cfg IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-gles1.java diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index f529ddbf7..614904aa0 100644 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -62,6 +62,7 @@ JavaPrologue glGetIntegerv if ( glStateTracker.getInt(pname, params, params_offs IncludeAs CustomJavaCode GLES2 gl-if-CustomJavaCode-gles2.java +CustomCCode #include /* android */ CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "glext.h" are parsed. */ CustomCCode #define GL_GLEXT_PROTOTYPES @@ -71,7 +72,6 @@ CustomCCode /* #define GL_APICALL __declspec(dllimport) */ CustomCCode #include CustomCCode #include CustomCCode #include -Include ../intptr.cfg IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GLES2Impl gl-impl-CustomJavaCode-gles2.java diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 6833d24d5..67582af91 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -89,7 +89,6 @@ CustomJavaCode GL4bcImpl glOrtho((double)left, (double)right, (double)bottom, Include gl-headers.cfg Include gl3ext-headers.cfg -Include ../intptr.cfg IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-common.java IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl4bc.java diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg index a23d09dc1..d94e217de 100644 --- a/make/config/jogl/gl-headers.cfg +++ b/make/config/jogl/gl-headers.cfg @@ -1,3 +1,4 @@ +CustomCCode #include /* android */ CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "glext.h" are parsed. */ CustomCCode #define GL_GLEXT_PROTOTYPES diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg index 6063bba7e..da6ca1647 100644 --- a/make/config/jogl/gl-if-gl2.cfg +++ b/make/config/jogl/gl-if-gl2.cfg @@ -35,7 +35,6 @@ CustomJavaCode GL2 public boolean glIsPBOPackEnabled(); CustomJavaCode GL2 public boolean glIsPBOUnpackEnabled(); Include gl-headers.cfg -Include ../intptr.cfg EmitProcAddressTable false ProcAddressTableClassName DontGenerateProcAddressTableStuff diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg index 3ccc2c58c..fc08eccfd 100644 --- a/make/config/jogl/gl-if-gl3.cfg +++ b/make/config/jogl/gl-if-gl3.cfg @@ -31,7 +31,6 @@ EmitProcAddressTable false TagNativeBinding true Include gl3-headers.cfg -Include ../intptr.cfg EmitProcAddressTable false ProcAddressTableClassName DontGenerateProcAddressTableStuff diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg index f23d3710d..6765e099f 100644 --- a/make/config/jogl/gl-if-gl3bc.cfg +++ b/make/config/jogl/gl-if-gl3bc.cfg @@ -38,7 +38,6 @@ IgnoreExtension GL_EXT_point_parameters Include gl-headers.cfg Include gl3ext-headers.cfg -Include ../intptr.cfg EmitProcAddressTable false ProcAddressTableClassName DontGenerateProcAddressTableStuff diff --git a/make/config/jogl/gl-if-gl4.cfg b/make/config/jogl/gl-if-gl4.cfg index b660bfaac..dbcf633b2 100644 --- a/make/config/jogl/gl-if-gl4.cfg +++ b/make/config/jogl/gl-if-gl4.cfg @@ -29,5 +29,4 @@ GetProcAddressTableExpr DontGenerateProcAddressTableStuff TagNativeBinding true Include gl3-headers.cfg -Include ../intptr.cfg diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg index 3cab4a4e9..8b35a07b4 100644 --- a/make/config/jogl/gl3-headers.cfg +++ b/make/config/jogl/gl3-headers.cfg @@ -1,3 +1,4 @@ +CustomCCode #include /* android */ CustomCCode /* Define GL3_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "gl3.h" are parsed. */ CustomCCode #define GL3_PROTOTYPES diff --git a/make/config/jogl/gl3ext-headers.cfg b/make/config/jogl/gl3ext-headers.cfg index dfc4ea796..5e2c7aa37 100644 --- a/make/config/jogl/gl3ext-headers.cfg +++ b/make/config/jogl/gl3ext-headers.cfg @@ -1,3 +1,4 @@ +CustomCCode #include /* android */ CustomCCode /* Define GL_GL3EXT_PROTOTYPES so that the OpenGL extension prototypes in CustomCCode "gl3ext.h" are parsed. */ CustomCCode #define GL_GL3EXT_PROTOTYPES diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index 5909c8743..9387b4c4a 100644 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -8,6 +8,7 @@ ImplPackage javax.media.opengl.glu.gl2 ImplJavaClass GLUgl2 ParentClass GLUgl2 GLU +CustomCCode #include /* android */ CustomCCode #if defined(WIN32) CustomCCode #define WIN32_LEAN_AND_MEAN CustomCCode #include @@ -22,8 +23,6 @@ CustomCCode #elif defined(__unix__) CustomCCode #include CustomCCode #endif -Include ../intptr.cfg - EmitProcAddressTable true ProcAddressTablePackage jogamp.opengl.glu.gl2 ProcAddressTableClassName GLUgl2ProcAddressTable diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index 82490a2e8..de23b9f17 100644 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -26,7 +26,6 @@ Import jogamp.nativewindow.x11.* IgnoreNot ^(glX|GLX).+ Include gl-headers.cfg -Include ../intptr.cfg CustomCCode /* Provide Windows typedefs */ CustomCCode typedef void* LPVOID; diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index a86834531..3fd6ad928 100644 --- a/make/config/jogl/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -37,8 +37,6 @@ CustomCCode #undef WIN32_LEAN_AND_MEAN CustomCCode #include CustomCCode #include -Include ../intptr.cfg - DropUniqVendorExtensions AMD # We need GL_APPLE_float_pixels for our pbuffer implementation # DropUniqVendorExtensions APPLE diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index d37a861b7..15986b6cf 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -25,7 +25,6 @@ Ignore GL_.+ Ignore gl.+ Include gl-headers.cfg -Include ../intptr.cfg # FIXME: for the time being, ignore all extensions requiring the # presence of java.nio.LongBuffer because it doesn't exist on CDC/FP + diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg index d1fa7020a..5b571f719 100644 --- a/make/config/nativewindow/jawt-win32.cfg +++ b/make/config/nativewindow/jawt-win32.cfg @@ -8,7 +8,8 @@ Opaque long HDC IgnoreField JAWT_Win32DrawingSurfaceInfo null IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette -Include ../intptr.cfg +CustomCCode #include +CustomCCode #include StructPackage JAWT_Win32DrawingSurfaceInfo jogamp.nativewindow.jawt.windows EmitStruct JAWT_Win32DrawingSurfaceInfo diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg index ac9d1aa9a..05db2aa0c 100644 --- a/make/config/nativewindow/jawt-x11.cfg +++ b/make/config/nativewindow/jawt-x11.cfg @@ -8,7 +8,8 @@ Opaque long Display * IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor -CustomCCode #include +CustomCCode #include +CustomCCode #include StructPackage JAWT_X11DrawingSurfaceInfo jogamp.nativewindow.jawt.x11 EmitStruct JAWT_X11DrawingSurfaceInfo diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg index 894211182..b8886bdac 100644 --- a/make/config/nativewindow/win32-lib.cfg +++ b/make/config/nativewindow/win32-lib.cfg @@ -29,10 +29,9 @@ CustomCCode #define WIN32_LEAN_AND_MEAN CustomCCode #include CustomCCode #undef WIN32_LEAN_AND_MEAN +CustomCCode #include +CustomCCode #include CustomCCode #include -CustomCCode #include - -Include ../intptr.cfg CustomCCode extern HINSTANCE GetApplicationHandle(); diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg index 8848980ea..d9e4ccd0a 100644 --- a/make/config/nativewindow/x11-lib.cfg +++ b/make/config/nativewindow/x11-lib.cfg @@ -39,7 +39,8 @@ CustomJavaCode X11Lib private static int getFirstElement(int[] arr, int offset) CustomJavaCode XVisualInfo public static XVisualInfo create(XVisualInfo s) { XVisualInfo d = XVisualInfo.create(); d.getBuffer().put(s.getBuffer()); d.getBuffer().rewind(); s.getBuffer().rewind(); return d; } -CustomCCode #include +CustomCCode #include +CustomCCode #include CustomCCode #include CustomCCode #include diff --git a/make/joglversion b/make/joglversion index c7d7f48ca..bf0220fa0 100644 --- a/make/joglversion +++ b/make/joglversion @@ -1,3 +1,4 @@ +Manifest-Version: 1.0 Specification-Title: Java Bindings for OpenGL API Specification Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community diff --git a/make/nativewindowversion b/make/nativewindowversion index 462ffdba5..3eb3bc2c2 100644 --- a/make/nativewindowversion +++ b/make/nativewindowversion @@ -1,3 +1,4 @@ +Manifest-Version: 1.0 Specification-Title: Native Window Interface API Specification Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community diff --git a/make/newtversion b/make/newtversion index 84847fb65..e8aa60caa 100644 --- a/make/newtversion +++ b/make/newtversion @@ -1,3 +1,4 @@ +Manifest-Version: 1.0 Specification-Title: NEWT API Specification Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh index c72a48a9b..82e378e20 100755 --- a/make/scripts/lstjars.sh +++ b/make/scripts/lstjars.sh @@ -34,61 +34,33 @@ function listdeployment() { echo JOGL Deployment Payload for $JAR_SUFFIX echo - echo JOGL ES1 NEWT CORE - report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnewt.so.gz + echo JOGL ALL + report gluegen-rt.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_awt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz echo - echo JOGL ES2 NEWT CORE - report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz + echo JOGL ALL no AWT + report gluegen-rt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz echo - echo JOGL ES2 NEWT CORE FIXED - report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnewt.so.gz - echo - - echo JOGL GL2ES12 NEWT - report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gl2es12.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz - echo - - echo JOGL GL2 NEWT - report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz - echo - - echo JOGL GL2 AWT - report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.os.$OSS.$JAR_SUFFIX jogl.gldesktop.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz - echo - - echo JOGL ALL AWT - report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz - echo - - echo JOGL ALL No AWT - report gluegen-rt.$JAR_SUFFIX nativewindow.all-noawt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnewt.so.gz - echo - - echo JOGL GLU - report jogl.glu.*$JAR_SUFFIX - echo - - echo JOGL EVERYTHING - report *.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz libjogl_es1.so.gz libjogl_es2.so.gz libnewt.so.gz + echo JOGL Android - mobile egl es1 es2 + report gluegen-rt.$JAR_SUFFIX jogl.all-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz echo } rm -rf $STATDIR mkdir -p $STATDIR -cp -a $BUILDDIR/nativewindow/obj/*.so $STATDIR -cp -a $BUILDDIR/jogl/obj/*.so $STATDIR -cp -a $BUILDDIR/newt/obj/*.so $STATDIR -cp -a $BUILDDIR/nativewindow/*.jar $STATDIR -cp -a $BUILDDIR/jogl/*.jar $STATDIR -cp -a $BUILDDIR/newt/*.jar $STATDIR +cp -a $BUILDDIR/lib/*.so $STATDIR +cp -a $BUILDDIR/jar/* $STATDIR cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR -cp -a $BUILDDIR_GLUEGEN/gluegen-rt-natives-linux-i586.jar $STATDIR cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR cd $STATDIR +rm -rf nope +mkdir -p nope/atomic +mv gluegen*jar *-natives*.jar nope/ +mv atomic/gluegen-gl.jar nope/atomic + for i in *.so ; do gzip $i done @@ -99,33 +71,27 @@ echo rm -f *.lst -for i in *.jar ; do +for i in *.jar atomic/*.jar ; do fname=$i - bname=$(basename $fname .jar) + bname=$(dirname $fname)/$(basename $fname .jar) echo list $fname to $bname.lst jar tf $fname | grep class | sort > $bname.lst done -rm -rf nope -mkdir -p nope - -mv jogl.test.lst *-noawt.lst *.all*.lst nope/ - -mv jogl.gl2es12.*.lst jogl.gldesktop.*.lst nope/ -echo duplicates - w/o gl2es12.* gldesktop.* +echo duplicates in atomics echo -sort jogl*.lst | uniq -d -mv nope/* . +sort atomic/jogl*.lst | uniq -d -mv jogl.test.lst *.all*.lst gluegen-gl.lst nope/ -cat *.lst | sort -u > allparts.lst -mv nope/* . -cat *.all.lst gluegen-rt.lst | sort -u > allall.lst +cat atomic/*.lst | sort -u > allparts.lst +mv nope/*jar . +cat jogl.all.lst gluegen-rt.lst | sort -u > allall.lst echo all vs allparts delta echo diff -Nur allparts.lst allall.lst +mv nope/* . + listdeployment jar if [ $pack200 -eq 1 ] ; then diff --git a/make/scripts/make.jogl.all.linux-armv7-cross.sh b/make/scripts/make.jogl.all.linux-armv7-cross.sh index bbde79949..9a6b00a4a 100755 --- a/make/scripts/make.jogl.all.linux-armv7-cross.sh +++ b/make/scripts/make.jogl.all.linux-armv7-cross.sh @@ -31,9 +31,9 @@ ant \ -DisX11=true \ -DisCrosscompilation=true \ \ - -DuseKD=true \ - -DuseOpenMAX=true \ - -DuseBroadcomEGL=true \ + -Dsetup.addNativeKD=true \ + -Dsetup.addNativeOpenMAX=true \ + -Dsetup.addNativeBroadcomEGL=true \ $* 2>&1 | tee make.jogl.all.linux-armv7-cross.log diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh index f1f521203..b81cf79f6 100755 --- a/make/scripts/make.jogl.all.linux-x86.sh +++ b/make/scripts/make.jogl.all.linux-x86.sh @@ -28,15 +28,13 @@ if [ "$1" = "-libdir" ] ; then fi -# -Djogl.cg=1 # -Dc.compiler.debug=true -# -DuseOpenMAX=true \ +# -Dsetup.addNativeOpenMAX=true \ # -Dgluegen.cpptasks.detected.os=true \ # -DisUnix=true \ # -DisLinux=true \ # -DisLinuxX86=true \ # -DisX11=true \ -# -Djogl.cg=1 \ #LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64 #export LD_LIBRARY_PATH @@ -55,10 +53,9 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF ant \ $CUSTOMLIBDIR \ - -Djogl.cg=1 \ -Drootrel.build=build-x86 \ -Dos.arch=x86 \ - -DuseKD=true \ - -DuseOpenMAX=true \ + -Dsetup.addNativeOpenMAX=true \ + -Dsetup.addNativeKD=true \ $* 2>&1 | tee -a $LOGF diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh index aab3eecae..e57f0a9ad 100755 --- a/make/scripts/make.jogl.all.linux-x86_64.sh +++ b/make/scripts/make.jogl.all.linux-x86_64.sh @@ -27,7 +27,6 @@ if [ "$1" = "-libdir" ] ; then shift fi -# -Djogl.cg=1 # -Dc.compiler.debug=true \ # -Dgluegen.cpptasks.detected.os=true \ @@ -56,9 +55,8 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF ant \ $CUSTOMLIBDIR \ -Djavacdebuglevel="source,lines,vars" \ - -Djogl.cg=1 \ -Drootrel.build=build-x86_64 \ - -DuseKD=true \ - -DuseOpenMAX=true \ + -Dsetup.addNativeOpenMAX=true \ + -Dsetup.addNativeKD=true \ $* 2>&1 | tee -a $LOGF diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index 967790b6e..0eaaa1c71 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -8,6 +8,5 @@ fi # -Dc.compiler.debug=true ant \ - -Djogl.cg=1 \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.jogl.all.macosx.log diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index 09cbfbe4e..c9aac8331 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -9,8 +9,7 @@ set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win32\classes REM -Dc.compiler.debug=true -REM -DuseOpenMAX=true -REM -DuseKD=true -REM -Djogl.cg=1 +REM -Dsetup.addNativeOpenMAX=true +REM -Dsetup.addNativeKD=true -ant -Drootrel.build=build-win32 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1 +ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1 diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 7b43f73c1..5b1b10a8e 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -9,8 +9,7 @@ set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH% set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win64\classes REM -Dc.compiler.debug=true -REM -DuseOpenMAX=true -REM -DuseKD=true -REM -Djogl.cg=1 +REM -Dsetup.addNativeOpenMAX=true +REM -Dsetup.addNativeKD=true -ant -Dc.compiler.debug=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 -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e10044f47..b4f635cd5 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -55,7 +55,7 @@ function jrun() { #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" #D_ARGS="-Dnewt.debug.EDT" # D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" - D_ARGS="-Dnativewindow.x11.mt-bug=true" + #D_ARGS="-Dnativewindow.x11.mt-bug=true" #D_ARGS="-Dnativewindow.x11.mt-bug=true -Djogl.debug.DebugGL" #D_ARGS="-Dnativewindow.x11.mt-bug=true -Djogl.debug=all" #D_ARGS="-Dnativewindow.x11.mt-bug=true -Dnativewindow.debug.NativeWindow -Dnativewindow.debug.X11Util -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" diff --git a/make/stub_includes/egl/EGL/eglplatform.h b/make/stub_includes/egl/EGL/eglplatform.h index 0a05f16f5..a661736c1 100644 --- a/make/stub_includes/egl/EGL/eglplatform.h +++ b/make/stub_includes/egl/EGL/eglplatform.h @@ -83,7 +83,7 @@ typedef int EGLNativeDisplayType; typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; -#elif defined(__unix__) +#elif defined(__X11__) /* X11 (tentative) */ #include diff --git a/make/versions.xml b/make/versions.xml index 66e81d8c6..6cb59b978 100644 --- a/make/versions.xml +++ b/make/versions.xml @@ -12,6 +12,7 @@ betas before release candidates to give the Community time to react.--> +