Update to the latest 2.0 release candidate of JOGL (Build 57).

Move JOGL Libraries from lib/native to lib/jogl, which is less misleading.
Update .classpath and build.xml with new directory name.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@794 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/.classpath b/core/.classpath
index d50734aa2ea6bcb033bf1546c0542cd26de0e95c..ac3ceedf2cd6f594273d6a6d55edbacec27cc9d7 100644 (file)
--- a/core/.classpath
+++ b/core/.classpath
@@ -26,9 +26,9 @@
        <classpathentry kind="lib" path="lib-test/uispec4j-2.3-jdk16.jar"/>
        <classpathentry kind="lib" path="resources"/>
        <classpathentry kind="lib" path="lib/jspf.core-1.0.2.jar" sourcepath="/home/sampo/Projects/lib/jspf/documentation/api"/>
-       <classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/native/gluegen-rt.jar"/>
-       <classpathentry kind="lib" path="lib/native/jogl.all.jar"/>\r
-       <classpathentry kind="lib" path="lib/exp4j-0.2.9.jar"/>\r
+       <classpathentry kind="lib" path="lib/opencsv-2.3.jar"/>
+       <classpathentry kind="lib" path="lib/exp4j-0.2.9.jar"/>
+       <classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
+       <classpathentry kind="lib" path="lib/jogl/jogl.all.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/core/build.xml b/core/build.xml
index 7f3ad8d0b5e698671a844e8d11b153b7ca8df47f..3b9a23777ed96577806d685464cc4e5c7f65ab21 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -95,7 +95,7 @@
                        <zipfileset dir="${lib.dir}" prefix="lib">
                                <include name="*.jar"/>
                        </zipfileset>
-                       <zipfileset dir="${lib.dir}/native" prefix="lib">
+                       <zipfileset dir="${lib.dir}/jogl" prefix="lib">
                                <include name="*.jar"/>
                        </zipfileset>
                        

diff --git a/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar
new file mode 100644 (file)
index 0000000..ee7cf4b
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ

diff --git a/core/lib/jogl/gluegen-rt-natives-linux-i586.jar b/core/lib/jogl/gluegen-rt-natives-linux-i586.jar
new file mode 100644 (file)
index 0000000..a7a7007
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-linux-i586.jar differ

diff --git a/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar
new file mode 100644 (file)
index 0000000..72d86d3
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ

diff --git a/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar
new file mode 100644 (file)
index 0000000..19f62cb
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ

diff --git a/core/lib/jogl/gluegen-rt-natives-windows-i586.jar b/core/lib/jogl/gluegen-rt-natives-windows-i586.jar
new file mode 100644 (file)
index 0000000..713ce14
Binary files /dev/null and b/core/lib/jogl/gluegen-rt-natives-windows-i586.jar differ

diff --git a/core/lib/jogl/gluegen-rt.jar b/core/lib/jogl/gluegen-rt.jar
new file mode 100644 (file)
index 0000000..07bcb06
Binary files /dev/null and b/core/lib/jogl/gluegen-rt.jar differ

diff --git a/core/lib/jogl/jogl-all-natives-linux-amd64.jar b/core/lib/jogl/jogl-all-natives-linux-amd64.jar
new file mode 100644 (file)
index 0000000..544b7d7
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-linux-amd64.jar differ

diff --git a/core/lib/jogl/jogl-all-natives-linux-i586.jar b/core/lib/jogl/jogl-all-natives-linux-i586.jar
new file mode 100644 (file)
index 0000000..75165df
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-linux-i586.jar differ

diff --git a/core/lib/jogl/jogl-all-natives-macosx-universal.jar b/core/lib/jogl/jogl-all-natives-macosx-universal.jar
new file mode 100644 (file)
index 0000000..3475838
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-macosx-universal.jar differ

diff --git a/core/lib/jogl/jogl-all-natives-windows-amd64.jar b/core/lib/jogl/jogl-all-natives-windows-amd64.jar
new file mode 100644 (file)
index 0000000..9dbe67c
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-windows-amd64.jar differ

