Simple JOGL2 port: Populate 'lib/jogamp/' w/ builds 'gluegen_598-joal_364-jogl_825', use common 'lib/jogamp' folder in build/run

33 files changed, 11 insertions, 11 deletions

diff --git a/Jake2.bat b/Jake2.bat
index 62cc38a..538103d 100644
--- a/Jake2.bat
+++ b/Jake2.bat
@@ -1,5 +1,5 @@
 @echo off
 
 REM for jogl and joal
-SET CP=lib/jogl/gluegen-rt.jar;lib/joal/joal.jar;lib/jogl/jogl-all.jar;dist/lib/jake2.jar
+SET CP=lib/jogamp/gluegen-rt.jar;lib/jogamp/joal.jar;lib/jogamp/jogl-all.jar;dist/lib/jake2.jar
 java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=%LIB% -cp %CP% jake2.Jake2
diff --git a/Jake2.sh b/Jake2.sh
index 2562893..be7058a 100644
--- a/Jake2.sh
+++ b/Jake2.sh
@@ -3,6 +3,6 @@
 cd `dirname $0`
 
 # for jogl and joal
-CP=lib/jogl/gluegen-rt.jar:lib/joal/joal.jar:lib/jogl/jogl-all.jar:dist/lib/jake2.jar
+CP=lib/jogamp/gluegen-rt.jar:lib/jogamp/joal.jar:lib/jogamp/jogl-all.jar:dist/lib/jake2.jar
 
 exec java -Xmx100M -cp $CP jake2.Jake2 $*
diff --git a/build.xml b/build.xml
index 3f7c34b..e164832 100644
--- a/build.xml
+++ b/build.xml
@@ -20,9 +20,9 @@
 
     <!-- different classpaths -->
     <path id="build.class.path">
-        <pathelement location="lib/jogl/gluegen-rt.jar"/>
-        <pathelement location="lib/jogl/jogl-all.jar"/>
-        <pathelement location="lib/joal/joal.jar"/>
+        <pathelement location="lib/jogamp/gluegen-rt.jar"/>
+        <pathelement location="lib/jogamp/jogl-all.jar"/>
+        <pathelement location="lib/jogamp/joal.jar"/>
         <pathelement location="lib/lwjgl/lwjgl.jar"/>
         <pathelement location="lib/lwjgl/lwjgl_util.jar"/>
         <pathelement location="${java.home}/lib/plugin.jar"/>
@@ -130,9 +130,9 @@
         <!-- proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar"
             defaultpackage="" overloadaggressively="off" printmapping="jake2.map">
             <injar name="jake2.jar"/>
-            <libraryjar name="lib/jogl/jogl-all.jar"/>
-            <libraryjar name="lib/joal/joal.jar"/>
-            <libraryjar name="lib/joal/gluegen-rt.jar"/>
+            <libraryjar name="lib/jogamp/jogl-all.jar"/>
+            <libraryjar name="lib/jogamp/joal.jar"/>
+            <libraryjar name="lib/jogamp/gluegen-rt.jar"/>
             <libraryjar name="${classes}"/>
             <libraryjar name="${plugin}"/>
             <keep access="public" name="jake2.Jake2">
@@ -235,9 +235,9 @@
         <copy todir="webstart/lib">
             <fileset dir="${dist}/lib">
                 <include name="**/*.jar"/>
-                <exclude name="joal.jar"/>
-                <exclude name="gluegen-rt.jar"/>
-                <exclude name="jogl-all.jar"/>
+                <exclude name="joal*.jar"/>
+                <exclude name="gluegen-rt*.jar"/>
+                <exclude name="jogl-all*.jar"/>
             </fileset>
         </copy>
 
