aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/deployment/JOGL-JAR-BUNDELING.txt138
-rw-r--r--doc/deployment/lstjars/lstjars.linux_amd64-20100406.log540
-rwxr-xr-xetc/profile.jogl22
-rw-r--r--make/build-jogl.xml199
-rw-r--r--make/build-nativewindow.xml44
-rw-r--r--make/build-newt.xml43
-rw-r--r--make/jogl.properties2
-rw-r--r--make/lstjars.sh129
-rw-r--r--make/make.jogl.all.linux-x86_64.sh5
-rw-r--r--make/make.jogl.all.win32.bat14
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java2
-rwxr-xr-xsrc/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java4
-rw-r--r--src/newt/native/MacWindow.m2
-rw-r--r--src/newt/native/NewtMacWindow.h2
14 files changed, 922 insertions, 224 deletions
diff --git a/doc/deployment/JOGL-JAR-BUNDELING.txt b/doc/deployment/JOGL-JAR-BUNDELING.txt
new file mode 100644
index 000000000..cf4edd7a3
--- /dev/null
+++ b/doc/deployment/JOGL-JAR-BUNDELING.txt
@@ -0,0 +1,138 @@
+
++++++++++++++++++++++++++++++
++++ Native Libraries ++++++++
++++++++++++++++++++++++++++++
+
+Gluegen native libraries
+ libgluegen-rt.so
+
+NativeWindow native libraries
+ libnativewindow_awt.so
+ libnativewindow_jvm.so
+ libnativewindow_x11.so
+
+
+JOGL native libraries
+ libjogl_desktop.so
+ libjogl_gl2es12.so
+ libjogl_es1.so
+ libjogl_es2.so
+ libjogl_cg.so
+
+NEWT native libraries
+ libnewt.so
+
++++++++++++++++++++++++++++++
++++ Gluegen - Mandatory +++++
++++++++++++++++++++++++++++++
+
+Gluegen JAR - Always
+
+ Core [pick 1]
+ gluegen-rt.jar
+
++++++++++++++++++++++++++++++
++++ All In One Deployment +++
++++++++++++++++++++++++++++++
+
+This might be the best solution
+for desktop (maybe webstart).
+
+It is much faster to download
+a (maybe bigger) file once and cache
+it for most purposes, than to download
+tens of files where its cache might not
+be reuseable.
+
+
+With AWT:
+ nativewindow.all.jar
+ jogl.all.jar
+ newt.all.jar (optional, if AWT is used only)
+
+
+Without AWT
+ nativewindow.all-noawt.jar
+ jogl.all-noawt.jar
+ newt.all-noawt.jar
+
+
++++++++++++++++++++++++++++++
++++ Atomic Deployment +++++++
++++++++++++++++++++++++++++++
+
+This is a fine tuned solution
+where every byte counts.
+
+It is also possible to use this
+strategy as a starting point for
+efficient manual deployment.
+
+Cores:
+ nativewindow.core.jar
+ jogl.core.jar
+
+ Newt (optional):
+ newt.core.jar
+ newt.ogl.jar (to use NEWT with JOGL)
+
+
+Platform (x11/win/osx/embedded)
+
+ Chose the same platform for all picks :)
+
+ NativeWindow [pick 0..1]:
+ nativewindow.os.x11.jar
+
+ Jogl [pick 1]:
+ jogl.egl.jar
+ jogl.os.x11.jar
+ jogl.os.win.jar
+ jogl.os.osx.jar
+
+ Newt [pick 0..1] (optional):
+ newt.os.x11.jar
+ newt.os.win.jar
+ newt.os.osx.jar
+
+
+Jogl GL [pick 1..n]
+ jogl.gles1.jar
+ jogl.gles1.dbg.jar
+ jogl.gles2.jar
+ jogl.gles2.dbg.jar
+
+ jogl.gl2es12.jar
+
+ jogl.gl2.jar
+ jogl.gl2.dbg.jar
+
+ jogl.gl3.jar
+ jogl.gl3.dbg.jar
+
+ jogl.gl4.jar
+ jogl.gl4.dbg.jar
+
+
+Jogl Toolkits/Misc [pick n] (optional):
+ jogl.util.jar
+ jogl.util.gl2.jar
+ jogl.util.fixedfuncemu.jar
+
+
+AWT [pick n] (optional):
+ nativewindow.awt.jar
+
+ jogl.awt.jar
+ jogl.util.awt.jar (if using jogl.util)
+
+ newt.awt.jar
+
+GLU [pick n] (optional):
+ jogl.glutess.jar
+ jogl.glumipmap.jar
+ jogl.glugl2.jar
+
+
+
+
diff --git a/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log b/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log
new file mode 100644
index 000000000..48dcd562c
--- /dev/null
+++ b/doc/deployment/lstjars/lstjars.linux_amd64-20100406.log
@@ -0,0 +1,540 @@
+cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586.jar': No such file or directory
+cp: cannot stat `../../gluegen/build-x86_64/gluegen-rt-natives-linux-i586-cdc.jar': No such file or directory
+Native Libraries
+4 libgluegen-rt.so.gz
+24 libjogl_cg.so.gz
+144 libjogl_desktop.so.gz
+36 libjogl_es1.so.gz
+36 libjogl_es2.so.gz
+40 libjogl_gl2es12.so.gz
+4 libnativewindow_awt.so.gz
+4 libnativewindow_jvm.so.gz
+8 libnativewindow_x11.so.gz
+12 libnewt.so.gz
+312 total
+
+list gluegen-rt-cdc.jar to gluegen-rt-cdc.lst
+list gluegen-rt.jar to gluegen-rt.lst
+list jogl.all.cdc.jar to jogl.all.cdc.lst
+list jogl.all.jar to jogl.all.lst
+list jogl.all-noawt.jar to jogl.all-noawt.lst
+list jogl.awt.jar to jogl.awt.lst
+list jogl.cg.jar to jogl.cg.lst
+list jogl.core.cdc.jar to jogl.core.cdc.lst
+list jogl.core.jar to jogl.core.lst
+list jogl.egl.cdc.jar to jogl.egl.cdc.lst
+list jogl.egl.jar to jogl.egl.lst
+list jogl.gl2.dbg.jar to jogl.gl2.dbg.lst
+list jogl.gl2es12.cdc.jar to jogl.gl2es12.cdc.lst
+list jogl.gl2es12.jar to jogl.gl2es12.lst
+list jogl.gl2.jar to jogl.gl2.lst
+list jogl.gl3.dbg.jar to jogl.gl3.dbg.lst
+list jogl.gl3.jar to jogl.gl3.lst
+list jogl.gl4.dbg.jar to jogl.gl4.dbg.lst
+list jogl.gl4.jar to jogl.gl4.lst
+list jogl.gles1.cdc.jar to jogl.gles1.cdc.lst
+list jogl.gles1.dbg.cdc.jar to jogl.gles1.dbg.cdc.lst
+list jogl.gles1.dbg.jar to jogl.gles1.dbg.lst
+list jogl.gles1.jar to jogl.gles1.lst
+list jogl.gles2.cdc.jar to jogl.gles2.cdc.lst
+list jogl.gles2.dbg.cdc.jar to jogl.gles2.dbg.cdc.lst
+list jogl.gles2.dbg.jar to jogl.gles2.dbg.lst
+list jogl.gles2.jar to jogl.gles2.lst
+list jogl.glu.gl2.jar to jogl.glu.gl2.lst
+list jogl.glu.mipmap.cdc.jar to jogl.glu.mipmap.cdc.lst
+list jogl.glu.mipmap.jar to jogl.glu.mipmap.lst
+list jogl.glu.tess.cdc.jar to jogl.glu.tess.cdc.lst
+list jogl.glu.tess.jar to jogl.glu.tess.lst
+list jogl-natives-linux-amd64-cdc.jar to jogl-natives-linux-amd64-cdc.lst
+list jogl-natives-linux-amd64.jar to jogl-natives-linux-amd64.lst
+list jogl.os.osx.cdc.jar to jogl.os.osx.cdc.lst
+list jogl.os.osx.jar to jogl.os.osx.lst
+list jogl.os.win.cdc.jar to jogl.os.win.cdc.lst
+list jogl.os.win.jar to jogl.os.win.lst
+list jogl.os.x11.cdc.jar to jogl.os.x11.cdc.lst
+list jogl.os.x11.jar to jogl.os.x11.lst
+list jogl.sdk.jar to jogl.sdk.lst
+list jogl.test.jar to jogl.test.lst
+list jogl.util.awt.jar to jogl.util.awt.lst
+list jogl.util.cdc.jar to jogl.util.cdc.lst
+list jogl.util.fixedfuncemu.cdc.jar to jogl.util.fixedfuncemu.cdc.lst
+list jogl.util.fixedfuncemu.jar to jogl.util.fixedfuncemu.lst
+list jogl.util.gl2.jar to jogl.util.gl2.lst
+list jogl.util.jar to jogl.util.lst
+list nativewindow.all.cdc.jar to nativewindow.all.cdc.lst
+list nativewindow.all.jar to nativewindow.all.lst
+list nativewindow.all-noawt.jar to nativewindow.all-noawt.lst
+list nativewindow.awt.jar to nativewindow.awt.lst
+list nativewindow.core.cdc.jar to nativewindow.core.cdc.lst
+list nativewindow.core.jar to nativewindow.core.lst
+list nativewindow-natives-linux-amd64-cdc.jar to nativewindow-natives-linux-amd64-cdc.lst
+list nativewindow-natives-linux-amd64.jar to nativewindow-natives-linux-amd64.lst
+list nativewindow.os.x11.cdc.jar to nativewindow.os.x11.cdc.lst
+list nativewindow.os.x11.jar to nativewindow.os.x11.lst
+list newt.all.cdc.jar to newt.all.cdc.lst
+list newt.all.jar to newt.all.lst
+list newt.all-noawt.jar to newt.all-noawt.lst
+list newt.awt.jar to newt.awt.lst
+list newt.broadcomegl.cdc.jar to newt.broadcomegl.cdc.lst
+list newt.broadcomegl.jar to newt.broadcomegl.lst
+list newt.core.cdc.jar to newt.core.cdc.lst
+list newt.core.jar to newt.core.lst
+list newt-natives-linux-amd64-cdc.jar to newt-natives-linux-amd64-cdc.lst
+list newt-natives-linux-amd64.jar to newt-natives-linux-amd64.lst
+list newt.ogl.cdc.jar to newt.ogl.cdc.lst
+list newt.ogl.jar to newt.ogl.lst
+list newt.os.osx.jar to newt.os.osx.lst
+list newt.os.win.jar to newt.os.win.lst
+list newt.os.x11.jar to newt.os.x11.lst
+mv: cannot stat `jogl.all.cdc.lst': No such file or directory
+mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory
+mv: cannot stat `newt.all.cdc.lst': No such file or directory
+mv: cannot stat `jogl.gl2es12.*.lst': No such file or directory
+duplicates - w/o gl2es12.* gl2.*
+
+com/jogamp/openmax/OMXEventListener.class
+com/jogamp/openmax/OMXInstance.class
+com/jogamp/openmax/OMXInstance$EGLImageTexture.class
+mv: cannot stat `jogl.all.cdc.lst': No such file or directory
+mv: cannot stat `nativewindow.all.cdc.lst': No such file or directory
+mv: cannot stat `newt.all.cdc.lst': No such file or directory
+all vs allparts delta
+
+--- allparts.lst 2010-04-06 14:27:30.945355748 +0200
++++ allall.lst 2010-04-06 14:27:31.002253659 +0200
+@@ -1,3 +1,10 @@
++com/jogamp/audio/windows/waveout/Audio.class
++com/jogamp/audio/windows/waveout/Mixer.class
++com/jogamp/audio/windows/waveout/Mixer$FillerThread.class
++com/jogamp/audio/windows/waveout/Mixer$MixerThread.class
++com/jogamp/audio/windows/waveout/SoundBuffer.class
++com/jogamp/audio/windows/waveout/Track.class
++com/jogamp/audio/windows/waveout/Vec3f.class
+ com/jogamp/common/nio/AbstractBuffer.class
+ com/jogamp/common/nio/AbstractLongBuffer.class
+ com/jogamp/common/nio/Buffers.class
+JOGL Deployment Payload for jar
+
+JOGL ES1 NEWT CORE
+44 gluegen-rt.jar
+48 nativewindow.all-noawt.jar
+148 jogl.core.jar
+116 jogl.util.jar
+44 jogl.egl.jar
+28 jogl.gles1.jar
+88 newt.all-noawt.jar
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+36 libjogl_es1.so.gz
+12 libnewt.so.gz
+572 total
+
+JOGL ES2 NEWT CORE
+44 gluegen-rt.jar
+48 nativewindow.all-noawt.jar
+148 jogl.core.jar
+116 jogl.util.jar
+44 jogl.egl.jar
+32 jogl.gles2.jar
+88 newt.all-noawt.jar
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+36 libjogl_es2.so.gz
+12 libnewt.so.gz
+576 total
+
+JOGL ES2 NEWT CORE FIXED
+44 gluegen-rt.jar
+48 nativewindow.all-noawt.jar
+148 jogl.core.jar
+116 jogl.util.jar
+44 jogl.egl.jar
+32 jogl.gles2.jar
+28 jogl.util.fixedfuncemu.jar
+88 newt.all-noawt.jar
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+36 libjogl_es2.so.gz
+12 libnewt.so.gz
+604 total
+
+JOGL GL2ES12 NEWT
+44 gluegen-rt.jar
+48 nativewindow.all-noawt.jar
+148 jogl.core.jar
+116 jogl.util.jar
+56 jogl.os.x11.jar
+36 jogl.gl2es12.jar
+88 newt.all-noawt.jar
+4 libgluegen-rt.so.gz
+40 libjogl_gl2es12.so.gz
+12 libnewt.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+604 total
+
+JOGL GL2 NEWT
+44 gluegen-rt.jar
+48 nativewindow.all-noawt.jar
+148 jogl.core.jar
+116 jogl.util.jar
+56 jogl.os.x11.jar
+120 jogl.gl2.jar
+88 newt.all-noawt.jar
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+12 libnewt.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+792 total
+
+JOGL GL2 AWT
+44 gluegen-rt.jar
+84 nativewindow.all.jar
+148 jogl.core.jar
+116 jogl.util.jar
+56 jogl.os.x11.jar
+120 jogl.gl2.jar
+64 jogl.awt.jar
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_awt.so.gz
+4 libnativewindow_jvm.so.gz
+796 total
+
+JOGL ALL AWT
+44 gluegen-rt.jar
+84 nativewindow.all.jar
+1876 jogl.all.jar
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_awt.so.gz
+4 libnativewindow_jvm.so.gz
+2168 total
+
+JOGL ALL No AWT
+44 gluegen-rt.jar
+48 nativewindow.all-noawt.jar
+1772 jogl.all-noawt.jar
+88 newt.all-noawt.jar
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+2124 total
+
+JOGL CDCFP DESKTOP
+44 gluegen-rt-cdc.jar
+84 nativewindow.all.jar
+792 jogl.all.cdc.jar
+88 newt.all.cdc.jar
+4 libgluegen-rt.so.gz
+40 libjogl_gl2es12.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+1076 total
+
+JOGL CDCFP ES1 MOBILE
+44 gluegen-rt-cdc.jar
+148 jogl.core.cdc.jar
+44 jogl.egl.cdc.jar
+28 jogl.gles1.cdc.jar
+116 jogl.util.cdc.jar
+48 nativewindow.all.cdc.jar
+88 newt.all.cdc.jar
+4 libgluegen-rt.so.gz
+36 libjogl_es1.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+572 total
+
+JOGL CDCFP ES2 MOBILE
+44 gluegen-rt-cdc.jar
+148 jogl.core.cdc.jar
+44 jogl.egl.cdc.jar
+32 jogl.gles2.cdc.jar
+116 jogl.util.cdc.jar
+48 nativewindow.all.cdc.jar
+88 newt.all.cdc.jar
+4 libgluegen-rt.so.gz
+36 libjogl_es2.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+576 total
+
+JOGL GLU
+56 jogl.glu.gl2.jar
+68 jogl.glu.mipmap.cdc.jar
+68 jogl.glu.mipmap.jar
+48 jogl.glu.tess.cdc.jar
+48 jogl.glu.tess.jar
+288 total
+
+JOGL EVERYTHING
+1876 jogl.all.jar
+84 nativewindow.all.jar
+108 newt.all.jar
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_awt.so.gz
+144 libjogl_desktop.so.gz
+36 libjogl_es1.so.gz
+36 libjogl_es2.so.gz
+40 libjogl_gl2es12.so.gz
+12 libnewt.so.gz
+2356 total
+
+pack200 gluegen-rt-cdc.pack.gz gluegen-rt-cdc.jar
+pack200 gluegen-rt.pack.gz gluegen-rt.jar
+pack200 jogl.all.cdc.pack.gz jogl.all.cdc.jar
+pack200 jogl.all.pack.gz jogl.all.jar
+pack200 jogl.all-noawt.pack.gz jogl.all-noawt.jar
+pack200 jogl.awt.pack.gz jogl.awt.jar
+pack200 jogl.cg.pack.gz jogl.cg.jar
+pack200 jogl.core.cdc.pack.gz jogl.core.cdc.jar
+pack200 jogl.core.pack.gz jogl.core.jar
+pack200 jogl.egl.cdc.pack.gz jogl.egl.cdc.jar
+pack200 jogl.egl.pack.gz jogl.egl.jar
+pack200 jogl.gl2.dbg.pack.gz jogl.gl2.dbg.jar
+pack200 jogl.gl2es12.cdc.pack.gz jogl.gl2es12.cdc.jar
+pack200 jogl.gl2es12.pack.gz jogl.gl2es12.jar
+pack200 jogl.gl2.pack.gz jogl.gl2.jar
+pack200 jogl.gl3.dbg.pack.gz jogl.gl3.dbg.jar
+pack200 jogl.gl3.pack.gz jogl.gl3.jar
+pack200 jogl.gl4.dbg.pack.gz jogl.gl4.dbg.jar
+pack200 jogl.gl4.pack.gz jogl.gl4.jar
+pack200 jogl.gles1.cdc.pack.gz jogl.gles1.cdc.jar
+pack200 jogl.gles1.dbg.cdc.pack.gz jogl.gles1.dbg.cdc.jar
+pack200 jogl.gles1.dbg.pack.gz jogl.gles1.dbg.jar
+pack200 jogl.gles1.pack.gz jogl.gles1.jar
+pack200 jogl.gles2.cdc.pack.gz jogl.gles2.cdc.jar
+pack200 jogl.gles2.dbg.cdc.pack.gz jogl.gles2.dbg.cdc.jar
+pack200 jogl.gles2.dbg.pack.gz jogl.gles2.dbg.jar
+pack200 jogl.gles2.pack.gz jogl.gles2.jar
+pack200 jogl.glu.gl2.pack.gz jogl.glu.gl2.jar
+pack200 jogl.glu.mipmap.cdc.pack.gz jogl.glu.mipmap.cdc.jar
+pack200 jogl.glu.mipmap.pack.gz jogl.glu.mipmap.jar
+pack200 jogl.glu.tess.cdc.pack.gz jogl.glu.tess.cdc.jar
+pack200 jogl.glu.tess.pack.gz jogl.glu.tess.jar
+pack200 jogl-natives-linux-amd64-cdc.pack.gz jogl-natives-linux-amd64-cdc.jar
+pack200 jogl-natives-linux-amd64.pack.gz jogl-natives-linux-amd64.jar
+pack200 jogl.os.osx.cdc.pack.gz jogl.os.osx.cdc.jar
+pack200 jogl.os.osx.pack.gz jogl.os.osx.jar
+pack200 jogl.os.win.cdc.pack.gz jogl.os.win.cdc.jar
+pack200 jogl.os.win.pack.gz jogl.os.win.jar
+pack200 jogl.os.x11.cdc.pack.gz jogl.os.x11.cdc.jar
+pack200 jogl.os.x11.pack.gz jogl.os.x11.jar
+pack200 jogl.sdk.pack.gz jogl.sdk.jar
+pack200 jogl.test.pack.gz jogl.test.jar
+pack200 jogl.util.awt.pack.gz jogl.util.awt.jar
+pack200 jogl.util.cdc.pack.gz jogl.util.cdc.jar
+pack200 jogl.util.fixedfuncemu.cdc.pack.gz jogl.util.fixedfuncemu.cdc.jar
+pack200 jogl.util.fixedfuncemu.pack.gz jogl.util.fixedfuncemu.jar
+pack200 jogl.util.gl2.pack.gz jogl.util.gl2.jar
+pack200 jogl.util.pack.gz jogl.util.jar
+pack200 nativewindow.all.cdc.pack.gz nativewindow.all.cdc.jar
+pack200 nativewindow.all.pack.gz nativewindow.all.jar
+pack200 nativewindow.all-noawt.pack.gz nativewindow.all-noawt.jar
+pack200 nativewindow.awt.pack.gz nativewindow.awt.jar
+pack200 nativewindow.core.cdc.pack.gz nativewindow.core.cdc.jar
+pack200 nativewindow.core.pack.gz nativewindow.core.jar
+pack200 nativewindow-natives-linux-amd64-cdc.pack.gz nativewindow-natives-linux-amd64-cdc.jar
+pack200 nativewindow-natives-linux-amd64.pack.gz nativewindow-natives-linux-amd64.jar
+pack200 nativewindow.os.x11.cdc.pack.gz nativewindow.os.x11.cdc.jar
+pack200 nativewindow.os.x11.pack.gz nativewindow.os.x11.jar
+pack200 newt.all.cdc.pack.gz newt.all.cdc.jar
+pack200 newt.all.pack.gz newt.all.jar
+pack200 newt.all-noawt.pack.gz newt.all-noawt.jar
+pack200 newt.awt.pack.gz newt.awt.jar
+pack200 newt.broadcomegl.cdc.pack.gz newt.broadcomegl.cdc.jar
+pack200 newt.broadcomegl.pack.gz newt.broadcomegl.jar
+pack200 newt.core.cdc.pack.gz newt.core.cdc.jar
+pack200 newt.core.pack.gz newt.core.jar
+pack200 newt-natives-linux-amd64-cdc.pack.gz newt-natives-linux-amd64-cdc.jar
+pack200 newt-natives-linux-amd64.pack.gz newt-natives-linux-amd64.jar
+pack200 newt.ogl.cdc.pack.gz newt.ogl.cdc.jar
+pack200 newt.ogl.pack.gz newt.ogl.jar
+pack200 newt.os.osx.pack.gz newt.os.osx.jar
+pack200 newt.os.win.pack.gz newt.os.win.jar
+pack200 newt.os.x11.pack.gz newt.os.x11.jar
+JOGL Deployment Payload for pack.gz
+
+JOGL ES1 NEWT CORE
+16 gluegen-rt.pack.gz
+12 nativewindow.all-noawt.pack.gz
+56 jogl.core.pack.gz
+44 jogl.util.pack.gz
+16 jogl.egl.pack.gz
+12 jogl.gles1.pack.gz
+28 newt.all-noawt.pack.gz
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+36 libjogl_es1.so.gz
+12 libnewt.so.gz
+240 total
+
+JOGL ES2 NEWT CORE
+16 gluegen-rt.pack.gz
+12 nativewindow.all-noawt.pack.gz
+56 jogl.core.pack.gz
+44 jogl.util.pack.gz
+16 jogl.egl.pack.gz
+16 jogl.gles2.pack.gz
+28 newt.all-noawt.pack.gz
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+36 libjogl_es2.so.gz
+12 libnewt.so.gz
+244 total
+
+JOGL ES2 NEWT CORE FIXED
+16 gluegen-rt.pack.gz
+12 nativewindow.all-noawt.pack.gz
+56 jogl.core.pack.gz
+44 jogl.util.pack.gz
+16 jogl.egl.pack.gz
+16 jogl.gles2.pack.gz
+16 jogl.util.fixedfuncemu.pack.gz
+28 newt.all-noawt.pack.gz
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+36 libjogl_es2.so.gz
+12 libnewt.so.gz
+260 total
+
+JOGL GL2ES12 NEWT
+16 gluegen-rt.pack.gz
+12 nativewindow.all-noawt.pack.gz
+56 jogl.core.pack.gz
+44 jogl.util.pack.gz
+24 jogl.os.x11.pack.gz
+16 jogl.gl2es12.pack.gz
+28 newt.all-noawt.pack.gz
+4 libgluegen-rt.so.gz
+40 libjogl_gl2es12.so.gz
+12 libnewt.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+264 total
+
+JOGL GL2 NEWT
+16 gluegen-rt.pack.gz
+12 nativewindow.all-noawt.pack.gz
+56 jogl.core.pack.gz
+44 jogl.util.pack.gz
+24 jogl.os.x11.pack.gz
+60 jogl.gl2.pack.gz
+28 newt.all-noawt.pack.gz
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+12 libnewt.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+412 total
+
+JOGL GL2 AWT
+16 gluegen-rt.pack.gz
+20 nativewindow.all.pack.gz
+56 jogl.core.pack.gz
+44 jogl.util.pack.gz
+24 jogl.os.x11.pack.gz
+60 jogl.gl2.pack.gz
+20 jogl.awt.pack.gz
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_awt.so.gz
+4 libnativewindow_jvm.so.gz
+404 total
+
+JOGL ALL AWT
+16 gluegen-rt.pack.gz
+20 nativewindow.all.pack.gz
+680 jogl.all.pack.gz
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_awt.so.gz
+4 libnativewindow_jvm.so.gz
+880 total
+
+JOGL ALL No AWT
+16 gluegen-rt.pack.gz
+12 nativewindow.all-noawt.pack.gz
+612 jogl.all-noawt.pack.gz
+28 newt.all-noawt.pack.gz
+4 libgluegen-rt.so.gz
+144 libjogl_desktop.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+840 total
+
+JOGL CDCFP DESKTOP
+16 gluegen-rt-cdc.pack.gz
+20 nativewindow.all.pack.gz
+232 jogl.all.cdc.pack.gz
+28 newt.all.cdc.pack.gz
+4 libgluegen-rt.so.gz
+40 libjogl_gl2es12.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+364 total
+
+JOGL CDCFP ES1 MOBILE
+16 gluegen-rt-cdc.pack.gz
+56 jogl.core.cdc.pack.gz
+16 jogl.egl.cdc.pack.gz
+12 jogl.gles1.cdc.pack.gz
+44 jogl.util.cdc.pack.gz
+12 nativewindow.all.cdc.pack.gz
+28 newt.all.cdc.pack.gz
+4 libgluegen-rt.so.gz
+36 libjogl_es1.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+240 total
+
+JOGL CDCFP ES2 MOBILE
+16 gluegen-rt-cdc.pack.gz
+56 jogl.core.cdc.pack.gz
+16 jogl.egl.cdc.pack.gz
+16 jogl.gles2.cdc.pack.gz
+44 jogl.util.cdc.pack.gz
+12 nativewindow.all.cdc.pack.gz
+28 newt.all.cdc.pack.gz
+4 libgluegen-rt.so.gz
+36 libjogl_es2.so.gz
+4 libnativewindow_jvm.so.gz
+12 libnewt.so.gz
+244 total
+
+JOGL GLU
+20 jogl.glu.gl2.pack.gz
+24 jogl.glu.mipmap.cdc.pack.gz
+24 jogl.glu.mipmap.pack.gz
+20 jogl.glu.tess.cdc.pack.gz
+20 jogl.glu.tess.pack.gz
+108 total
+
+JOGL EVERYTHING
+680 jogl.all.pack.gz
+20 nativewindow.all.pack.gz
+32 newt.all.pack.gz
+4 libgluegen-rt.so.gz
+4 libnativewindow_jvm.so.gz
+8 libnativewindow_x11.so.gz
+4 libnativewindow_awt.so.gz
+144 libjogl_desktop.so.gz
+36 libjogl_es1.so.gz
+36 libjogl_es2.so.gz
+40 libjogl_gl2es12.so.gz
+12 libnewt.so.gz
+1020 total
+
diff --git a/etc/profile.jogl b/etc/profile.jogl
index f42a2504b..42162457e 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -28,11 +28,13 @@ uname -a | grep -i Darwin && OSS=osx
JOGL_AWT="jogl.awt.jar jogl.util.awt.jar newt.awt.jar nativewindow.awt.jar"
-JOGL_CORE="nativewindow.core.jar nativewindow.x11.jar jogl.core.jar newt.core.jar newt.$OSS.jar newt.ogl.jar jogl.util.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_JAR_ALL_NOAWT="$JOGL_CORE jogl.gles1.jar jogl.gles1.dbg.jar jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl.gl2es12.$OSS.jar jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.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.gl2es12.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.util.gl2.jar jogl.gl3.jar jogl.gl3.dbg.jar jogl.gl4.jar jogl.gl4.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar jogl.util.fixedfuncemu.jar jogl.cg.jar"
JOGL_JAR_ALL="$JOGL_JAR_ALL_NOAWT $JOGL_AWT"
-JOGL_LIB_ALL="libjogl_gl2.so libjogl_es1.so libjogl_es2.so libnewt.so libjogl_awt.so"
+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"
@@ -44,15 +46,15 @@ JOGL_JAR_ES2_MAX="$JOGL_CORE jogl.gles2.jar jogl.gles2.dbg.jar jogl.egl.jar jogl
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_JAR_GL2ES12_MIN="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar"
-JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.gl2es12.$OSS.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
+JOGL_JAR_GL2ES12_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar"
+JOGL_JAR_GL2ES12_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar jogl.util.fixedfuncemu.jar jogl.gl2es12.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar $JOGL_AWT"
JOGL_LIB_GL2ES12_MIN="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
JOGL_LIB_GL2ES12_MAX="libjogl_gl2es12.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
-JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar"
-JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.gl2.$OSS.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar"
-JOGL_LIB_GL2_MIN="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
-JOGL_LIB_GL2_MAX="libjogl_gl2.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_JAR_GL2_MIN="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar"
+JOGL_JAR_GL2_MAX="$JOGL_CORE jogl.os.$OSS.jar jogl.gl2.jar jogl.gl2.dbg.jar jogl.glu.tess.jar jogl.glu.mipmap.jar jogl.glu.gl2.jar jogl.util.gl2.jar $JOGL_AWT jogl.cg.jar"
+JOGL_LIB_GL2_MIN="libjogl_desktop.so libnewt.so libnativewindow_x11.so libnativewindow_awt.so"
+JOGL_LIB_GL2_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_GL2ES12_MIN JOGL_JAR_GL2ES12_MAX JOGL_JAR_GL2_MIN JOGL_JAR_GL2_MAX
export JOGL_LIB_ALL JOGL_LIB_ES1_MIN JOGL_LIB_ES1_MAX JOGL_LIB_ES2_MIN JOGL_LIB_ES2_MAX JOGL_LIB_GL2ES12_MIN JOGL_LIB_GL2ES12_MAX JOGL_LIB_GL2_MIN JOGL_LIB_GL2_MAX
@@ -96,7 +98,7 @@ export JOGL_LIB_DIR
if [ ! -z "$JOGL_PROFILE" ] ; then
case "$JOGL_PROFILE" in
JOGL_ALL)
- JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL)
+ JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST)
;;
JOGL_ALL_NOAWT)
JOGL_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT)
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index d516c21eb..e8d37dd05 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -83,12 +83,7 @@
</and>
</condition>
- <condition property="setup.noall">
- <isset property="setup.noAWT"/>
- </condition>
-
<echo message="setup.nodesktop: ${setup.nodesktop}" />
- <echo message="setup.noall: ${setup.noall}" />
<echo message="setup.noAWT: ${setup.noAWT}" />
<echo message="setup.noCDC: ${setup.noCDC}" />
@@ -131,6 +126,12 @@
<property name="java.part.gl2es12"
value="com/jogamp/opengl/impl/gl2es12/**"/>
+ <property name="java.part.gl4"
+ value="com/jogamp/opengl/impl/**/gl4/**"/>
+
+ <property name="java.part.gl4.dbg"
+ value="javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
+
<property name="java.part.gl3"
value="com/jogamp/opengl/impl/**/gl3/**"/>
@@ -288,14 +289,15 @@
<property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
<property name="gluegen.so.dir" value="${gluegen.root}/${rootrel.build}/obj" />
<property name="junit.jar" value="${gluegen.make.dir}/lib/junit-4.5.jar" />
+ <property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
<property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
- <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
+ <property name="nativewindow.os.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.jar" />
<property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
<property name="nativewindow.so.dir" value="../${rootrel.build}/nativewindow/obj" />
<property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
<property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
- <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
+ <property name="nativewindow.os.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.cdc.jar" />
<property name="newt.so.dir" value="../${rootrel.build}/newt/obj" />
@@ -322,7 +324,7 @@
<property name="obj.jogl" value="${project.root}/${rootrel.obj.jogl}" />
<property name="obj.cg" value="${project.root}/${rootrel.obj.cg}" />
- <property name="all.so.dir" value="${gluegen.so.dir}:${nativewindow.so.dir}:${obj}:${newt.so.dir}" />
+ <property name="all.so.dir" value="${gluegen.so.dir}${path.separator}${nativewindow.so.dir}${path.separator}${obj}${path.separator}${newt.so.dir}" />
<!-- The GL headers from which Java files are generated -->
<property name="config" value="${make}/config/jogl" />
@@ -378,14 +380,14 @@
<path id="nativewindow_gluegen.classpath">
<pathelement location="${gluegen-rt.jar}" />
<pathelement location="${nativewindow.core.jar}" />
- <pathelement location="${nativewindow.x11.jar}" />
+ <pathelement location="${nativewindow.os.x11.jar}" />
<pathelement location="${nativewindow.awt.jar}" />
</path>
<path id="nativewindow_gluegen.classpath-cdc">
<pathelement location="${gluegen-rt-cdc.jar}" />
<pathelement location="${nativewindow.core.cdc.jar}" />
- <pathelement location="${nativewindow.x11.cdc.jar}" />
+ <pathelement location="${nativewindow.os.x11.cdc.jar}" />
</path>
<!-- Create the classpath that includes GlueGen and
@@ -408,28 +410,33 @@
<property name="jogl.glumipmap.jar" value="${build}/jogl.glu.mipmap.jar" />
<property name="jogl.glugl2.jar" value="${build}/jogl.glu.gl2.jar" />
- <property name="jogl.gl2es12.x11.jar" value="${build}/jogl.gl2es12.x11.jar" />
- <property name="jogl.gl2es12.win.jar" value="${build}/jogl.gl2es12.win.jar" />
- <property name="jogl.gl2es12.osx.jar" value="${build}/jogl.gl2es12.osx.jar" />
+ <property name="jogl.os.x11.jar" value="${build}/jogl.os.x11.jar" />
+ <property name="jogl.os.win.jar" value="${build}/jogl.os.win.jar" />
+ <property name="jogl.os.osx.jar" value="${build}/jogl.os.osx.jar" />
+
+ <property name="jogl.gl2es12.jar" value="${build}/jogl.gl2es12.jar" />
- <property name="jogl.gl2.x11.jar" value="${build}/jogl.gl2.x11.jar" />
- <property name="jogl.gl2.win.jar" value="${build}/jogl.gl2.win.jar" />
- <property name="jogl.gl2.osx.jar" value="${build}/jogl.gl2.osx.jar" />
+ <property name="jogl.gl2.jar" value="${build}/jogl.gl2.jar" />
<property name="jogl.gl2.dbg.jar" value="${build}/jogl.gl2.dbg.jar" />
- <property name="jogl.gl3.x11.jar" value="${build}/jogl.gl3.x11.jar" />
- <property name="jogl.gl3.win.jar" value="${build}/jogl.gl3.win.jar" />
- <property name="jogl.gl3.osx.jar" value="${build}/jogl.gl3.osx.jar" />
+
+ <property name="jogl.gl3.jar" value="${build}/jogl.gl3.jar" />
<property name="jogl.gl3.dbg.jar" value="${build}/jogl.gl3.dbg.jar" />
+ <property name="jogl.gl4.jar" value="${build}/jogl.gl4.jar" />
+ <property name="jogl.gl4.dbg.jar" value="${build}/jogl.gl4.dbg.jar" />
+
+ <property name="jogl.omx.jar" value="${build}/jogl.omx.jar" />
+
<property name="jogl.awt.jar" value="${build}/jogl.awt.jar" />
<property name="jogl.util.jar" value="${build}/jogl.util.jar" />
<property name="jogl.util.gl2.jar" value="${build}/jogl.util.gl2.jar" />
<property name="jogl.util.awt.jar" value="${build}/jogl.util.awt.jar" />
<property name="jogl.util.fixedfuncemu.jar" value="${build}/jogl.util.fixedfuncemu.jar" />
<property name="jogl.sdk.jar" value="${build}/jogl.sdk.jar" />
+ <property name="jogl.test.jar" value="${build}/jogl.test.jar"/>
+
<property name="jogl.all.jar" value="${build}/jogl.all.jar"/>
<property name="jogl.all-noawt.jar" value="${build}/jogl.all-noawt.jar"/>
- <property name="jogl.test.jar" value="${build}/jogl.test.jar"/>
<!-- The resulting CDC jogl.jar. -->
<property name="jogl.core.cdc.jar" value="${build}/jogl.core.cdc.jar" />
@@ -440,28 +447,26 @@
<property name="jogl.egl.cdc.jar" value="${build}/jogl.egl.cdc.jar" />
<property name="jogl.glutess.cdc.jar" value="${build}/jogl.glu.tess.cdc.jar" />
<property name="jogl.glumipmap.cdc.jar" value="${build}/jogl.glu.mipmap.cdc.jar" />
- <property name="jogl.gl2es12.x11.cdc.jar" value="${build}/jogl.gl2es12.x11.cdc.jar" />
- <property name="jogl.gl2es12.win.cdc.jar" value="${build}/jogl.gl2es12.win.cdc.jar" />
- <property name="jogl.gl2es12.osx.cdc.jar" value="${build}/jogl.gl2es12.osx.cdc.jar" />
+ <property name="jogl.os.x11.cdc.jar" value="${build}/jogl.os.x11.cdc.jar" />
+ <property name="jogl.os.win.cdc.jar" value="${build}/jogl.os.win.cdc.jar" />
+ <property name="jogl.os.osx.cdc.jar" value="${build}/jogl.os.osx.cdc.jar" />
+ <property name="jogl.gl2es12.cdc.jar" value="${build}/jogl.gl2es12.cdc.jar" />
<property name="jogl.util.cdc.jar" value="${build}/jogl.util.cdc.jar" />
<property name="jogl.util.fixedfuncemu.cdc.jar" value="${build}/jogl.util.fixedfuncemu.cdc.jar" />
+
<property name="jogl.all.cdc.jar" value="${build}/jogl.all.cdc.jar"/>
<path id="jogl_junit.compile.classpath">
<pathelement location="${junit.jar}" />
<pathelement location="${gluegen-rt.jar}" />
- <pathelement location="${nativewindow.core.jar}" />
- <pathelement location="${nativewindow.x11.jar}" />
- <pathelement location="${nativewindow.awt.jar}" />
+ <pathelement location="${nativewindow.all.jar}" />
<pathelement location="${jogl.all.jar}" />
</path>
<path id="jogl_junit.run.classpath">
<pathelement location="${junit.jar}" />
<pathelement location="${gluegen-rt.jar}" />
- <pathelement location="${nativewindow.core.jar}" />
- <pathelement location="${nativewindow.x11.jar}" />
- <pathelement location="${nativewindow.awt.jar}" />
+ <pathelement location="${nativewindow.all.jar}" />
<pathelement location="${jogl.all.jar}" />
<pathelement location="${jogl.test.jar}" />
</path>
@@ -1462,7 +1467,7 @@
<condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
- <patternset id="c.src.files.jogl.gl2">
+ <patternset id="c.src.files.jogl.desktop">
<include name="${rootrel.src.c}/macosx/MacOSXCustomCGLCode.c" if="isOSX"/>
<include name="${rootrel.src.c}/macosx/MacOSXWindowSystemInterface.m" if="isOSX"/>
<include name="${rootrel.src.c}/macosx/ContextUpdater.m" if="isOSX"/>
@@ -1598,9 +1603,9 @@
<!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
</target>
- <target name="c.build.jogl.gl2" unless="setup.nodesktop">
- <c.build c.compiler.src.files="c.src.files.jogl.gl2"
- output.lib.name="jogl_gl2"
+ <target name="c.build.jogl.desktop" unless="setup.nodesktop">
+ <c.build c.compiler.src.files="c.src.files.jogl.desktop"
+ output.lib.name="jogl_desktop"
compiler.cfg.id="${compiler.cfg.id}"
linker.cfg.id="${linker.cfg.id.gl2}"/>
</target>
@@ -1646,7 +1651,11 @@
<antcall target="c.manifest.cg" inheritRefs="true" />
</target>
- <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.gl2,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
+ <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.desktop,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg">
+ <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+ <param name="libdir" value="${obj}"/>
+ </antcall>
+
<antcall target="c.manifest" inheritRefs="true" />
<!-- Create the Java Web Start jar file for the built native code -->
<jar destfile="${build}/jogl-natives-${os.and.arch}.jar" filesonly="true">
@@ -1717,32 +1726,33 @@
</copy>
</target>
- <target name="build-cg-jar" depends="setup-manifestfile" if="jogl.cg">
+ <target name="build-cg-jar-javase" depends="setup-manifestfile" if="jogl.cg">
<jar manifest="${build}/tempversion" destfile="${jogl.cg.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.nv-cg}"/>
</jar>
</target>
- <target name="build-jars-es-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
- <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.x11.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.glx}, ${java.part.gl2es12}, ${java.part.openmax}"
- excludes="${java.part.glugl2}"/>
+ <target name="build-jars-os-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop">
+ <jar manifest="${build}/tempversion" destfile="${jogl.os.x11.jar}" filesonly="true">
+ <fileset dir="${classes}" includes="${java.part.glx}"/>
</jar>
- <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.win.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.wgl}, ${java.part.gl2es12}, ${java.part.openmax}"
- excludes="${java.part.glugl2}"/>
+ <jar manifest="${build}/tempversion" destfile="${jogl.os.win.jar}" filesonly="true">
+ <fileset dir="${classes}" includes="${java.part.wgl}" />
</jar>
- <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.osx.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.cgl}, ${java.part.gl2es12}, ${java.part.openmax}"
+ <jar manifest="${build}/tempversion" destfile="${jogl.os.osx.jar}" filesonly="true">
+ <fileset dir="${classes}" includes="${java.part.cgl}"/>
+ </jar>
+ </target>
+
+ <target name="build-jars-es-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
+ <jar manifest="${build}/tempversion" destfile="${jogl.gl2es12.jar}" filesonly="true">
+ <fileset dir="${classes}" includes="${java.part.gl2es12}, ${java.part.openmax}"
excludes="${java.part.glugl2}"/>
</jar>
</target>
- <target name="build-jars-es" depends="setup-manifestfile,build-jars-es-desktop">
+ <target name="build-jars-es-javase" depends="setup-manifestfile,build-jars-es-desktop-javase">
<jar manifest="${build}/tempversion" destfile="${jogl.egl.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.egl}"
@@ -1768,20 +1778,22 @@
</jar>
</target>
- <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
- <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.x11.cdc.jar}" filesonly="true">
- <fileset dir="${classes-cdc}"
- includes="${java.part.glx}, ${java.part.gl2es12}, ${java.part.openmax}"
- excludes="${java.part.glugl2}"/>
+ <target name="build-jars-os-desktop-cdc" depends="setup-manifestfile" unless="setup.nodesktop">
+ <jar manifest="${build}/tempversion" destfile="${jogl.os.x11.cdc.jar}" filesonly="true">
+ <fileset dir="${classes-cdc}" includes="${java.part.glx}"/>
</jar>
- <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.win.cdc.jar}" filesonly="true">
- <fileset dir="${classes-cdc}"
- includes="${java.part.wgl}, ${java.part.gl2es12}, ${java.part.openmax}"
- excludes="${java.part.glugl2}"/>
+ <jar manifest="${build}/tempversion" destfile="${jogl.os.win.cdc.jar}" filesonly="true">
+ <fileset dir="${classes-cdc}" includes="${java.part.wgl}" />
+ </jar>
+ <jar manifest="${build}/tempversion" destfile="${jogl.os.osx.cdc.jar}" filesonly="true">
+ <fileset dir="${classes-cdc}" includes="${java.part.cgl}"/>
</jar>
- <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.osx.cdc.jar}" filesonly="true">
+ </target>
+
+ <target name="build-jars-es-desktop-cdc" depends="setup-manifestfile-cdc,build-jars-os-desktop-cdc" unless="setup.nodesktop">
+ <jar manifest="${build}/tempversion-cdc" destfile="${jogl.gl2es12.cdc.jar}" filesonly="true">
<fileset dir="${classes-cdc}"
- includes="${java.part.cgl}, ${java.part.gl2es12}, ${java.part.openmax}"
+ includes="${java.part.gl2es12}, ${java.part.openmax}"
excludes="${java.part.glugl2}"/>
</jar>
</target>
@@ -1812,7 +1824,7 @@
</jar>
</target>
- <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
+ <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
<jar manifest="${build}/tempversion" destfile="${jogl.awt.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.awt}" />
@@ -1823,7 +1835,7 @@
</jar>
</target>
- <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
+ <target name="build-jars-all-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
<jar manifest="${build}/tempversion" destfile="${jogl.all.jar}" filesonly="true">
<fileset dir="${classes}">
<include name="javax/media/opengl/**" />
@@ -1837,7 +1849,7 @@
includes="${java.part.util.fixedfuncemu.shadercode}"/>
</jar>
</target>
- <target name="build-jars-all-noawt" depends="setup-manifestfile">
+ <target name="build-jars-all-noawt-javase" depends="setup-manifestfile">
<jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
<fileset dir="${classes}"
includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**"
@@ -1885,45 +1897,40 @@
</jar>
</target>
- <target name="build-jars-desktop-javase" depends="setup-manifestfile" unless="setup.nodesktop">
+ <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
<!--os specific gl2-->
- <jar manifest="${build}/tempversion" destfile="${jogl.gl2.x11.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.glx}, ${java.part.gl2}, ${java.part.openmax}"
- excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
- </jar>
- <jar manifest="${build}/tempversion" destfile="${jogl.gl2.win.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.wgl}, ${java.part.gl2}, {java.part.openmax}"
- excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
- </jar>
- <jar manifest="${build}/tempversion" destfile="${jogl.gl2.osx.jar}" filesonly="true">
+ <jar manifest="${build}/tempversion" destfile="${jogl.gl2.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="${java.part.cgl}, ${java.part.gl2}, {java.part.openmax}"
- excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.glugl2}"/>
+ includes="${java.part.gl2}, ${java.part.openmax}"
+ excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
</jar>
<!--os specific gl3-->
- <jar manifest="${build}/tempversion" destfile="${jogl.gl3.x11.jar}" filesonly="true">
+ <jar manifest="${build}/tempversion" destfile="${jogl.gl3.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="${java.part.glx}, ${java.part.gl3}, ${java.part.openmax}"
- excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+ includes="${java.part.gl3}, ${java.part.openmax}"
+ excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
</jar>
- <jar manifest="${build}/tempversion" destfile="${jogl.gl3.win.jar}" filesonly="true">
- <fileset dir="${classes}"
- includes="${java.part.wgl}, ${java.part.gl3}, {java.part.openmax}"
- excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
- </jar>
- <jar manifest="${build}/tempversion" destfile="${jogl.gl3.osx.jar}" filesonly="true">
+
+ <!--os specific gl4-->
+ <jar manifest="${build}/tempversion" destfile="${jogl.gl4.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="${java.part.cgl}, ${java.part.gl3}, {java.part.openmax}"
- excludes="${java.part.gl2.dbg}, ${java.part.gl2.dbg}, ${java.part.glugl2}"/>
+ includes="${java.part.gl4}, ${java.part.openmax}"
+ excludes="${java.part.gl2.dbg}, ${java.part.gl3.dbg}, ${java.part.gl4.dbg}, ${java.part.glugl2}"/>
</jar>
<!-- misc -->
<jar manifest="${build}/tempversion" destfile="${jogl.gl2.dbg.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="${java.part.gl2.dbg} ${java.part.gl3.dbg}"/>
+ includes="${java.part.gl2.dbg}"/>
+ </jar>
+ <jar manifest="${build}/tempversion" destfile="${jogl.gl3.dbg.jar}" filesonly="true">
+ <fileset dir="${classes}"
+ includes="${java.part.gl3.dbg}"/>
+ </jar>
+ <jar manifest="${build}/tempversion" destfile="${jogl.gl4.dbg.jar}" filesonly="true">
+ <fileset dir="${classes}"
+ includes="${java.part.gl4.dbg}"/>
</jar>
<jar manifest="${build}/tempversion" destfile="${jogl.glugl2.jar}" filesonly="true">
<fileset dir="${classes}"
@@ -1936,7 +1943,7 @@
</jar>
</target>
- <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es, build-jars-awt, build-cg-jar, build-jars-all-awt, build-jars-all-noawt, build-jars-desktop-javase">
+ <target name="build-jars-javase" depends="setup-manifestfile, build-jars-es-javase, build-jars-awt-javase, build-cg-jar-javase, build-jars-all-awt-javase, build-jars-all-noawt-javase, build-jars-desktop-javase">
<jar manifest="${build}/tempversion" destfile="${jogl.core.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.core}"
@@ -2116,22 +2123,12 @@
</jar>
</target>
- <target name="junit.run" depends="declare.common">
- <condition property="system.env.library.path"
- value="LD_LIBRARY_PATH">
- <not>
- <isset property="isWindows"/>
- </not>
- </condition>
- <condition property="system.env.library.path"
- value="PATH">
- <isset property="isWindows"/>
- </condition>
-
+ <target name="junit.run" depends="declare.common,gluegen.cpptasks.detect.os">
<!-- Perform the junit tests-->
<mkdir dir="${build}/results"/>
<junit forkmode="once" showoutput="true" fork="true" haltonerror="true">
<env key="${system.env.library.path}" path="${all.so.dir}"/>
+ <jvmarg value="-Djava.library.path=${all.so.dir}"/>
<formatter usefile="false" type="plain"/>
<formatter usefile="true" type="xml"/>
<classpath refid="jogl_junit.run.classpath"/>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index e76c37a84..b34ad3954 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -80,14 +80,9 @@
</or>
</condition>
- <condition property="setup.noall">
- <isset property="setup.noAWT"/>
- </condition>
-
<property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar" />
<echo message="setup.nodesktop: ${setup.nodesktop}" />
- <echo message="setup.noall: ${setup.noall}" />
<echo message="setup.noAWT: ${setup.noAWT}" />
<echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
<echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
@@ -239,11 +234,12 @@
<!-- The resulting nativewindow.jar. -->
<property name="nativewindow.core.jar" value="${build}/nativewindow.core.jar" />
<property name="nativewindow.awt.jar" value="${build}/nativewindow.awt.jar" />
- <property name="nativewindow.x11.jar" value="${build}/nativewindow.x11.jar" />
+ <property name="nativewindow.os.x11.jar" value="${build}/nativewindow.os.x11.jar" />
<property name="nativewindow.all.jar" value="${build}/nativewindow.all.jar" />
+ <property name="nativewindow.all-noawt.jar" value="${build}/nativewindow.all-noawt.jar" />
<property name="nativewindow.core.cdc.jar" value="${build}/nativewindow.core.cdc.jar" />
- <property name="nativewindow.x11.cdc.jar" value="${build}/nativewindow.x11.cdc.jar" />
+ <property name="nativewindow.os.x11.cdc.jar" value="${build}/nativewindow.os.x11.cdc.jar" />
<property name="nativewindow.all.cdc.jar" value="${build}/nativewindow.all.cdc.jar" />
<!-- The javadoc dirs. -->
@@ -759,6 +755,10 @@
</target>
<target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.jvm,c.build.nativewindow.awt">
+ <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+ <param name="libdir" value="${obj}"/>
+ </antcall>
+
<antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
<antcall target="c.manifest" inheritRefs="true" />
<!-- Create the Java Web Start jar file for the built native code -->
@@ -835,39 +835,39 @@
</target>
<target name="build-jars-x11" depends="setup-manifestfile">
- <jar manifest="tempversion" destfile="${nativewindow.x11.jar}" filesonly="true">
+ <jar manifest="tempversion" destfile="${nativewindow.os.x11.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.x11}" />
</jar>
</target>
<target name="build-jars-x11-cdc" depends="setup-manifestfile-cdc">
- <jar manifest="tempversion-cdc" destfile="${nativewindow.x11.cdc.jar}" filesonly="true">
+ <jar manifest="tempversion-cdc" destfile="${nativewindow.os.x11.cdc.jar}" filesonly="true">
<fileset dir="${classes-cdc}"
includes="${java.part.x11}" />
</jar>
</target>
- <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noall">
+ <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noAWT">
<jar manifest="tempversion" destfile="${nativewindow.all.jar}" filesonly="true">
- <fileset dir="${classes}">
- <include name="javax/media/nativewindow/**" />
- <include name="com/jogamp/nativewindow/**" />
- <include name="com/jogamp/gluegen/runtime/**" />
- <exclude name="${java.part.x11}" />
- </fileset>
+ <fileset dir="${classes}"
+ includes="javax/media/nativewindow/** com/jogamp/nativewindow/**" />
+ </jar>
+ </target>
+ <target name="build-jars-all-noawt" depends="setup-manifestfile">
+ <jar manifest="tempversion" destfile="${nativewindow.all-noawt.jar}" filesonly="true">
+ <fileset dir="${classes}"
+ includes="javax/media/nativewindow/**, com/jogamp/nativewindow/**"
+ excludes="${java.part.awt}"/>
</jar>
</target>
<target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
<jar manifest="tempversion-cdc" destfile="${nativewindow.all.cdc.jar}" filesonly="true">
- <fileset dir="${classes-cdc}">
- <include name="javax/media/nativewindow/**" />
- <include name="com/jogamp/nativewindow/**" />
- <include name="com/jogamp/gluegen/runtime/**" />
- </fileset>
+ <fileset dir="${classes-cdc}"
+ includes="javax/media/nativewindow/** com/jogamp/nativewindow/**" />
</jar>
</target>
- <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-all">
+ <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-all,build-jars-all-noawt">
<jar manifest="tempversion" destfile="${nativewindow.core.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.core}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index eddbf609f..782ff158d 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -78,10 +78,6 @@
</and>
</condition>
- <condition property="setup.noall">
- <isset property="setup.noAWT"/>
- </condition>
-
<condition property="setup.nonatives">
<and>
<isfalse value="${isWindows}" />
@@ -95,7 +91,6 @@
<echo message="setup.nonatives: ${setup.nonatives}" />
<echo message="setup.nodesktop: ${setup.nodesktop}" />
- <echo message="setup.noall: ${setup.noall}" />
<echo message="setup.noCDC: ${setup.noCDC}" />
<echo message="setup.noAWT: ${setup.noAWT}" />
<echo message="setup.noOpenGL: ${setup.noOpenGL}" />
@@ -211,14 +206,14 @@
<property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
<property name="nativewindow.core.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.jar" />
- <property name="nativewindow.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.jar" />
+ <property name="nativewindow.os.x11.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.jar" />
<property name="nativewindow.awt.jar" value="../${rootrel.build}/nativewindow/nativewindow.awt.jar" />
<property name="jogl.core.jar" value="../${rootrel.build}/jogl/jogl.core.jar" />
<property name="jogl.egl.jar" value="../${rootrel.build}/jogl/jogl.egl.jar" />
<property name="gluegen-rt-cdc.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt-cdc.jar" />
<property name="nativewindow.core.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.core.cdc.jar" />
- <property name="nativewindow.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.x11.cdc.jar" />
+ <property name="nativewindow.os.x11.cdc.jar" value="../${rootrel.build}/nativewindow/nativewindow.os.x11.cdc.jar" />
<property name="jogl.core.cdc.jar" value="../${rootrel.build}/jogl/jogl.core.cdc.jar" />
<property name="jogl.egl.cdc.jar" value="../${rootrel.build}/jogl/jogl.egl.cdc.jar" />
@@ -239,7 +234,7 @@
<path id="nativewindow_gluegen_jogl.classpath">
<pathelement location="${gluegen-rt.jar}" />
<pathelement location="${nativewindow.core.jar}" />
- <pathelement location="${nativewindow.x11.jar}" />
+ <pathelement location="${nativewindow.os.x11.jar}" />
<pathelement location="${nativewindow.awt.jar}" />
<pathelement location="${jogl.core.jar}" />
<pathelement location="${jogl.egl.jar}" />
@@ -248,16 +243,16 @@
<path id="nativewindow_gluegen_jogl.classpath-cdc">
<pathelement location="${gluegen-rt-cdc.jar}" />
<pathelement location="${nativewindow.core.cdc.jar}" />
- <pathelement location="${nativewindow.x11.cdc.jar}" />
+ <pathelement location="${nativewindow.os.x11.cdc.jar}" />
<pathelement location="${jogl.core.cdc.jar}" />
<pathelement location="${jogl.egl.cdc.jar}" />
</path>
<!-- The resulting newt.jar. -->
<property name="newt.core.jar" value="${build}/newt.core.jar" />
- <property name="newt.x11.jar" value="${build}/newt.x11.jar" />
- <property name="newt.win.jar" value="${build}/newt.win.jar" />
- <property name="newt.osx.jar" value="${build}/newt.osx.jar" />
+ <property name="newt.os.x11.jar" value="${build}/newt.os.x11.jar" />
+ <property name="newt.os.win.jar" value="${build}/newt.os.win.jar" />
+ <property name="newt.os.osx.jar" value="${build}/newt.os.osx.jar" />
<property name="newt.ogl.jar" value="${build}/newt.ogl.jar" />
<property name="newt.broadcomegl.jar" value="${build}/newt.broadcomegl.jar" />
<property name="newt.awt.jar" value="${build}/newt.awt.jar" />
@@ -265,9 +260,9 @@
<property name="newt.all-noawt.jar" value="${build}/newt.all-noawt.jar" />
<property name="newt.core.cdc.jar" value="${build}/newt.core.cdc.jar" />
- <property name="newt.x11.cdc.jar" value="${build}/newt.x11.cdc.jar" />
- <property name="newt.win.cdc.jar" value="${build}/newt.win.cdc.jar" />
- <property name="newt.osx.cdc.jar" value="${build}/newt.osx.cdc.jar" />
+ <property name="newt.os.x11.cdc.jar" value="${build}/newt.os.x11.cdc.jar" />
+ <property name="newt.os.win.cdc.jar" value="${build}/newt.os.win.cdc.jar" />
+ <property name="newt.os.osx.cdc.jar" value="${build}/newt.os.osx.cdc.jar" />
<property name="newt.ogl.cdc.jar" value="${build}/newt.ogl.cdc.jar" />
<property name="newt.broadcomegl.cdc.jar" value="${build}/newt.broadcomegl.cdc.jar" />
<property name="newt.all.cdc.jar" value="${build}/newt.all.cdc.jar" />
@@ -633,6 +628,10 @@
</target>
<target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.natives">
+ <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true">
+ <param name="libdir" value="${obj}"/>
+ </antcall>
+
<antcall target="c.manifest" inheritRefs="true" />
<!-- Create the Java Web Start jar file for the built native code -->
<jar destfile="${build}/newt-natives-${os.and.arch}.jar" filesonly="true">
@@ -727,36 +726,36 @@
</target>
<target name="build-jars-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
- <jar manifest="tempversion" destfile="${newt.x11.jar}" filesonly="true">
+ <jar manifest="tempversion" destfile="${newt.os.x11.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.x11}"/>
</jar>
- <jar manifest="tempversion" destfile="${newt.win.jar}" filesonly="true">
+ <jar manifest="tempversion" destfile="${newt.os.win.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.windows}"/>
</jar>
- <jar manifest="tempversion" destfile="${newt.osx.jar}" filesonly="true">
+ <jar manifest="tempversion" destfile="${newt.os.osx.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.macosx}"/>
</jar>
</target>
<target name="build-jars-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
- <jar manifest="tempversion-cdc" destfile="${newt.x11.cdc.jar}" filesonly="true">
+ <jar manifest="tempversion-cdc" destfile="${newt.os.x11.cdc.jar}" filesonly="true">
<fileset dir="${classes-cdc}"
includes="${java.part.x11}"/>
</jar>
- <jar manifest="tempversion-cdc" destfile="${newt.win.cdc.jar}" filesonly="true">
+ <jar manifest="tempversion-cdc" destfile="${newt.os.win.cdc.jar}" filesonly="true">
<fileset dir="${classes-cdc}"
includes="${java.part.windows}"/>
</jar>
- <jar manifest="tempversion-cdc" destfile="${newt.osx.cdc.jar}" filesonly="true">
+ <jar manifest="tempversion-cdc" destfile="${newt.os.osx.cdc.jar}" filesonly="true">
<fileset dir="${classes-cdc}"
includes="${java.part.macosx}"/>
</jar>
</target>
- <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
+ <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noAWT">
<jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
<fileset dir="${classes}"
includes="com/jogamp/newt/**" />
diff --git a/make/jogl.properties b/make/jogl.properties
index 4f5f4d44b..34a593dac 100644
--- a/make/jogl.properties
+++ b/make/jogl.properties
@@ -16,5 +16,5 @@
# default location, modify the appropriate variable to point to the
# absolute path of the lib directory
#
-windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib
+windows.cg.lib=C:/Cg-2.2/lib
x11.cg.lib=/usr/lib
diff --git a/make/lstjars.sh b/make/lstjars.sh
index 5357cde11..7159c184e 100644
--- a/make/lstjars.sh
+++ b/make/lstjars.sh
@@ -1,17 +1,18 @@
#! /bin/sh
THISDIR=$(pwd)
-STATDIR=$THISDIR/../stats
BUILDDIR=$1
shift
BUILDDIR_GLUEGEN=$1
shift
if [ -z "$BUILDDIR" -o -z "$BUILDDIR_GLUEGEN" ] ; then
- echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN>"
+ echo "usage $0 <BUILDDIR-JOGL> <BUILDDIR-GLUEGEN> [-skippack200]"
exit 1
fi
+STATDIR=$BUILDDIR-stats
+
skippack200=0
if [ "$1" = "-skippack200" ] ; then
skippack200=1
@@ -23,6 +24,69 @@ function report() {
du -ksc $*
}
+OSS=x11
+ARCH=linux-amd64
+
+function listdeployment() {
+ JAR_SUFFIX=$1
+ shift
+
+ 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 libnativewindow_jvm.so.gz libjogl_es1.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 libnativewindow_jvm.so.gz libjogl_es2.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 libnativewindow_jvm.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 libnativewindow_jvm.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.gl2.$JAR_SUFFIX newt.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.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.gl2.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_desktop.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.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 libnativewindow_jvm.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 libnativewindow_jvm.so.gz libnewt.so.gz
+ echo
+
+ echo JOGL CDCFP DESKTOP
+ report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+ echo
+
+ echo JOGL CDCFP ES1 MOBILE
+ report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
+ echo
+
+ echo JOGL CDCFP ES2 MOBILE
+ report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.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_jvm.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libjogl_desktop.so.gz libjogl_es1.so.gz libjogl_es2.so.gz libjogl_gl2es12.so.gz libnewt.so.gz
+ echo
+}
+
rm -rf $STATDIR
mkdir -p $STATDIR
cp -a $BUILDDIR/nativewindow/obj/*.so $STATDIR
@@ -59,7 +123,7 @@ done
rm -rf nope
mkdir -p nope
-mv *.cdc.lst *.all.lst nope/
+mv *.cdc.lst *.all*.lst nope/
mv jogl.gl2es12.*.lst jogl.gl2.*.lst nope/
echo duplicates - w/o gl2es12.* gl2.*
@@ -67,16 +131,18 @@ echo
sort jogl*.lst | uniq -d
mv nope/* .
-mv *.cdc.lst *.all.lst nope/
+mv *.cdc.lst *.all*.lst nope/
cat *.lst | sort -u > allparts.lst
mv nope/* .
-cat *.all.lst | sort -u > allall.lst
+cat *.all.lst gluegen-rt.lst | sort -u > allall.lst
cat jogl.all.cdc.lst newt.all.cdc.lst nativewindow.core.lst | sort -u > allcdc.lst
echo all vs allparts delta
echo
diff -Nur allparts.lst allall.lst
+listdeployment jar
+
if [ $skippack200 -eq 0 ] ; then
for i in *.jar ; do
fname=$i
@@ -84,57 +150,6 @@ if [ $skippack200 -eq 0 ] ; then
echo pack200 $bname.pack.gz $fname
pack200 $bname.pack.gz $fname
done
- JAR_SUFFIX=pack.gz
-else
- JAR_SUFFIX=jar
+ listdeployment pack.gz
fi
-OSS=x11
-
-echo JOGL ES1 NEWT CORE
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles1.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es1.so.gz libnewt.so.gz
-echo
-
-echo JOGL ES2 NEWT CORE
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
-echo
-
-echo JOGL ES2 NEWT CORE FIXED
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.egl.$JAR_SUFFIX jogl.gles2.$JAR_SUFFIX jogl.util.fixedfuncemu.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_jvm.so.gz libjogl_es2.so.gz libnewt.so.gz
-echo
-
-echo JOGL GL2ES12 NEWT
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2es12.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
-echo
-
-echo JOGL GL2 NEWT
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX newt.core.$JAR_SUFFIX newt.ogl.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnewt.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz
-echo
-
-echo JOGL GL2 AWT
-report gluegen-rt.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX nativewindow.awt.$JAR_SUFFIX jogl.core.$JAR_SUFFIX jogl.util.$JAR_SUFFIX jogl.gl2.$OSS.$JAR_SUFFIX jogl.awt.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz
-echo
-
-echo JOGL ALL
-report gluegen-rt.$JAR_SUFFIX nativewindow.all.$JAR_SUFFIX jogl.all.$JAR_SUFFIX newt.all.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2.so.gz libnativewindow_$OSS.so.gz libnativewindow_awt.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL CDCFP DESKTOP
-report gluegen-rt-cdc.$JAR_SUFFIX nativewindow.core.$JAR_SUFFIX jogl.all.cdc.$JAR_SUFFIX newt.all.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_gl2es12.so.gz libnativewindow_$OSS.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL CDCFP ES1 MOBILE
-report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles1.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es1.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL CDCFP ES2 MOBILE
-report gluegen-rt-cdc.$JAR_SUFFIX jogl.core.cdc.$JAR_SUFFIX jogl.egl.cdc.$JAR_SUFFIX jogl.gles2.cdc.$JAR_SUFFIX jogl.util.cdc.$JAR_SUFFIX nativewindow.core.cdc.$JAR_SUFFIX newt.broadcomegl.cdc.$JAR_SUFFIX newt.core.cdc.$JAR_SUFFIX newt.ogl.cdc.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_es2.so.gz libnativewindow_jvm.so.gz libnewt.so.gz
-echo
-
-echo JOGL GLU
-report jogl.glu.*pack.gz
-echo
-
-echo JOGL EVERYTHING
-report *.all.pack.gz
-echo
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index b5f860bd4..b6c5e9d63 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -5,8 +5,8 @@ if [ -e ../../setenv-build-jogl-x86_64.sh ] ; then
fi
# -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64
-# -Dc.compiler.debug=true
-# -Dbuild.noarchives=true
+# -Dc.compiler.debug=true \
+# -Dbuild.noarchives=true \
# -Dgluegen.cpptasks.detected.os=true \
# -DisUnix=true \
@@ -18,7 +18,6 @@ fi
ant \
-Dbuild.noarchives=true \
-Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \
- -Dc.compiler.debug=true \
-Drootrel.build=build-x86_64 \
-DuseKD=true \
-DuseOpenMAX=true \
diff --git a/make/make.jogl.all.win32.bat b/make/make.jogl.all.win32.bat
index 8525b5a45..da45cbd7b 100644
--- a/make/make.jogl.all.win32.bat
+++ b/make/make.jogl.all.win32.bat
@@ -1,7 +1,11 @@
-set THISDIR="C:\SUN\JOGL2"
-set J2RE_HOME=c:\jre6
-set JAVA_HOME=c:\jdk6
-set PATH=%JAVA_HOME%\bin;%PATH%
+set THISDIR="C:\JOGL"
+
+set J2RE_HOME=c:\jre1.6.0_19
+set JAVA_HOME=c:\jdk1.6.0_19
+set ANT_PATH=C:\apache-ant-1.7.1
+
+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
@@ -9,4 +13,4 @@ REM -DuseOpenMAX=true
REM -DuseKD=true
REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
-ant -Dbuild.noarchives=true -Dc.compiler.debug=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
+ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 -Dwindows.cg.lib=C:\Cg-2.2\lib %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
index 0e5885349..b6024f240 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
@@ -61,7 +61,7 @@ public class NativeLibLoader extends NativeLibLoaderBase {
public static void loadGLDesktop() {
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- loadLibrary("jogl_gl2", nativeOSPreload, true);
+ loadLibrary("jogl_desktop", nativeOSPreload, true);
return null;
}
});
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
index bf80ec7b3..56d669756 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -118,4 +118,8 @@ public class Texture1 {
frame.dispose();
frame=null;
}
+
+ public static void main(String args[]) {
+ org.junit.runner.JUnitCore.main(Texture1.class.getName());
+ }
}
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index 01563a0d1..8c9792b19 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -33,7 +33,7 @@
#import <inttypes.h>
-#import "com_sun_newt_macosx_MacWindow.h"
+#import "com_jogamp_newt_macosx_MacWindow.h"
#import "NewtMacWindow.h"
#import "EventListener.h"
diff --git a/src/newt/native/NewtMacWindow.h b/src/newt/native/NewtMacWindow.h
index e19be2ed8..560cfe408 100644
--- a/src/newt/native/NewtMacWindow.h
+++ b/src/newt/native/NewtMacWindow.h
@@ -55,7 +55,7 @@
@end
-@interface NewtMacWindow : NSWindow
+@interface NewtMacWindow : NSWindow <NSWindowDelegate>
{
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 15:55:52 +0000