1st cdcfp cleanup round

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1693 232f8b59-042b-4e1e-8c03-345bb8c30851

17 files changed, 68 insertions, 109 deletions

diff --git a/make/build.xml b/make/build.xml
index 2a5367e30..f050fbf0d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -46,8 +46,18 @@
    - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
    - the original OS detection code.
    -
-   - Some environment defs ..
-       jogl.cdcfp
+   - Some environment defs affecting compilation
+
+       jogl.cdcfp     - Using the CDC Java runtime library
+                            - no DoubleBuffer 
+                            - no LongBuffer
+
+                        This will set
+                            -> jogl.noAWT
+                            -> jogl.nogl2
+
+   - Internal settings, may not be necessary to set them manually,
+     since all JAR archives are orthogonal.
        jogl.noes1
        jogl.noes2
        jogl.nogl2
@@ -93,11 +103,9 @@
            </and>
         </condition>
 
-        <echo message="jogl.noes : ${jogl.noes}" />
-        <echo message="jogl.noes1: ${jogl.noes1}" />
-        <echo message="jogl.noes2: ${jogl.noes2}" />
-        <echo message="jogl.nogl2: ${jogl.nogl2}" />
-
+        <condition property="jogl.nogl2">
+           <isset property="jogl.cdcfp"/> 
+        </condition>
         <condition property="jogl.noAWT">
            <isset property="jogl.cdcfp"/> 
         </condition>
@@ -108,6 +116,10 @@
         <echo message="jogl.cdcfp: ${jogl.cdcfp}" />
         <echo message="jogl.noAWT: ${jogl.noAWT}" />
         <echo message="javac.bootclasspath.jar: ${javac.bootclasspath.jar}" />
+        <echo message="jogl.noes : ${jogl.noes}" />
+        <echo message="jogl.noes1: ${jogl.noes1}" />
+        <echo message="jogl.noes2: ${jogl.noes2}" />
+        <echo message="jogl.nogl2: ${jogl.nogl2}" />
 
         <condition property="jogl.noX11WindowsMacOsX">
           <and>
@@ -143,19 +155,19 @@
                   value="com/sun/opengl/impl/glu/gl2/**, com/sun/opengl/impl/glu/nurbs/**, com/sun/opengl/impl/glu/registry/**, com/sun/opengl/impl/glu/tessellator/**, javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.gl2"
-                  value="javax/media/opengl/GL2.*, com/sun/opengl/impl/**/gl2/**, com/sun/opengl/impl/**/glx/**, com/sun/opengl/impl/**/wgl/**, com/sun/opengl/impl/**/cgl/**"/>
+                  value="com/sun/opengl/impl/**/gl2/**, com/sun/opengl/impl/**/glx/**, com/sun/opengl/impl/**/wgl/**, com/sun/opengl/impl/**/cgl/**"/>
 
         <property name="java.part.gl2.dbg"
                   value="javax/media/opengl/TraceGL2.*, javax/media/opengl/DebugGL2.*"/>
 
         <property name="java.part.es1"
-                  value="javax/media/opengl/GLES1.*, javax/media/opengl/**/es1/**, com/sun/opengl/**/es1/**"/>
+                  value="javax/media/opengl/**/es1/**, com/sun/opengl/**/es1/**"/>
 
         <property name="java.part.es1.dbg"
                   value="javax/media/opengl/TraceGLES1.*, javax/media/opengl/DebugGLES1.*"/>
 
         <property name="java.part.es2"
-                  value="javax/media/opengl/GLES2.*, javax/media/opengl/**/es2/**, com/sun/opengl/**/es2/**"/>
+                  value="javax/media/opengl/**/es2/**, com/sun/opengl/**/es2/**"/>
 
         <property name="java.part.es2.dbg"
                   value="javax/media/opengl/TraceGLES2.*, javax/media/opengl/DebugGLES2.*"/>
@@ -780,7 +792,7 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.gl2" unless="jogl.nogl2">
+    <target name="java.generate.gl2">
         <echo message="Generating GL2 interface and implementation" />
         <gluegen src="${stub.includes.common}/gl.c" 
                  config="${config}/gl-gl2.cfg"
