(no commit message)

diff --git a/backends/dependencies/gdx-natives.jar b/backends/dependencies/gdx-natives.jar
index c83edab..475807e 100644 (file)
Binary files a/backends/dependencies/gdx-natives.jar and b/backends/dependencies/gdx-natives.jar differ

diff --git a/build.xml b/build.xml
index 6915619..cd3d109 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -66,6 +66,7 @@
                        <classpath>\r
                                <pathelement location="gdx/bin"/>\r
                                <pathelement location="backends/dependencies/lwjgl.jar"/>\r
+                               <pathelement location="backends/dependencies/lwjgl-natives.jar" />\r
                                <pathelement location="backends/dependencies/javazoom-spi.jar"/>\r
                                <pathelement location="backends/dependencies/jl1.0.1.jar"/>\r
                                <pathelement location="backends/dependencies/jorbis.jar"/>\r
@@ -90,19 +91,6 @@
                        </classpath>\r
                </javac>\r
        </target>\r
-\r
-       <!-- compiles the native code (for android only atm) -->\r
-       <target name="compile-native" depends="init">\r
-               <exec executable="make" dir="gdx">\r
-                       <arg value="-f"/>                       \r
-                       <arg value="${env.NDK_HOME}/build/core/build-local.mk"/>\r
-                       <arg value="clean"/>\r
-               </exec>\r
-               <exec executable="make" dir="gdx">\r
-                       <arg value="-f"/>                       \r
-                       <arg value="${env.NDK_HOME}/build/core/build-local.mk"/>\r
-               </exec>\r
-       </target>\r
        \r
        <!-- generates the javadoc for the core api and the application implementations -->\r
        <target name="docs" depends="init">\r
@@ -143,19 +131,14 @@
                </javadoc>\r
        </target>\r
        \r
-       <target name="packnatives" depends="init">\r
-       <jar destfile="${stable}/gdx-natives.jar">\r
-               <fileset dir="gdx/windows" includes="gdx.dll"/>\r
-               <fileset dir="gdx/windows64" includes="gdx-64.dll"/>\r
-               <fileset dir="gdx/linux" includes="libgdx.so"/>\r
-               <fileset dir="gdx/linux64" includes="libgdx-64.so"/>\r
-               <fileset dir="gdx/mac" includes="libgdx.dylib"/>\r
-       </jar>\r
+       <target name="compile-natives" depends="init">\r
+               <ant antfile="build.xml" dir="gdx/jni/" target="clean"/>\r
+               <ant antfile="build.xml" dir="gdx/jni/"/>\r
        </target>\r
        \r
        <!-- builds the distribution directory, does not include the desktop libs \r
                for some reason excludes don't work so i have to delete the ndk directory first... -->\r
-       <target name="dist" depends="compile,compile-native,docs,packnatives">\r
+       <target name="dist" depends="compile,compile-natives,docs">\r
                <delete dir="gdx/bin/ndk"/>\r
                <jar destfile="${stable}/gdx.jar" basedir="gdx/bin"/>\r
                <jar destfile="${stable}/gdx-sources.jar" basedir="gdx/src"/>\r
@@ -185,6 +168,7 @@
                        <zipfileset src="extensions/twl/gdx-twl/libs/xpp3-1.1.4c.jar" />\r
                </jar>\r
                                \r
+               <copy tofile="${stable}/gdx-natives.jar" file="backends/dependencies/gdx-natives.jar" />\r
                <copy tofile="${stable}/armeabi/libgdx.so" file="gdx/libs/armeabi/libgdx.so" />\r
                <!-- <copy tofile="${stable}/armeabi/libmpg123.so" file="gdx/libs/armeabi/libmpg123.so" /> -->\r
                <copy tofile="${stable}/armeabi/libandroidgl20.so" file="gdx/dist/armeabi/libandroidgl20.so" />\r

diff --git a/demos/helloworld/gdx-helloworld-android/libs/gdx-backend-android.jar b/demos/helloworld/gdx-helloworld-android/libs/gdx-backend-android.jar
index b62e246..58fb5cc 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld-android/libs/gdx-backend-android.jar and b/demos/helloworld/gdx-helloworld-android/libs/gdx-backend-android.jar differ

diff --git a/demos/helloworld/gdx-helloworld-android/libs/gdx.jar b/demos/helloworld/gdx-helloworld-android/libs/gdx.jar
index 5b68cb5..8a58fa3 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld-android/libs/gdx.jar and b/demos/helloworld/gdx-helloworld-android/libs/gdx.jar differ

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx-backend-jogl.jar b/demos/helloworld/gdx-helloworld/libs/gdx-backend-jogl.jar
index f5ef935..2bbd03b 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld/libs/gdx-backend-jogl.jar and b/demos/helloworld/gdx-helloworld/libs/gdx-backend-jogl.jar differ

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx-natives.jar b/demos/helloworld/gdx-helloworld/libs/gdx-natives.jar
index 53f12ae..475807e 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld/libs/gdx-natives.jar and b/demos/helloworld/gdx-helloworld/libs/gdx-natives.jar differ

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx-sources.jar b/demos/helloworld/gdx-helloworld/libs/gdx-sources.jar
index ac36eb5..f595a53 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld/libs/gdx-sources.jar and b/demos/helloworld/gdx-helloworld/libs/gdx-sources.jar differ

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx.jar b/demos/helloworld/gdx-helloworld/libs/gdx.jar
index 5b68cb5..8a58fa3 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld/libs/gdx.jar and b/demos/helloworld/gdx-helloworld/libs/gdx.jar differ

