Add: Extended support for CVM:

        - GLX, CGL, WGL
        - GL2ES12 desktop ES1 and ES2 common profile

Cleanup JAR file seperation
    - New: jogl.cdcfp.jar (ALL for CVM/CDC)
    - New: setup.nogl2es12 (Allow GL2ES12 for CVM without gl2/gl3)
    - Clean dependencies of GLX, WGL, CGL (incl. for GL2ES12)
    - Only build supported JAR archive, ie if they are being build

Fix GL2ES12: Only add impl. for ES1 and ES2  interface methods

- Use new com.sun.gluegen.runtime.PointerBuffer, to support CVM

- CVM and J2SE Java JAR archives are equal!
    - Well, the build form *everything* includes some empty directories
      in the cdcfp JAR archives though.

- Removed last AWT dependency in MacOSX chain
    - GLDrawableFactory
        - com.sun.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory
            - com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory

4 files changed, 16 insertions, 9 deletions

diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
index b46bc99ab..d304cdd69 100644
--- a/make/config/jogl/gl-gl2es12.cfg
+++ b/make/config/jogl/gl-gl2es12.cfg
@@ -2,13 +2,13 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl2es12
 
-ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 Style ImplOnly
 ImplPackage com.sun.opengl.impl.gl2es12
@@ -27,6 +27,11 @@ Include gl-desktop.cfg
 # proc address table entry for it. Force it to here.
 ForceProcAddressGen glMapBuffer
 
+# Force all of the methods to be emitted using dynamic linking so we
+# don't need to link against any emulation library on the desktop or
+# depend on the presence of an import library for a particular device
+ForceProcAddressGen __ALL__
+
 EmitProcAddressTable true
 ProcAddressTableClassName GL2ES12ProcAddressTable
 GetProcAddressTableExpr ((GL2ES12ProcAddressTable)_context.getGLProcAddressTable())
diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index f59e71e41..25a6156b7 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -13,7 +13,7 @@
 
 
   /** Interface to C language function: <br> - Alias for: <br> <code> GLXFBConfig *  glXChooseFBConfigSGIX, glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code>    */
-  public static java.nio.LongBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
+  public static com.sun.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
   {
     if(attribList != null && attribList.length <= attribList_offset)
       throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");
@@ -23,7 +23,7 @@
     _res = glXChooseFBConfigCopied1(dpy, screen, attribList, BufferFactory.SIZEOF_INT * attribList_offset, nitems, BufferFactory.SIZEOF_INT * nitems_offset);
 
     if (_res == null) return null;
-    return BufferFactory.asPointerBuffer(_res);
+    return PointerBuffer.wrapNative2Java(_res, false);
   }
 
   /** Entry point to C language function: - Alias for: <br> <code> GLXFBConfig *  glXChooseFBConfigSGIX, glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code>    */
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg
index 5511b339e..3ef151c44 100644
--- a/make/config/jogl/glx-x11.cfg
+++ b/make/config/jogl/glx-x11.cfg
@@ -81,3 +81,4 @@ Ignore GLXHyperpipeNetworkSGIX
 Ignore GLXHyperpipeConfigSGIX
 Ignore GLXPipeRect
 Ignore GLXPipeRectLimits
+
diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg
index b1b8fe65a..9688a9436 100755
--- a/make/config/jogl/glxext.cfg
+++ b/make/config/jogl/glxext.cfg
@@ -130,3 +130,4 @@ Ignore GLXHyperpipeNetworkSGIX
 Ignore GLXHyperpipeConfigSGIX
 Ignore GLXPipeRect
 Ignore GLXPipeRectLimits
+