@@ -790,7 +802,7 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.gles1" unless="jogl.noes1">
+    <target name="java.generate.gles1">
         <echo message="Generating GLES1 interface and implementation" />
         <gluegen src="${stub.includes.common}/gles1.c" 
                  config="${config}/gl-es1.cfg"
@@ -800,7 +812,7 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.gles2" unless="jogl.noes2">
+    <target name="java.generate.gles2">
         <echo message="Generating GLES2 interface and implementation" />
         <gluegen src="${stub.includes.common}/gles2.c" 
                  config="${config}/gl-es2.cfg"
@@ -1304,9 +1316,9 @@
 
         <include name="${rootrel.src.c.jogl}/ContextUpdater.m" if="isOSX"/>
 
-        <include name="${rootrel.generated.c.jogl}/GL2Impl_JNI.c"/>
-        <include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/>
-        <include name="${rootrel.generated.c.jogl}/GLUgl2_JNI.c"/>
+        <include name="${rootrel.generated.c.jogl}/gl2/GL2Impl_JNI.c"/>
+        <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
+        <include name="${rootrel.generated.c.jogl}/gl2/GLUgl2_JNI.c"/>
 
         <include name="${rootrel.generated.c.jogl}/X11/GLX*.c" if="isX11"/>
         <include name="${rootrel.generated.c.jogl}/OSX/CGL*.c" if="isOSX"/>
@@ -1326,9 +1338,9 @@
 
         <include name="${rootrel.generated.c.jogl}/X11/X11Lib_JNI.c" if="isX11"/>
 
-        <include name="${rootrel.generated.c.jogl}/GLES2Impl_JNI.c"/>
+        <include name="${rootrel.generated.c.jogl}/es2/GLES2Impl_JNI.c"/>
 
-        <include name="${rootrel.generated.c.jogl}/EGL_JNI.c"/>
+        <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/>
         <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/>
         <include name="${rootrel.src.c.jogl}/ContextUpdater.m" if="isOSX"/>
       </patternset>
@@ -1343,13 +1355,13 @@
 
         <include name="${rootrel.generated.c.jogl}/X11/X11Lib_JNI.c" if="isX11"/>
 
-        <include name="${rootrel.generated.c.jogl}/EGL_JNI.c"/>
+        <include name="${rootrel.generated.c.jogl}/egl/EGL_JNI.c"/>
         <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/>
         <include name="${rootrel.src.c.jogl}/ContextUpdater.m" if="isOSX"/>
 
-        <include name="${rootrel.generated.c.jogl}/GLES1Impl_JNI.c"/>
-        <include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/>
-        <include name="${rootrel.generated.c.jogl}/GLUes1_JNI.c"/>
+        <include name="${rootrel.generated.c.jogl}/es1/GLES1Impl_JNI.c"/>
+        <!--include name="${rootrel.generated.c.jogl}/GLU_JNI.c"/ EMPTY -->
+        <!--include name="${rootrel.generated.c.jogl}/es1/GLUes1_JNI.c" EMPTY /-->
       </patternset>
 
       <patternset id="c.src.files.cg">
@@ -1473,7 +1485,7 @@
       </antcall>
     </target>
 
-    <target name="c.build.jogl.gl2">
+    <target name="c.build.jogl.gl2" unless="jogl.nogl2">
       <antcall target="c.build" inheritRefs="true">
         <param name="c.compiler.src.files" value="c.src.files.jogl.gl2"/>
         <param name="c.compiler.use-gl2" value="true"/>
@@ -1482,7 +1494,7 @@
       </antcall>
     </target>
 
-    <target name="c.build.jogl.es2">
+    <target name="c.build.jogl.es2" unless="jogl.noes1">
       <antcall target="c.build" inheritRefs="true">
         <param name="c.compiler.src.files" value="c.src.files.jogl.es2"/>
         <param name="c.compiler.use-es2" value="true"/>