diff --git a/lib/jogamp/gluegen-rt-natives-linux-amd64.jar b/lib/jogamp/gluegen-rt-natives-linux-amd64.jar
new file mode 100644
index 0000000..0b8905c
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-linux-amd64.jar
diff --git a/lib/jogamp/gluegen-rt-natives-linux-armv6.jar b/lib/jogamp/gluegen-rt-natives-linux-armv6.jar
new file mode 100644
index 0000000..1f7e460
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-linux-armv6.jar
diff --git a/lib/jogamp/gluegen-rt-natives-linux-armv6hf.jar b/lib/jogamp/gluegen-rt-natives-linux-armv6hf.jar
new file mode 100644
index 0000000..b127d97
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-linux-armv6hf.jar
diff --git a/lib/jogamp/gluegen-rt-natives-linux-i586.jar b/lib/jogamp/gluegen-rt-natives-linux-i586.jar
new file mode 100644
index 0000000..a4b981f
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-linux-i586.jar
diff --git a/lib/jogamp/gluegen-rt-natives-macosx-universal.jar b/lib/jogamp/gluegen-rt-natives-macosx-universal.jar
new file mode 100644
index 0000000..265999a
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-macosx-universal.jar
diff --git a/lib/jogamp/gluegen-rt-natives-solaris-amd64.jar b/lib/jogamp/gluegen-rt-natives-solaris-amd64.jar
new file mode 100644
index 0000000..6d2f605
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-solaris-amd64.jar
diff --git a/lib/jogamp/gluegen-rt-natives-solaris-i586.jar b/lib/jogamp/gluegen-rt-natives-solaris-i586.jar
new file mode 100644
index 0000000..9c1448c
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-solaris-i586.jar
diff --git a/lib/jogamp/gluegen-rt-natives-windows-amd64.jar b/lib/jogamp/gluegen-rt-natives-windows-amd64.jar
new file mode 100644
index 0000000..b48dc9f
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-windows-amd64.jar
diff --git a/lib/jogamp/gluegen-rt-natives-windows-i586.jar b/lib/jogamp/gluegen-rt-natives-windows-i586.jar
new file mode 100644
index 0000000..4726611
--- /dev/null
+++ b/lib/jogamp/gluegen-rt-natives-windows-i586.jar
diff --git a/lib/jogamp/gluegen-rt.jar b/lib/jogamp/gluegen-rt.jar
new file mode 100644
index 0000000..8d1054a
--- /dev/null
+++ b/lib/jogamp/gluegen-rt.jar
diff --git a/lib/jogamp/joal-natives-linux-amd64.jar b/lib/jogamp/joal-natives-linux-amd64.jar
new file mode 100644
index 0000000..73bf67f
--- /dev/null
+++ b/lib/jogamp/joal-natives-linux-amd64.jar
diff --git a/lib/jogamp/joal-natives-linux-armv6.jar b/lib/jogamp/joal-natives-linux-armv6.jar
new file mode 100644
index 0000000..b86711d
--- /dev/null
+++ b/lib/jogamp/joal-natives-linux-armv6.jar
diff --git a/lib/jogamp/joal-natives-linux-armv6hf.jar b/lib/jogamp/joal-natives-linux-armv6hf.jar
new file mode 100644
index 0000000..e21c030
--- /dev/null
+++ b/lib/jogamp/joal-natives-linux-armv6hf.jar
diff --git a/lib/jogamp/joal-natives-linux-i586.jar b/lib/jogamp/joal-natives-linux-i586.jar
new file mode 100644
index 0000000..da67339
--- /dev/null
+++ b/lib/jogamp/joal-natives-linux-i586.jar
diff --git a/lib/jogamp/joal-natives-macosx-universal.jar b/lib/jogamp/joal-natives-macosx-universal.jar
new file mode 100644
index 0000000..2f9e09a
--- /dev/null
+++ b/lib/jogamp/joal-natives-macosx-universal.jar
diff --git a/lib/jogamp/joal-natives-solaris-amd64.jar b/lib/jogamp/joal-natives-solaris-amd64.jar
new file mode 100644
index 0000000..9f12108
--- /dev/null
+++ b/lib/jogamp/joal-natives-solaris-amd64.jar
diff --git a/lib/jogamp/joal-natives-solaris-i586.jar b/lib/jogamp/joal-natives-solaris-i586.jar
new file mode 100644
index 0000000..414d6e4
--- /dev/null
+++ b/lib/jogamp/joal-natives-solaris-i586.jar
diff --git a/lib/jogamp/joal-natives-windows-amd64.jar b/lib/jogamp/joal-natives-windows-amd64.jar
new file mode 100644
index 0000000..c5a5d3c
--- /dev/null
+++ b/lib/jogamp/joal-natives-windows-amd64.jar
diff --git a/lib/jogamp/joal-natives-windows-i586.jar b/lib/jogamp/joal-natives-windows-i586.jar
new file mode 100644
index 0000000..8731427
--- /dev/null
+++ b/lib/jogamp/joal-natives-windows-i586.jar
diff --git a/lib/jogamp/joal.jar b/lib/jogamp/joal.jar
new file mode 100644
index 0000000..fc2765a
--- /dev/null
+++ b/lib/jogamp/joal.jar
diff --git a/lib/jogamp/jogl-all-natives-linux-amd64.jar b/lib/jogamp/jogl-all-natives-linux-amd64.jar
new file mode 100644
index 0000000..be51fa9
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-linux-amd64.jar
diff --git a/lib/jogamp/jogl-all-natives-linux-armv6.jar b/lib/jogamp/jogl-all-natives-linux-armv6.jar
new file mode 100644
index 0000000..e332cd5
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-linux-armv6.jar
diff --git a/lib/jogamp/jogl-all-natives-linux-armv6hf.jar b/lib/jogamp/jogl-all-natives-linux-armv6hf.jar
new file mode 100644
index 0000000..2056156
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-linux-armv6hf.jar
diff --git a/lib/jogamp/jogl-all-natives-linux-i586.jar b/lib/jogamp/jogl-all-natives-linux-i586.jar
new file mode 100644
index 0000000..061fa47
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-linux-i586.jar
diff --git a/lib/jogamp/jogl-all-natives-macosx-universal.jar b/lib/jogamp/jogl-all-natives-macosx-universal.jar
new file mode 100644
index 0000000..481ad33
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-macosx-universal.jar
diff --git a/lib/jogamp/jogl-all-natives-solaris-amd64.jar b/lib/jogamp/jogl-all-natives-solaris-amd64.jar
new file mode 100644
index 0000000..d073bf8
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-solaris-amd64.jar
diff --git a/lib/jogamp/jogl-all-natives-solaris-i586.jar b/lib/jogamp/jogl-all-natives-solaris-i586.jar
new file mode 100644
index 0000000..8c90202
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-solaris-i586.jar
diff --git a/lib/jogamp/jogl-all-natives-windows-amd64.jar b/lib/jogamp/jogl-all-natives-windows-amd64.jar
new file mode 100644
index 0000000..9bc6bf2
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-windows-amd64.jar
diff --git a/lib/jogamp/jogl-all-natives-windows-i586.jar b/lib/jogamp/jogl-all-natives-windows-i586.jar
new file mode 100644
index 0000000..003382e
--- /dev/null
+++ b/lib/jogamp/jogl-all-natives-windows-i586.jar
diff --git a/lib/jogamp/jogl-all.jar b/lib/jogamp/jogl-all.jar
new file mode 100644
index 0000000..4e50e1d
--- /dev/null
+++ b/lib/jogamp/jogl-all.jar