diff --git a/demos/invaders/gdx-invaders-android/libs/gdx-backend-android.jar b/demos/invaders/gdx-invaders-android/libs/gdx-backend-android.jar
index b62e246..58fb5cc 100644 (file)
Binary files a/demos/invaders/gdx-invaders-android/libs/gdx-backend-android.jar and b/demos/invaders/gdx-invaders-android/libs/gdx-backend-android.jar differ

diff --git a/demos/invaders/gdx-invaders-android/libs/gdx.jar b/demos/invaders/gdx-invaders-android/libs/gdx.jar
index 5b68cb5..8a58fa3 100644 (file)
Binary files a/demos/invaders/gdx-invaders-android/libs/gdx.jar and b/demos/invaders/gdx-invaders-android/libs/gdx.jar differ

diff --git a/demos/invaders/gdx-invaders/libs/gdx-backend-jogl.jar b/demos/invaders/gdx-invaders/libs/gdx-backend-jogl.jar
index f5ef935..2bbd03b 100644 (file)
Binary files a/demos/invaders/gdx-invaders/libs/gdx-backend-jogl.jar and b/demos/invaders/gdx-invaders/libs/gdx-backend-jogl.jar differ

diff --git a/demos/invaders/gdx-invaders/libs/gdx-natives.jar b/demos/invaders/gdx-invaders/libs/gdx-natives.jar
index 53f12ae..475807e 100644 (file)
Binary files a/demos/invaders/gdx-invaders/libs/gdx-natives.jar and b/demos/invaders/gdx-invaders/libs/gdx-natives.jar differ

diff --git a/demos/invaders/gdx-invaders/libs/gdx-sources.jar b/demos/invaders/gdx-invaders/libs/gdx-sources.jar
index ac36eb5..f595a53 100644 (file)
Binary files a/demos/invaders/gdx-invaders/libs/gdx-sources.jar and b/demos/invaders/gdx-invaders/libs/gdx-sources.jar differ

diff --git a/demos/invaders/gdx-invaders/libs/gdx.jar b/demos/invaders/gdx-invaders/libs/gdx.jar
index 5b68cb5..8a58fa3 100644 (file)
Binary files a/demos/invaders/gdx-invaders/libs/gdx.jar and b/demos/invaders/gdx-invaders/libs/gdx.jar differ

diff --git a/gdx/build.xml b/gdx/build.xml
index 27ee656..e4b9d0c 100644 (file)
--- a/gdx/build.xml
+++ b/gdx/build.xml
@@ -90,25 +90,33 @@
                                <pathelement location="extensions/twl/gdx-twl/libs/xpp3-1.1.4c.jar" />\r
                        </classpath>\r
                </javac>\r
-\r
-       </target>\r
-\r
-       <!-- compiles the native code (for android only atm) -->\r
-       <target name="compile-native" depends="init">\r
-               <exec executable="make" dir="gdx">\r
-                       <arg value="-f" />\r
-                       <arg value="${env.NDK_HOME}/build/core/build-local.mk" />\r
-                       <arg value="clean" />\r
-               </exec>\r
-               <exec executable="make" dir="gdx">\r
-                       <arg value="-f" />\r
-                       <arg value="${env.NDK_HOME}/build/core/build-local.mk" />\r
-               </exec>\r
        </target>\r
 \r
        <!-- generates the javadoc for the core api and the application implementations -->\r
        <target name="docs" depends="init">\r