@@ -1491,7 +1503,7 @@
       </antcall>
     </target>
 
-    <target name="c.build.jogl.es1">
+    <target name="c.build.jogl.es1" unless="jogl.noes2">
       <antcall target="c.build" inheritRefs="true">
         <param name="c.compiler.src.files" value="c.src.files.jogl.es1"/>
         <param name="c.compiler.use-es1" value="true"/>
diff --git a/make/egl.cfg b/make/egl.cfg
index 2ba4addd5..494567545 100755
--- a/make/egl.cfg
+++ b/make/egl.cfg
@@ -1,12 +1,18 @@
 # This .cfg file is used to generate the interface to the EGL routines
 # used internally by the EGLContext implementation.
-Package com.sun.opengl.impl.egl
 JavaOutputDir ../build/gensrc/classes
-NativeOutputDir ../build/gensrc/native/jogl
+NativeOutputDir ../build/gensrc/native/jogl/egl
+
+Package com.sun.opengl.impl.egl
 JavaClass EGL
 Style allstatic
 # Shouldn't matter which one of these we pick up
-Include gl-common-es1.cfg
+
+HierarchicalNativeOutput false
+Include gl-common.cfg
+
+# There are a few routines we don't handle yet
+Ignore glGetBufferPointervOES
 
 # Use a ProcAddressTable so we dynamically look up the routines
 EmitProcAddressTable true
diff --git a/make/gl-common-es1.cfg b/make/gl-common-es1.cfg
deleted file mode 100755
index e92fd4a02..000000000
--- a/make/gl-common-es1.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# This .cfg file provides common options used among all GL glue code
-# generated for Jogl on OpenGL ES 1.
-
-HierarchicalNativeOutput false
-Include gl-common.cfg
-JavaOutputDir ../build/gensrc/classes
-NativeOutputDir ../build/gensrc/native/jogl
-
-# There are a few routines we don't handle yet
-Ignore glGetBufferPointervOES
diff --git a/make/gl-common-es2.cfg b/make/gl-common-es2.cfg
deleted file mode 100755
index e4765f00a..000000000
--- a/make/gl-common-es2.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# This .cfg file provides common options used among all GL glue code
-# generated for Jogl on OpenGL ES 2.
-
-HierarchicalNativeOutput false
-Include gl-common.cfg
-JavaOutputDir ../build/gensrc/classes
-NativeOutputDir ../build/gensrc/native/jogl
diff --git a/make/gl-es1.cfg b/make/gl-es1.cfg
index 662c3d51f..3c9e3c08b 100755
--- a/make/gl-es1.cfg
+++ b/make/gl-es1.cfg
@@ -1,4 +1,9 @@
 # This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir ../build/gensrc/classes
+NativeOutputDir ../build/gensrc/native/jogl/es1
+
+# There are a few routines we don't handle yet
+Ignore glGetBufferPointervOES
 Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GLES1
@@ -8,7 +13,8 @@ ImplPackage com.sun.opengl.impl.es1
 ImplJavaClass GLES1Impl
 Implements GLES1Impl GL
 Implements GLES1Impl GL2ES1
-Include gl-common-es1.cfg
+HierarchicalNativeOutput false
+Include gl-common.cfg
 Include gl-ignore-gl2_es-enums.cfg
 Include gl-ignore-gl2_es1-enums.cfg
 
diff --git a/make/gl-es2.cfg b/make/gl-es2.cfg
index e091b085d..29069a869 100755
--- a/make/gl-es2.cfg
+++ b/make/gl-es2.cfg
@@ -1,4 +1,7 @@
 # This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir ../build/gensrc/classes
+NativeOutputDir ../build/gensrc/native/jogl/es2
+
 Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GLES2
@@ -8,7 +11,8 @@ ImplPackage com.sun.opengl.impl.es2
 ImplJavaClass GLES2Impl
 Implements GLES2Impl GL
 Implements GLES2Impl GL2ES2
-Include gl-common-es2.cfg
+HierarchicalNativeOutput false
+Include gl-common.cfg
 Include gl-ignore-gl2_es-enums.cfg
 Include gl-ignore-gl2_es2-enums.cfg
 
