Merge branch 'master' of github.com:sgothel/jogl

1 files changed, 61 insertions, 100 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 0dd04ccb8..74b9da089 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -38,11 +38,6 @@
    - Optional properties:
    -   -Djogl.cg=1 when combined with the build or javadoc targets will cause
    -               the experimental binding to NVidia's Cg language to be built.
-   -               Then you need to define the location of your CG libraries:
-   -               -Dwindows.cg.lib32=<PATH> for Windows x32 and
-   -               -Dwindows.cg.lib64=<PATH> for Windows x64 and
-   -               -Dx11.cg.lib32=<PATH> for X11/Unix x32
-   -               -Dx11.cg.lib64=<PATH> for X11/Unix x64
    -
    - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
    - ANT build, including the GlueGen and StaticGLInfo tasks, the building of
@@ -299,7 +294,6 @@
 
     <target name="setup.javacdc">
         <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/TextureIO.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
@@ -307,7 +301,6 @@
 
     <target name="setup.javase">
         <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/TextureIO.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
         <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
@@ -622,7 +615,7 @@
         <echo message="Generating EGL implementation class" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.es.system}/** ${stub.includes}/common/**" />
-        <gluegen src="${stub.includes}/${window.es.system}/window-system.c"
+        <gluegen src="${stub.includes}/${window.es.system}/window-system1.c"
                  outputRootDir="${build.jogl}"
                  config="${window.es.cfg}"
                  includeRefid="stub.includes.fileset.platform"
@@ -644,12 +637,24 @@
         </gluegen>
     </target>
 
-    <target name="java.generate.window.system.os" if="window.os.cfg">
+    <target name="java.generate.window.system.os0" if="window.os0.cfg">
         <echo message="Generating window system glue impl: ${window.os.system}" />
         <antcall target="java.generate.copy2temp" inheritRefs="true" />
-        <gluegen src="${stub.includes}/${window.os.system}/window-system.c"
+        <gluegen src="${stub.includes}/${window.os.system}/window-system0.c"
                  outputRootDir="${build.jogl}"
-                 config="${window.os.cfg}"
+                 config="${window.os0.cfg}"
+                 includeRefid="stub.includes.fileset.platform"
+                 emitter="com.sun.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen.classpath" />
+        </gluegen>
+    </target>
+
+    <target name="java.generate.window.system.os1" if="window.os1.cfg">
+        <echo message="Generating window system glue impl: ${window.os.system}" />
+        <antcall target="java.generate.copy2temp" inheritRefs="true" />
+        <gluegen src="${stub.includes}/${window.os.system}/window-system1.c"
+                 outputRootDir="${build.jogl}"
+                 config="${window.os1.cfg}"
                  includeRefid="stub.includes.fileset.platform"
                  emitter="com.sun.gluegen.opengl.GLEmitter">
             <classpath refid="gluegen.classpath" />
@@ -659,7 +664,8 @@
     <target name="java.generate.gl.platforms" >
         <dirset id="stub.includes.fileset.platform" dir="." includes="${stub.includes}/${window.os.system}/** ${stub.includes}/${window.es.system}/** ${stub.includes}/common/** ${stub.includes}/opengl/**" />
 
-        <antcall target="java.generate.window.system.os" inheritRefs="true" />
+        <antcall target="java.generate.window.system.os0" inheritRefs="true" />
+        <antcall target="java.generate.window.system.os1" inheritRefs="true" />
         <antcall target="java.generate.platform.glext" inheritRefs="true" />
     </target>
 
@@ -688,21 +694,22 @@
 
         <antcall target="java.generate.gl.platforms" inheritRefs="true">
             <param name="window.os.system"                       value="x11"/>
-            <param name="window.os.cfg"                          value="${config.jogl}/glx-x11.cfg" />
+            <param name="window.os1.cfg"                         value="${config.jogl}/glx-x11.cfg" />
             <param name="glext.platform.cfg"                     value="${config.jogl}/glxext.cfg" />
             <param name="glext.platform.header"                  value="${stub.includes}/x11/glxext.c" />
         </antcall>
 
         <antcall target="java.generate.gl.platforms" inheritRefs="true">
             <param name="window.os.system"                       value="win32"/>
-            <param name="window.os.cfg"                          value="${config.jogl}/wgl-win32.cfg" />
+            <param name="window.os0.cfg"                         value="${config.jogl}/gdi-win32.cfg" />
+            <param name="window.os1.cfg"                         value="${config.jogl}/wgl-win32.cfg" />
             <param name="glext.platform.cfg"                     value="${config.jogl}/wglext.cfg" />
             <param name="glext.platform.header"                  value="${stub.includes}/win32/wglext.c" />
         </antcall>          
 
         <antcall target="java.generate.gl.platforms" inheritRefs="true">
           <param name="window.os.system"                     value="macosx"/>
-          <param name="window.os.cfg"                        value="${config.jogl}/cgl-macosx.cfg" />
+          <param name="window.os1.cfg"                       value="${config.jogl}/cgl-macosx.cfg" />
           <param name="glext.platform.cfg"                   value="${config.jogl}/cglext.cfg" />
           <param name="glext.platform.header"                value="${stub.includes}/macosx/cglext.c" />
         </antcall>
@@ -754,7 +761,7 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/cg-common.cfg"
                  includeRefid="stub.includes.cg.fileset.all"
-                 emitter="com.sun.gluegen.JavaEmitter">
+                 emitter="com.sun.gluegen.procaddress.ProcAddressEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
     </target>
@@ -1103,14 +1110,9 @@
 
       <!-- linker configuration -->
  
-      <linker id="linker.cfg.linux.jogl.gl2" extends="linker.cfg.linux">
+      <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
         <syslibset libs="X11"/>
         <syslibset libs="Xxf86vm" />
-        <syslibset libs="GL"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.jogl.cg" extends="linker.cfg.linux.jogl.gl2">
-        <syslibset dir="${x11.cg.lib32}" libs="Cg, CgGL"/>
       </linker>
 
       <linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64">
@@ -1118,77 +1120,47 @@
         <syslibset libs="Xxf86vm" />
       </linker>
 
-      <linker id="linker.cfg.linux.amd64.jogl.gl2" extends="linker.cfg.linux.amd64.jogl.x11">
-        <syslibset libs="GL"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.amd64.jogl.cg" extends="linker.cfg.linux.amd64.jogl.gl2">
-        <syslibset dir="${x11.cg.lib64}" libs="Cg, CgGL"/>
-      </linker>
-
       <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris">
         <syslibset libs="X11"/>
       </linker>
 
-      <linker id="linker.cfg.solaris.jogl.gl2" extends="linker.cfg.solaris.jogl.x11">
-        <syslibset libs="GL"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.jogl.cg" extends="linker.cfg.solaris.jogl.gl2">
-        <syslibset dir="${x11.cg.lib32}" libs="Cg, CgGL"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.sparcv9.jogl.gl2" extends="linker.cfg.solaris.sparcv9">
+      <linker id="linker.cfg.solaris.sparcv9.jogl.x11" extends="linker.cfg.solaris.sparcv9">
         <linkerarg value="-xarch=v9a" />
-        <syslibset dir="/usr/openwin/lib/sparcv9" libs="GL"/>
         <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
       </linker>
 
-      <linker id="linker.cfg.solaris.amd64.jogl.gl2" extends="linker.cfg.solaris.amd64">
+      <linker id="linker.cfg.solaris.amd64.jogl.x11" extends="linker.cfg.solaris.amd64">
         <linkerarg value="-xarch=amd64" />
-        <syslibset dir="/usr/lib/amd64" libs="GL"/>
         <syslibset dir="/usr/lib/amd64" libs="X11"/>
       </linker>
 
       <linker id="linker.cfg.win32.mingw.jogl" extends="linker.cfg.win32.mingw">
         <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="opengl32, glu32, gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.mingw.jogl.cg" extends="linker.cfg.win32.mingw.jogl">
-        <syslibset dir="${windows.cg.lib32}" libs="cg, cgGL"/>
+        <syslibset libs="gdi32, kernel32"/>
       </linker>
 
       <linker id="linker.cfg.win64.mingw.jogl" extends="linker.cfg.win64.mingw">
         <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="opengl32, glu32, gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win64.mingw.jogl.cg" extends="linker.cfg.win64.mingw.jogl">
-        <syslibset dir="${windows.cg.lib64}" libs="cg, cgGL"/>
+        <syslibset libs="gdi32, kernel32"/>
       </linker>
 
       <linker id="linker.cfg.win32.msvc.jogl" extends="linker.cfg.win32.msvc">
-        <syslibset libs="opengl32, gdi32, user32, kernel32" />
+        <syslibset libs="user32, kernel32" />
     <!-- This is temporary -->
         <syslibset libs="winmm" />
       </linker>
 
-      <linker id="linker.cfg.win32.msvc.jogl.cg" extends="linker.cfg.win32.msvc.jogl">
-        <syslibset dir="${windows.cg.lib32}" libs="cg, cgGL"/>
-      </linker>
-
       <linker id="linker.cfg.macosx.jogl" extends="linker.cfg.macosx">
         <linkerarg value="-framework" />
         <linkerarg value="Cocoa" />
-        <linkerarg value="-framework" />
-        <linkerarg value="OpenGL" />
+        <!--linkerarg value="-framework" />
+        <linkerarg value="OpenGL" /-->
       </linker>
 
-      <linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl">
+      <!--linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl">
         <linkerarg value="-framework"/>
         <linkerarg value="Cg"/>
-      </linker>
+      </linker-->
 
       <linker id="linker.cfg.hpux.jogl" extends="linker.cfg.hpux">
         <syslibset dir="/opt/graphics/OpenGL/lib" libs="GL, GLU"/>
@@ -1198,83 +1170,72 @@
 
     <target name="c.configure.win32.vc" if="isVCFamily">
       <echo message="Win32.VC" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.win32.msvc.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.win32.msvc.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.msvc" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.msvc.jogl" />
     </target>
     
     <target name="c.configure.win32.mingw" if="isMingW32">
       <echo message="Win32.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.win32.mingw.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.win32.mingw.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.mingw" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.mingw.jogl" />
     </target>
 
     <target name="c.configure.win64.mingw" if="isMingW64">
       <echo message="Win64.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.win64.mingw.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.win64.mingw.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.win64.mingw" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.win64.mingw.jogl" />
     </target>
 
     <target name="c.configure.linux.x86" if="isLinuxX86">
       <echo message="Linux.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
     
     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.amd64.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.amd64.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.amd64" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
     </target>
     
     <target name="c.configure.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
 
     <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
 
     <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
       <echo message="Solaris" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.solaris.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.solaris.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.jogl.x11" />
     </target>
   
  
     <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
       <echo message="SolarisSparcv9" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.solaris.sparcv9.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.solaris.sparcv9.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.sparcv9" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.sparcv9.jogl.x11" />
     </target>
    
 
     <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
       <echo message="SolarisAMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.solaris.amd64.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.solaris.amd64.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.amd64" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.amd64.jogl.x11" />
     </target>
    
     <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
       <echo message="FreeBSD" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.jogl" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
 
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
       <echo message="HP-UX" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.hpux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.hpux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.hpux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.hpux.jogl.x11" />
     </target>
 
     <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
@@ -1282,9 +1243,8 @@
     <target name="c.configure.x11" if="isX11" />
 
     <target name="c.configure.macosx" if="isOSX">
-      <property name="compiler.cfg.id"                      value="compiler.cfg.macosx" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.macosx.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.macosx.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.macosx" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.macosx.jogl" />
     </target>
     
     <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
@@ -1331,6 +1291,7 @@
           <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}/MacOSX/CGL*.c" if="isOSX"/>
+          <include name="${rootrel.generated.c.jogl}/Windows/GDI*.c" if="isWindows"/>
           <include name="${rootrel.generated.c.jogl}/Windows/WGL*.c" if="isWindows"/>
         </patternset>
 
@@ -1453,14 +1414,14 @@
       <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}"/>
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
 
     <target name="c.build.jogl.gl2es12" unless="setup.nodesktop">
       <c.build c.compiler.src.files="c.src.files.jogl.gl2es12"
                output.lib.name="jogl_gl2es12"
                compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.gl2}"/>
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
 
     <target name="c.build.jogl.es2">
@@ -1481,7 +1442,7 @@
       <c.build c.compiler.src.files="c.src.files.cg"
                output.lib.name="jogl_cg"
                compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.cg}"/>
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
     
     <target name="c.manifest.cg" if="jogl.cg">