diff --git a/core/lib/jogl/jogl-all-natives-windows-i586.jar b/core/lib/jogl/jogl-all-natives-windows-i586.jar
new file mode 100644 (file)
index 0000000..0b03ce7
Binary files /dev/null and b/core/lib/jogl/jogl-all-natives-windows-i586.jar differ

diff --git a/core/lib/jogl/jogl.all.jar b/core/lib/jogl/jogl.all.jar
new file mode 100644 (file)
index 0000000..34e9aa7
Binary files /dev/null and b/core/lib/jogl/jogl.all.jar differ

diff --git a/core/lib/native/gluegen-rt-natives-linux-amd64.jar b/core/lib/native/gluegen-rt-natives-linux-amd64.jar
deleted file mode 100644 (file)
index 2beef19..0000000
Binary files a/core/lib/native/gluegen-rt-natives-linux-amd64.jar and /dev/null differ

diff --git a/core/lib/native/gluegen-rt-natives-linux-i586.jar b/core/lib/native/gluegen-rt-natives-linux-i586.jar
deleted file mode 100644 (file)
index e0bc10f..0000000
Binary files a/core/lib/native/gluegen-rt-natives-linux-i586.jar and /dev/null differ

diff --git a/core/lib/native/gluegen-rt-natives-macosx-universal.jar b/core/lib/native/gluegen-rt-natives-macosx-universal.jar
deleted file mode 100644 (file)
index 05d72f8..0000000
Binary files a/core/lib/native/gluegen-rt-natives-macosx-universal.jar and /dev/null differ

diff --git a/core/lib/native/gluegen-rt-natives-windows-amd64.jar b/core/lib/native/gluegen-rt-natives-windows-amd64.jar
deleted file mode 100644 (file)
index a77bcf1..0000000
Binary files a/core/lib/native/gluegen-rt-natives-windows-amd64.jar and /dev/null differ

diff --git a/core/lib/native/gluegen-rt-natives-windows-i586.jar b/core/lib/native/gluegen-rt-natives-windows-i586.jar
deleted file mode 100644 (file)
index 39fbfb2..0000000
Binary files a/core/lib/native/gluegen-rt-natives-windows-i586.jar and /dev/null differ

diff --git a/core/lib/native/gluegen-rt.jar b/core/lib/native/gluegen-rt.jar
deleted file mode 100644 (file)
index de5c815..0000000
Binary files a/core/lib/native/gluegen-rt.jar and /dev/null differ

diff --git a/core/lib/native/jogl-all-natives-linux-amd64.jar b/core/lib/native/jogl-all-natives-linux-amd64.jar
deleted file mode 100644 (file)
index 951175b..0000000
Binary files a/core/lib/native/jogl-all-natives-linux-amd64.jar and /dev/null differ

diff --git a/core/lib/native/jogl-all-natives-linux-i586.jar b/core/lib/native/jogl-all-natives-linux-i586.jar
deleted file mode 100644 (file)
index dd846ac..0000000
Binary files a/core/lib/native/jogl-all-natives-linux-i586.jar and /dev/null differ

diff --git a/core/lib/native/jogl-all-natives-macosx-universal.jar b/core/lib/native/jogl-all-natives-macosx-universal.jar
deleted file mode 100644 (file)
index 3edc295..0000000
Binary files a/core/lib/native/jogl-all-natives-macosx-universal.jar and /dev/null differ

diff --git a/core/lib/native/jogl-all-natives-windows-amd64.jar b/core/lib/native/jogl-all-natives-windows-amd64.jar
deleted file mode 100644 (file)
index 5eb5a76..0000000
Binary files a/core/lib/native/jogl-all-natives-windows-amd64.jar and /dev/null differ

diff --git a/core/lib/native/jogl-all-natives-windows-i586.jar b/core/lib/native/jogl-all-natives-windows-i586.jar
deleted file mode 100644 (file)
index aee77f2..0000000
Binary files a/core/lib/native/jogl-all-natives-windows-i586.jar and /dev/null differ

diff --git a/core/lib/native/jogl.all.jar b/core/lib/native/jogl.all.jar
deleted file mode 100644 (file)
index 59a3eff..0000000
Binary files a/core/lib/native/jogl.all.jar and /dev/null differ