From 7c1f2cde56438a979ddaab5fecc09f663427be91 Mon Sep 17 00:00:00 2001
From: Kenneth Russel <kbrussel@alum.mit.edu>
Date: Wed, 27 Jul 2005 00:30:06 +0000
Subject: Refactored platform extensions out of the GL interface and
 implementation and into their own objects according to the JSR-231 expert
 group's resolutions. Moved the interfaces declaring these extensions into the
 platform-specific implementation directories and added a loosely-specified
 GL.getPlatformGLExtensions(). This will shrink the size of the
 platform-independent jar file considerably as the implementing class for the
 public GL interface is now no longer replicated for each platform. The build
 process is also simplified a fair bit; more simplifications are possible.

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@337 232f8b59-042b-4e1e-8c03-345bb8c30851
---
 make/build.xml | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index a375ca764..80ec49887 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -251,11 +251,15 @@
         <!-- Set platform configuration files. -->
         <property name="gl.cfg"                                 value="${config}/gl-win32.cfg" />
         <property name="gl.impl.cfg"                            value="${config}/gl-impl-win32.cfg" />
+        <property name="glext.platform.cfg"                     value="${config}/wglext.cfg" />
         <property name="glu.cfg"                                value="${config}/glu.cfg" />
         <property name="glu.impl.cfg"                           value="${config}/glu-impl-win32.cfg" />
         <property name="jawt.cfg"                               value="${config}/jawt-win32.cfg" />
         <property name="window.cfg"                             value="${config}/wingdi-win32.cfg" />
 
+        <!-- Set platform headers. -->
+        <property name="glext.platform.header"                  value="${stub.includes.dir}/win32/wglext.c" />
+
         <!-- Set platform directories. -->
         <property name="stub.includes.platform"                 value="${stub.includes}/win32" />
         <property name="java.includes.dir.platform"             value="${java.includes.dir.win32}" />
@@ -292,11 +296,15 @@
         <!-- Set platform configuration files. -->
         <property name="gl.cfg"                               value="${config}/gl-x11.cfg" />
         <property name="gl.impl.cfg"                          value="${config}/gl-impl-x11.cfg" />
+        <property name="glext.platform.cfg"                   value="${config}/glxext.cfg" />
         <property name="glu.cfg"                              value="${config}/glu.cfg" />
         <property name="glu.impl.cfg"                         value="${config}/glu-impl-x11.cfg" />
         <property name="jawt.cfg"                             value="${config}/jawt-x11.cfg" />
         <property name="window.cfg"                           value="${config}/glx-x11.cfg" />
 
+        <!-- Set platform headers. -->
+        <property name="glext.platform.header"                value="${stub.includes.dir}/x11/glxext.c" />
+
         <!-- Set platform directories. -->
         <property name="stub.includes.platform"               value="${stub.includes.x11}" />
         <property name="java.excludes.platform"               value="${java.excludes.x11}" />
@@ -353,11 +361,15 @@
         <!-- Set platform configuration files. -->
         <property name="gl.cfg"                               value="${config}/gl-macosx.cfg" />
         <property name="gl.impl.cfg"                          value="${config}/gl-impl-macosx.cfg" />
+        <property name="glext.platform.cfg"                   value="${config}/cglext.cfg" />
         <property name="glu.cfg"                              value="${config}/glu.cfg" />
         <property name="glu.impl.cfg"                         value="${config}/glu-impl-macosx.cfg" />
         <property name="jawt.cfg"                             value="${config}/jawt-macosx.cfg" />
         <property name="window.cfg"                           value="${config}/cgl-macosx.cfg" />
 
+        <!-- Set platform headers. -->
+        <property name="glext.platform.header"                value="${stub.includes.dir}/macosx/cglext.c" />
+
         <!-- Set platform directories. -->
         <property name="stub.includes.platform"               value="${stub.includes}/macosx" />
         <property name="java.includes.dir.platform"           value="${java.includes.dir.macosx}" />
@@ -473,35 +485,17 @@
 
         <!-- Generate GL implementation class -->
         <echo message="Generating GL implementation class" />
-        <gluegen src="${stub.includes.common}/gl-impl.c" 
+        <gluegen src="${stub.includes.common}/gl.c" 
                  config="${gl.impl.cfg}"
                  includeRefid="stub.includes.fileset.all"
                  emitter="net.java.games.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
         </gluegen>
 
-        <!-- Generate WGL interface class -->
-        <echo message="Generating WGL interface class" />
-        <gluegen src="${stub.includes.common}/gl-impl.c" 
-                 config="${config}/gl-wgl-win32.cfg"
-                 includeRefid="stub.includes.fileset.all"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
-            <classpath refid="gen.classpath" />
-        </gluegen>
-
-        <!-- Generate GLX interface class -->
-        <echo message="Generating GLX interface class" />
-        <gluegen src="${stub.includes.common}/gl-impl.c" 
-                 config="${config}/gl-glx-x11.cfg"
-                 includeRefid="stub.includes.fileset.all"
-                 emitter="net.java.games.gluegen.opengl.GLEmitter">
-            <classpath refid="gen.classpath" />
-        </gluegen>
-
-        <!-- Generate CGL interface class -->
-        <echo message="Generating CGL interface class" />
-        <gluegen src="${stub.includes.common}/gl-impl.c" 
-                 config="${config}/gl-cgl-macosx.cfg"
+	<!-- Generate platform-specific extension class (WGLExt, GLXExt, etc.) -->
+        <echo message="Generating platform-specific OpenGL extension class" />
+        <gluegen src="${glext.platform.header}" 
+                 config="${glext.platform.cfg}"
                  includeRefid="stub.includes.fileset.all"
                  emitter="net.java.games.gluegen.opengl.GLEmitter">
             <classpath refid="gen.classpath" />
-- 
cgit v1.2.3