native compilation clean: X11

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

4 files changed, 45 insertions, 41 deletions

diff --git a/make/build.xml b/make/build.xml
index 08717369f..1d38c59ef 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1200,6 +1200,29 @@
         <syslibset dir="/opt/graphics/OpenGL/lib" libs="GL, GLU"/>
         <syslibset dir="/usr/lib" libs="X11"/>
       </linker>
+    </target>
+
+    <target name="c.build" depends="c.configure">
+      <fail message="Requires '${c.compiler.src.files}'" unless="c.compiler.src.files"/>
+      <fail message="Requires '${compiler.cfg.id}'"      unless="compiler.cfg.id"/>
+      <fail message="Requires '${linker.cfg.id}'"        unless="linker.cfg.id"/>
+      <fail message="Requires '${output.lib.name}'"      unless="output.lib.name"/>
+
+      <echo message="Output lib name = ${output.lib.name}" />
+
+      <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
+      <property name="c.compiler.debug"     value="false" /> 
+      <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
+      <property name="c.compiler.optimise"  value="none" /> 
+
+      <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
+
+      <condition property="c.compiler.needs-libjvm">
+        <and>
+          <isset property="isHPUX"/>
+          <isset property="c.compiler.use-jawt"/>
+        </and>
+      </condition>
 
       <patternset id="c.src.files.jogl">
         <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/>
@@ -1229,30 +1252,6 @@
         <include name="${rootrel.generated.c.cg}/*.c"/>
       </patternset>
 
-    </target>
-
-    <target name="c.build" depends="c.configure">
-      <fail message="Requires '${c.compiler.src.files}'" unless="c.compiler.src.files"/>
-      <fail message="Requires '${compiler.cfg.id}'"      unless="compiler.cfg.id"/>
-      <fail message="Requires '${linker.cfg.id}'"        unless="linker.cfg.id"/>
-      <fail message="Requires '${output.lib.name}'"      unless="output.lib.name"/>
-
-      <echo message="Output lib name = ${output.lib.name}" />
-
-      <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
-      <property name="c.compiler.debug"     value="false" /> 
-      <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } --> 
-      <property name="c.compiler.optimise"  value="none" /> 
-
-      <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
-
-      <condition property="c.compiler.needs-libjvm">
-        <and>
-          <isset property="isHPUX"/>
-          <isset property="c.compiler.use-jawt"/>
-        </and>
-      </condition>
-
       <cc outtype="shared" 
           objdir="${obj.jogl}" 
           outfile="${obj}/${output.lib.name}"
@@ -1276,11 +1275,14 @@
           <sysincludepath path="${java.includes.dir}"/>
           <sysincludepath path="${java.includes.dir.platform}"/>
           <includepath path="stub_includes/opengl"/>
-          <includepath path="stub_includes/egl" if="jogl.es"/>
+          <includepath path="stub_includes/egl"/>
           <includepath path="stub_includes/cg" if="c.compiler.use-cglib"/>        
 
           <!-- This is for the generated headers for handwritten C code -->
           <includepath path="${src.generated.c}" />
+          <includepath path="${src.generated.c}/X11" if="isX11"/>
+          <includepath path="${src.generated.c}/OSX" if="isOSX"/>
+          <includepath path="${src.generated.c}/Windows" if="isWindows"/>
 
           <!-- This must come last to not override real include paths -->
           <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
diff --git a/make/gl-es1.cfg b/make/gl-es1.cfg
index 4dcad5bed..d81b8d0cc 100755
--- a/make/gl-es1.cfg
+++ b/make/gl-es1.cfg
@@ -184,7 +184,7 @@ CustomCCode    "glext.h" are parsed. */
 CustomCCode #define GL_GLEXT_PROTOTYPES
 
 CustomCCode /* Include the OpenGL headers */
-CustomCCode #define GL_APICALL __declspec(dllimport)
+CustomCCode /* #define GL_APICALL __declspec(dllimport) */
 CustomCCode #include <GLES/gl.h>
 CustomCCode #include <GLES/glext.h>
 CustomCCode #include <stdlib.h>
diff --git a/make/gl-es2.cfg b/make/gl-es2.cfg
index f190bebbe..1371dde64 100755
--- a/make/gl-es2.cfg
+++ b/make/gl-es2.cfg
@@ -181,11 +181,11 @@ CustomCCode    "glext.h" are parsed. */
 CustomCCode #define GL_GLEXT_PROTOTYPES
 
 CustomCCode /* Include the OpenGL headers */
-CustomCCode #define GL_APICALL __declspec(dllimport)
+CustomCCode /* #define GL_APICALL __declspec(dllimport) */
 CustomCCode #include <GLES2/gl2ext.h>
 CustomCCode #include <stdlib.h>
-CustomCCode /* Include missing function pointer typedef */
-CustomCCode typedef void  (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
+# CustomCCode /* Include missing function pointer typedef */
+# CustomCCode typedef void  (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
 
 CustomCCode typedef int intptr_t;
 
diff --git a/make/intptr.cfg b/make/intptr.cfg
index 04c9605ec..42f910004 100755
--- a/make/intptr.cfg
+++ b/make/intptr.cfg
@@ -1,15 +1,17 @@
 CustomCCode #ifdef WIN32
-CustomCCode #ifdef _MSC_VER
-CustomCCode /* This typedef is apparently needed for Microsoft compilers before VC8,
-CustomCCode    and on Windows CE */
-CustomCCode #if (_MSC_VER < 1400) || defined(UNDER_CE)
-CustomCCode #ifdef _WIN64
-CustomCCode typedef long long intptr_t;
+CustomCCode  #ifdef _MSC_VER
+CustomCCode  /* This typedef is apparently needed for Microsoft compilers before VC8,
+CustomCCode     and on Windows CE */
+CustomCCode   #if (_MSC_VER < 1400) || defined(UNDER_CE)
+CustomCCode    #ifdef _WIN64
+CustomCCode     typedef long long intptr_t;
+CustomCCode    #else
+CustomCCode     typedef int intptr_t;
+CustomCCode    #endif
+CustomCCode   #endif
+CustomCCode  #else
+CustomCCode   #include <inttypes.h>
+CustomCCode  #endif
 CustomCCode #else
-CustomCCode typedef int intptr_t;
-CustomCCode #endif
-CustomCCode #endif
-CustomCCode #else
-CustomCCode #include <inttypes.h>
-CustomCCode #endif
+CustomCCode  #include <inttypes.h>
 CustomCCode #endif