diff --git a/make/gl-gl2.cfg b/make/gl-gl2.cfg
index e739e84f8..5292375c1 100644
--- a/make/gl-gl2.cfg
+++ b/make/gl-gl2.cfg
@@ -1,6 +1,6 @@
 # This .cfg file is used to generate the GL interface and implementing class.
 JavaOutputDir ../build/gensrc/classes
-NativeOutputDir ../build/gensrc/native/jogl
+NativeOutputDir ../build/gensrc/native/jogl/gl2
 
 Package javax.media.opengl
 Style InterfaceAndImpl
diff --git a/make/glu-CustomJavaCode-gles1.java b/make/glu-CustomJavaCode-gles1.java
index 6f36be67a..d66909409 100755
--- a/make/glu-CustomJavaCode-gles1.java
+++ b/make/glu-CustomJavaCode-gles1.java
@@ -214,13 +214,6 @@ public final boolean gluProject(double objX, double objY, double objZ, double[]
   return project.gluProject((float)objX, (float)objY, (float)objZ, BufferUtil.getFloatArray(model), model_offset, BufferUtil.getFloatArray(proj), proj_offset, view, view_offset, BufferUtil.getFloatArray(winPos), winPos_offset);
 }
 
-/** Interface to C language function: <br> <code> GLint gluProject(GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  winX, GLdouble *  winY, GLdouble *  winZ); </code>
- * <P> Accepts the outgoing window coordinates as a single buffer.
- */
-public final boolean gluProject(double objX, double objY, double objZ, DoubleBuffer model, DoubleBuffer proj, IntBuffer view, DoubleBuffer winPos) {
-  return project.gluProject((float)objX, (float)objY, (float)objZ, BufferUtil.getFloatBuffer(model), BufferUtil.getFloatBuffer(proj), view, BufferUtil.getFloatBuffer(winPos));
-}
-
 /** Interface to C language function: <br> <code> GLint gluUnProject(GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ); </code>
  * <P> Accepts the outgoing object coordinates (a 3-vector) as a single array.
  */