-               <javadoc destdir="${stable}/docs/api" author="true" version="true" use="true" windowtitle="Libgdx API">\r
+               <javadoc destdir="${stable}/docs/api" author="true" version="true" use="true"\r
+               windowtitle="libgdx API" doctitle="libgdx API" footer="libgdx API">\r
+                       <header><![CDATA[\r
+                               libgdx API\r
+                               <style>\r
+                               body, td, th { font-family:Helvetica, Tahoma, Arial, sans-serif; font-size:10pt }\r
+                               pre, code, tt { font-size:9pt; font-family:Lucida Console, Courier New, sans-serif }\r
+                               h1, h2, h3, .FrameTitleFont, .FrameHeadingFont, .TableHeadingColor font { font-size:105%;  font-weight:bold }\r
+                               .TableHeadingColor { background:#EEEEFF; }\r
+                               a { text-decoration:none }\r
+                               a:hover { text-decoration:underline }\r
+                               a:link, a:visited { color:blue }\r
+                               table { border:0px }\r
+                               .TableRowColor td:first-child { border-left:1px solid black }\r
+                               .TableRowColor td { border:0px; border-bottom:1px solid black; border-right:1px solid black }\r
+                               hr { border:0px; border-bottom:1px solid #333366; }\r
+                               </style>\r
+                       ]]></header>\r
+                       <bottom><![CDATA[\r
+                               <div style="font-size:9pt"><i>\r
+                               Copyright 2010 Mario Zechner (contact@badlogicgames.com), Nathan Sweet (admin@esotericsoftware.com)\r
+                               </i></div>\r
+                       ]]></bottom>\r
                        <fileset dir="gdx/src" defaultexcludes="yes">\r
                                <include name="com/badlogic/gdx/**" />\r
                                <exclude name="com/badlogic/gdx/utils/arial-15.fnt" />\r
@@ -116,25 +124,21 @@
                        </fileset>\r
                        <fileset dir="backends" includes="gdx-backend-jogl/src/com/badlogic/gdx/backends/jogl/JoglApplication.java"/>\r
                        <fileset dir="backends" includes="gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglApplication.java"/>\r
+                       <fileset dir="backends" includes="gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglCanvas.java"/>\r
                        <fileset dir="backends" includes="gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglApplet.java"/>\r
                        <fileset dir="backends" includes="gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java"/>\r
                        <fileset dir="extensions/twl/" includes="gdx-twl/src/com/badlogic/gdx/twl/TWL.java"/>\r
                </javadoc>\r
        </target>\r
 \r
-       <target name="packnatives" depends="init">\r
-       <jar destfile="${stable}/gdx-natives.jar">\r
-               <fileset dir="gdx/windows" includes="gdx.dll"/>\r
-               <fileset dir="gdx/windows64" includes="gdx-64.dll"/>\r
-               <fileset dir="gdx/linux" includes="libgdx.so"/>\r
-               <fileset dir="gdx/linux64" includes="libgdx-64.so"/>\r
-               <fileset dir="gdx/mac" includes="libgdx.dylib"/>\r
-       </jar>\r
+       <target name="compile-natives" depends="init">\r
+               <ant antfile="build.xml" dir="gdx/jni/" target="clean"/>\r
+               <ant antfile="build.xml" dir="gdx/jni/"/>\r
        </target>\r
        \r
        <!-- builds the distribution directory, does not include the desktop libs \r
                for some reason excludes don't work so i have to delete the ndk directory first... -->\r
-       <target name="dist" depends="compile,compile-native,docs,packnatives">\r
+       <target name="dist" depends="compile,compile-natives,docs">\r
                <delete dir="gdx/bin/ndk" />\r
                <jar destfile="${stable}/gdx.jar" basedir="gdx/bin" />\r
                <jar destfile="${stable}/gdx-sources.jar" basedir="gdx/src" />\r
@@ -164,6 +168,7 @@
                        <zipfileset src="extensions/twl/gdx-twl/libs/xpp3-1.1.4c.jar" />\r
                </jar>\r
 \r
+               <copy tofile="${stable}/gdx-natives.jar" file="backends/dependencies/gdx-natives.jar" />\r
                <copy tofile="${stable}/armeabi/libgdx.so" file="gdx/libs/armeabi/libgdx.so" />\r
                <!--<copy tofile="${stable}/armeabi/libmpg123.so" file="gdx/libs/armeabi/libmpg123.so" />-->\r
                <copy tofile="${stable}/armeabi/libandroidgl20.so" file="gdx/dist/armeabi/libandroidgl20.so" />\r
@@ -218,4 +223,4 @@
        <!-- do everything -->\r
        <target name="all" depends="update-demos,update-android-tests">\r
        </target>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/gdx/windows/gdx.dll b/gdx/windows/gdx.dll
index 32e3190..b45725c 100644 (file)
Binary files a/gdx/windows/gdx.dll and b/gdx/windows/gdx.dll differ

diff --git a/gdx/windows64/gdx-64.dll b/gdx/windows64/gdx-64.dll
index 1c25bb5..a479fc9 100644 (file)
Binary files a/gdx/windows64/gdx-64.dll and b/gdx/windows64/gdx-64.dll differ

diff --git a/tests/gdx-tests-jogl/.classpath b/tests/gdx-tests-jogl/.classpath
index 981b820..5f93e27 100644 (file)
--- a/tests/gdx-tests-jogl/.classpath
+++ b/tests/gdx-tests-jogl/.classpath
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry excluding="**/.svn/*" kind="src" path="src"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-jogl"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/gdx-tests"/>\r
-       <classpathentry kind="lib" path="/dependencies/gdx-natives.jar"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry excluding="**/.svn/*" kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-jogl"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/gdx-tests"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>