From 0d12d1a9f466e2c8c07d63587b9760bdb1aa1adf Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 7 Oct 2012 12:54:16 +0200
Subject: Simple JOGL2 port: Populate 'lib/jogamp/' w/ builds
 'gluegen_598-joal_364-jogl_825', use common 'lib/jogamp' folder in build/run

---
 Jake2.bat                                          |   2 +-
 Jake2.sh                                           |   2 +-
 build.xml                                          |  18 +++++++++---------
 lib/jogamp/gluegen-rt-natives-linux-amd64.jar      | Bin 0 -> 3542 bytes
 lib/jogamp/gluegen-rt-natives-linux-armv6.jar      | Bin 0 -> 2612 bytes
 lib/jogamp/gluegen-rt-natives-linux-armv6hf.jar    | Bin 0 -> 2625 bytes
 lib/jogamp/gluegen-rt-natives-linux-i586.jar       | Bin 0 -> 3465 bytes
 lib/jogamp/gluegen-rt-natives-macosx-universal.jar | Bin 0 -> 3997 bytes
 lib/jogamp/gluegen-rt-natives-solaris-amd64.jar    | Bin 0 -> 4118 bytes
 lib/jogamp/gluegen-rt-natives-solaris-i586.jar     | Bin 0 -> 3437 bytes
 lib/jogamp/gluegen-rt-natives-windows-amd64.jar    | Bin 0 -> 6311 bytes
 lib/jogamp/gluegen-rt-natives-windows-i586.jar     | Bin 0 -> 4455 bytes
 lib/jogamp/gluegen-rt.jar                          | Bin 0 -> 199768 bytes
 lib/jogamp/joal-natives-linux-amd64.jar            | Bin 0 -> 137476 bytes
 lib/jogamp/joal-natives-linux-armv6.jar            | Bin 0 -> 7945 bytes
 lib/jogamp/joal-natives-linux-armv6hf.jar          | Bin 0 -> 8086 bytes
 lib/jogamp/joal-natives-linux-i586.jar             | Bin 0 -> 111509 bytes
 lib/jogamp/joal-natives-macosx-universal.jar       | Bin 0 -> 12899 bytes
 lib/jogamp/joal-natives-solaris-amd64.jar          | Bin 0 -> 11502 bytes
 lib/jogamp/joal-natives-solaris-i586.jar           | Bin 0 -> 8879 bytes
 lib/jogamp/joal-natives-windows-amd64.jar          | Bin 0 -> 290811 bytes
 lib/jogamp/joal-natives-windows-i586.jar           | Bin 0 -> 260143 bytes
 lib/jogamp/joal.jar                                | Bin 0 -> 49893 bytes
 lib/jogamp/jogl-all-natives-linux-amd64.jar        | Bin 0 -> 147021 bytes
 lib/jogamp/jogl-all-natives-linux-armv6.jar        | Bin 0 -> 109286 bytes
 lib/jogamp/jogl-all-natives-linux-armv6hf.jar      | Bin 0 -> 110553 bytes
 lib/jogamp/jogl-all-natives-linux-i586.jar         | Bin 0 -> 146307 bytes
 lib/jogamp/jogl-all-natives-macosx-universal.jar   | Bin 0 -> 310879 bytes
 lib/jogamp/jogl-all-natives-solaris-amd64.jar      | Bin 0 -> 147444 bytes
 lib/jogamp/jogl-all-natives-solaris-i586.jar       | Bin 0 -> 112439 bytes
 lib/jogamp/jogl-all-natives-windows-amd64.jar      | Bin 0 -> 113360 bytes
 lib/jogamp/jogl-all-natives-windows-i586.jar       | Bin 0 -> 136202 bytes
 lib/jogamp/jogl-all.jar                            | Bin 0 -> 4851705 bytes
 33 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 lib/jogamp/gluegen-rt-natives-linux-amd64.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-linux-armv6.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-linux-armv6hf.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-linux-i586.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-macosx-universal.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-solaris-amd64.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-solaris-i586.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-windows-amd64.jar
 create mode 100644 lib/jogamp/gluegen-rt-natives-windows-i586.jar
 create mode 100644 lib/jogamp/gluegen-rt.jar
 create mode 100644 lib/jogamp/joal-natives-linux-amd64.jar
 create mode 100644 lib/jogamp/joal-natives-linux-armv6.jar
 create mode 100644 lib/jogamp/joal-natives-linux-armv6hf.jar
 create mode 100644 lib/jogamp/joal-natives-linux-i586.jar
 create mode 100644 lib/jogamp/joal-natives-macosx-universal.jar
 create mode 100644 lib/jogamp/joal-natives-solaris-amd64.jar
 create mode 100644 lib/jogamp/joal-natives-solaris-i586.jar
 create mode 100644 lib/jogamp/joal-natives-windows-amd64.jar
 create mode 100644 lib/jogamp/joal-natives-windows-i586.jar
 create mode 100644 lib/jogamp/joal.jar
 create mode 100644 lib/jogamp/jogl-all-natives-linux-amd64.jar
 create mode 100644 lib/jogamp/jogl-all-natives-linux-armv6.jar
 create mode 100644 lib/jogamp/jogl-all-natives-linux-armv6hf.jar
 create mode 100644 lib/jogamp/jogl-all-natives-linux-i586.jar
 create mode 100644 lib/jogamp/jogl-all-natives-macosx-universal.jar
 create mode 100644 lib/jogamp/jogl-all-natives-solaris-amd64.jar
 create mode 100644 lib/jogamp/jogl-all-natives-solaris-i586.jar
 create mode 100644 lib/jogamp/jogl-all-natives-windows-amd64.jar
 create mode 100644 lib/jogamp/jogl-all-natives-windows-i586.jar
 create mode 100644 lib/jogamp/jogl-all.jar

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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-linux-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-linux-armv6.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-linux-armv6hf.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-linux-i586.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-macosx-universal.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-solaris-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-solaris-i586.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-windows-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/gluegen-rt-natives-windows-i586.jar differ
diff --git a/lib/jogamp/gluegen-rt.jar b/lib/jogamp/gluegen-rt.jar
new file mode 100644
index 0000000..8d1054a
Binary files /dev/null and b/lib/jogamp/gluegen-rt.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-linux-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-linux-armv6.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-linux-armv6hf.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-linux-i586.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-macosx-universal.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-solaris-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-solaris-i586.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-windows-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/joal-natives-windows-i586.jar differ
diff --git a/lib/jogamp/joal.jar b/lib/jogamp/joal.jar
new file mode 100644
index 0000000..fc2765a
Binary files /dev/null and b/lib/jogamp/joal.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-linux-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-linux-armv6.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-linux-armv6hf.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-linux-i586.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-macosx-universal.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-solaris-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-solaris-i586.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-windows-amd64.jar differ
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
Binary files /dev/null and b/lib/jogamp/jogl-all-natives-windows-i586.jar differ
diff --git a/lib/jogamp/jogl-all.jar b/lib/jogamp/jogl-all.jar
new file mode 100644
index 0000000..4e50e1d
Binary files /dev/null and b/lib/jogamp/jogl-all.jar differ
-- 
cgit v1.2.3