@@ -228,13 +221,6 @@ public final boolean gluUnProject(double winX, double winY, double winZ, double[
   return project.gluUnProject((float)winX, (float)winY, (float)winZ, BufferUtil.getFloatArray(model), model_offset, BufferUtil.getFloatArray(proj), proj_offset, view, view_offset, BufferUtil.getFloatArray(objPos), objPos_offset);
 }
 
-/** Interface to C language function: <br> <code> GLint gluUnProject(GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ); </code>
- * <P> Accepts the outgoing object coordinates (a 3-vector) as a single buffer.
- */
-public final boolean gluUnProject(double winX, double winY, double winZ, DoubleBuffer model, DoubleBuffer proj, IntBuffer view, DoubleBuffer objPos) {
-  return project.gluUnProject((float)winX, (float)winY, (float)winZ, BufferUtil.getFloatBuffer(model), BufferUtil.getFloatBuffer(proj), view, BufferUtil.getFloatBuffer(objPos));
-}
-
 /** Interface to C language function: <br> <code> GLint gluUnProject4(GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble nearVal, GLdouble farVal, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ, GLdouble *  objW); </code>
  * <P> Accepts the outgoing object coordinates (a 4-vector) as a single array.
  */
@@ -242,13 +228,6 @@ public final boolean gluUnProject4(double winX, double winY, double winZ, double
   return project.gluUnProject4((float)winX, (float)winY, (float)winZ, (float)clipW, BufferUtil.getFloatArray(model), model_offset, BufferUtil.getFloatArray(proj), proj_offset, view, view_offset, (float)nearVal, (float)farVal, BufferUtil.getFloatArray(objPos), objPos_offset);
 }
 
-/** Interface to C language function: <br> <code> GLint gluUnProject4(GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble nearVal, GLdouble farVal, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ, GLdouble *  objW); </code>
- * <P> Accepts the outgoing object coordinates (a 4-vector) as a single buffer.
- */
-public final boolean gluUnProject4(double winX, double winY, double winZ, double clipW, DoubleBuffer model, DoubleBuffer proj, IntBuffer view, double nearVal, double farVal, DoubleBuffer objPos) {
-  return project.gluUnProject4((float)winX, (float)winY, (float)winZ, (float)clipW, BufferUtil.getFloatBuffer(model), BufferUtil.getFloatBuffer(proj), view, (float)nearVal, (float)farVal, BufferUtil.getFloatBuffer(objPos));
-}
-
 public final void gluPickMatrix(double x, double y, double delX, double delY, int[] viewport, int viewport_offset) {
   project.gluPickMatrix(getCurrentGL2ES1(), (float)x, (float)y, (float)delX, (float)delY, viewport, viewport_offset);
 }
diff --git a/make/glu-CustomJavaCode-gles1_if.java b/make/glu-CustomJavaCode-gles1_if.java
index 02e95a324..bb9f3d54d 100755
--- a/make/glu-CustomJavaCode-gles1_if.java
+++ b/make/glu-CustomJavaCode-gles1_if.java
@@ -342,31 +342,16 @@ public abstract void gluLookAt(double eyeX, double eyeY, double eyeZ, double cen
  */
 public abstract boolean gluProject(double objX, double objY, double objZ, double[] model, int model_offset, double[] proj, int proj_offset, int[] view, int view_offset, double[] winPos, int winPos_offset) ;
 
-/** Interface to C language function: <br> <code> GLint gluProject(GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  winX, GLdouble *  winY, GLdouble *  winZ); </code>
- * <P> Accepts the outgoing window coordinates as a single buffer.
- */
-public abstract boolean gluProject(double objX, double objY, double objZ, DoubleBuffer model, DoubleBuffer proj, IntBuffer view, DoubleBuffer winPos) ;
-
 /** Interface to C language function: <br> <code> GLint gluUnProject(GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ); </code>
  * <P> Accepts the outgoing object coordinates (a 3-vector) as a single array.
  */
 public abstract boolean gluUnProject(double winX, double winY, double winZ, double[] model, int model_offset, double[] proj, int proj_offset, int[] view, int view_offset, double[] objPos, int objPos_offset) ;
 
-/** Interface to C language function: <br> <code> GLint gluUnProject(GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ); </code>
- * <P> Accepts the outgoing object coordinates (a 3-vector) as a single buffer.
- */
-public abstract boolean gluUnProject(double winX, double winY, double winZ, DoubleBuffer model, DoubleBuffer proj, IntBuffer view, DoubleBuffer objPos) ;
-
 /** Interface to C language function: <br> <code> GLint gluUnProject4(GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble nearVal, GLdouble farVal, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ, GLdouble *  objW); </code>
  * <P> Accepts the outgoing object coordinates (a 4-vector) as a single array.
  */
 public abstract boolean gluUnProject4(double winX, double winY, double winZ, double clipW, double[] model, int model_offset, double[] proj, int proj_offset, int[] view, int view_offset, double nearVal, double farVal, double[] objPos, int objPos_offset) ;
 
-/** Interface to C language function: <br> <code> GLint gluUnProject4(GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble nearVal, GLdouble farVal, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ, GLdouble *  objW); </code>
- * <P> Accepts the outgoing object coordinates (a 4-vector) as a single buffer.
- */
-public abstract boolean gluUnProject4(double winX, double winY, double winZ, double clipW, DoubleBuffer model, DoubleBuffer proj, IntBuffer view, double nearVal, double farVal, DoubleBuffer objPos) ;
-
 public abstract void gluPickMatrix(double x, double y, double delX, double delY, int[] viewport, int viewport_offset) ;
 
 public abstract void gluPickMatrix(double x, double y, double delX, double delY, IntBuffer viewport) ;
diff --git a/make/glu-common.cfg b/make/glu-common.cfg
index f4f6f2289..ed0c3cce0 100644
--- a/make/glu-common.cfg
+++ b/make/glu-common.cfg
@@ -1,6 +1,4 @@
 # This .cfg file provides common options used among all GLU glue code
-JavaOutputDir ../build/gensrc/classes
-NativeOutputDir ../build/gensrc/native/jogl
 HierarchicalNativeOutput false
 
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
diff --git a/make/glu-es1.cfg b/make/glu-es1.cfg
index 5f86e6ddc..f1beb1ff1 100755
--- a/make/glu-es1.cfg
+++ b/make/glu-es1.cfg
@@ -1,5 +1,8 @@
 # This .cfg file is used to generate the GLU implementation for OpenGL ES 1.0,
 # where it is pure Java.
+JavaOutputDir ../build/gensrc/classes
+NativeOutputDir ../build/gensrc/native/jogl/es1
+
 Style ImplOnly
 ImplPackage javax.media.opengl.glu.es1
 ImplJavaClass GLUes1
diff --git a/make/glu-es1_if.cfg b/make/glu-es1_if.cfg
index 666ab44a5..52029c4a5 100755
--- a/make/glu-es1_if.cfg
+++ b/make/glu-es1_if.cfg
@@ -1,5 +1,8 @@
 # This .cfg file is used to generate the GLU implementation for OpenGL ES 1.0,
 # where it is pure Java.
+JavaOutputDir ../build/gensrc/classes
+NativeOutputDir ../build/gensrc/native/jogl
+
 Style ImplOnly
 ImplPackage javax.media.opengl.glu
 ImplJavaClass GLU
diff --git a/make/glu-gl2.cfg b/make/glu-gl2.cfg
index 9a228422d..d34511a5d 100755
--- a/make/glu-gl2.cfg
+++ b/make/glu-gl2.cfg
@@ -1,5 +1,8 @@
 # This .cfg file provides common options used among gl2 GLU glue code
 # generated for Jogl on all platforms.
+JavaOutputDir ../build/gensrc/classes
+NativeOutputDir ../build/gensrc/native/jogl/gl2
+
 Style ImplOnly
 ImplPackage javax.media.opengl.glu.gl2
 ImplJavaClass GLUgl2
diff --git a/make/jogl.compiler.xml b/make/jogl.compiler.xml
index 21fc26361..10e066748 100644
--- a/make/jogl.compiler.xml
+++ b/make/jogl.compiler.xml
@@ -10,14 +10,6 @@
         <syslibset dir="/devtools/i686-unknown-linux-gnu/xfree86-4.3.0-linux-ix86-glibc23/lib" libs="GL"/>
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
-
-      <linker id="linker.cfg.linux.jogl.es1" extends="linker.cfg.linux.jogl.x11">
-        <syslibset dir="/devtools/i686-unknown-linux-gnu/lib" libs="GLES_CM"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.jogl.es2" extends="linker.cfg.linux.jogl.x11">
-        <syslibset dir="/devtools/i686-unknown-linux-gnu/lib" libs="GLESv2"/>
-      </linker>
 </target>
 </project>
 
diff --git a/make/make.jogl.cdc.es1x.sh b/make/make.jogl.cdc.es1x.sh
deleted file mode 100644
index 7bd75ebf8..000000000
--- a/make/make.jogl.cdc.es1x.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. ../../setenv-build-jogl.sh
-
-ant -v -Djogl.cdcfp=1 -Djogl.es1=1 $* 2>&1 | tee make.jogl.cdc.es1x.log
diff --git a/make/make.jogl.es1x.sh b/make/make.jogl.es1x.sh
deleted file mode 100644
index 4661bf75b..000000000
--- a/make/make.jogl.es1x.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. ../../setenv-build-jogl.sh
-
-ant -v -Djogl.es1=1 $* 2>&1 | tee make.jogl.es1x.log
diff --git a/make/make.jogl.gl2.sh b/make/make.jogl.gl2.sh
deleted file mode 100644
index c8d69485e..000000000
--- a/make/make.jogl.gl2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. ../../setenv-build-jogl.sh
-
-ant 2>&1 | tee make.jogl.gl2.x86_32.log