[changed] build file. no gdx-xxx-dependencies.jar anymore. each backend jar contains...

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 8abd32b..d50094c 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 229972f..9bff1e3 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/.classpath b/demos/helloworld/gdx-helloworld/.classpath
index 597e500..c9f34d2 100644 (file)
--- a/demos/helloworld/gdx-helloworld/.classpath
+++ b/demos/helloworld/gdx-helloworld/.classpath
@@ -3,7 +3,6 @@
        <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 kind="lib" path="libs/gdx-backend-desktop.jar"/>\r
-       <classpathentry kind="lib" path="libs/gdx-dependencies-desktop.jar"/>\r
        <classpathentry kind="lib" path="libs/gdx.jar" sourcepath="libs/gdx-sources.jar">\r
                <attributes>\r
                        <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="gdx-helloworld/libs"/>\r

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx-backend-desktop.jar b/demos/helloworld/gdx-helloworld/libs/gdx-backend-desktop.jar
index e65f370..8f5cc36 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld/libs/gdx-backend-desktop.jar and b/demos/helloworld/gdx-helloworld/libs/gdx-backend-desktop.jar differ

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx-sources.jar b/demos/helloworld/gdx-helloworld/libs/gdx-sources.jar
index 0815e16..63f947c 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.dll b/demos/helloworld/gdx-helloworld/libs/gdx.dll
index ba865d7..1e4ee48 100644 (file)
Binary files a/demos/helloworld/gdx-helloworld/libs/gdx.dll and b/demos/helloworld/gdx-helloworld/libs/gdx.dll differ

diff --git a/demos/helloworld/gdx-helloworld/libs/gdx.jar b/demos/helloworld/gdx-helloworld/libs/gdx.jar
index 229972f..9bff1e3 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/helloworld/gdx-helloworld/src/com/badlogic/gdx/helloworld/HelloWorld.java b/demos/helloworld/gdx-helloworld/src/com/badlogic/gdx/helloworld/HelloWorld.java
index cf19f40..56c1544 100644 (file)
--- a/demos/helloworld/gdx-helloworld/src/com/badlogic/gdx/helloworld/HelloWorld.java
+++ b/demos/helloworld/gdx-helloworld/src/com/badlogic/gdx/helloworld/HelloWorld.java
@@ -50,7 +50,7 @@ public class HelloWorld implements RenderListener {
                textPosition.add(textDirection.tmp().mul(Gdx.graphics.getDeltaTime()).mul(60));\r
 \r
                spriteBatch.begin();\r
-               spriteBatch.draw(texture, centerX - texture.getWidth() / 2, centerY + texture.getHeight() / 2, 0, 0, texture.getWidth(),\r
+               spriteBatch.draw(texture, centerX - texture.getWidth() / 2, centerY - texture.getHeight() / 2, 0, 0, texture.getWidth(),\r
                        texture.getHeight(), Color.WHITE);\r
                spriteBatch.drawText(font, "Hello World!", (int)textPosition.x, (int)textPosition.y, Color.RED);\r
                spriteBatch.end();\r

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 8abd32b..d50094c 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 229972f..9bff1e3 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/.classpath b/demos/invaders/gdx-invaders/.classpath
index ccfb919..2224063 100644 (file)
--- a/demos/invaders/gdx-invaders/.classpath
+++ b/demos/invaders/gdx-invaders/.classpath
@@ -2,7 +2,6 @@
 <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 kind="lib" path="libs/gdx-dependencies-desktop.jar"/>\r
        <classpathentry kind="lib" path="libs/gdx-sources.jar"/>\r
        <classpathentry kind="lib" path="libs/gdx-backend-desktop.jar"/>\r
        <classpathentry kind="lib" path="libs/gdx.jar">\r

diff --git a/demos/invaders/gdx-invaders/libs/gdx-backend-desktop.jar b/demos/invaders/gdx-invaders/libs/gdx-backend-desktop.jar
index e65f370..8f5cc36 100644 (file)
Binary files a/demos/invaders/gdx-invaders/libs/gdx-backend-desktop.jar and b/demos/invaders/gdx-invaders/libs/gdx-backend-desktop.jar differ

diff --git a/demos/invaders/gdx-invaders/libs/gdx-sources.jar b/demos/invaders/gdx-invaders/libs/gdx-sources.jar
index 0815e16..63f947c 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.dll b/demos/invaders/gdx-invaders/libs/gdx.dll
index ba865d7..1e4ee48 100644 (file)
Binary files a/demos/invaders/gdx-invaders/libs/gdx.dll and b/demos/invaders/gdx-invaders/libs/gdx.dll differ

diff --git a/demos/invaders/gdx-invaders/libs/gdx.jar b/demos/invaders/gdx-invaders/libs/gdx.jar
index 229972f..9bff1e3 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 7f718a6..d7e5eec 100644 (file)
--- a/gdx/build.xml
+++ b/gdx/build.xml
@@ -47,7 +47,13 @@
                <javac srcdir="backends/gdx-backend-desktop/src" destdir="backends/gdx-backend-desktop/bin">\r
                        <classpath>\r
                                <pathelement location="gdx/bin"/>\r
-                               <pathelement location="backends/gdx-backend-desktop/libs/gdx-dependencies-desktop.jar"/>\r
+                               <pathelement location="backends/dependencies/gluegen-rt.jar"/>\r
+                               <pathelement location="backends/dependencies/javazoom-spi.jar"/>\r
+                               <pathelement location="backends/dependencies/jl1.0.1.jar"/>\r
+                               <pathelement location="backends/dependencies/jogl-natives.jar"/>\r
+                               <pathelement location="backends/dependencies/jogl.jar"/>\r
+                               <pathelement location="backends/dependencies/jorbis.jar"/>\r
+                               <pathelement location="backends/dependencies/tritonus-utils.jar"/>                              \r
                        </classpath>\r
                </javac>\r
                \r
@@ -55,15 +61,21 @@
                <javac srcdir="backends/gdx-backend-android/src" destdir="backends/gdx-backend-android/bin">\r
                        <classpath>\r
                                <pathelement location="gdx/bin"/>\r
-                               <pathelement location="backends/gdx-backend-android/libs/android-2.0.jar"/>\r
+                               <pathelement location="backends/dependencies/android-2.0.jar"/>\r
                        </classpath>\r
                </javac>\r
                \r
                <!-- build applet backend -->\r
                <javac srcdir="backends/gdx-backend-applet/src" destdir="backends/gdx-backend-applet/bin">\r
                        <classpath>\r
-                               <pathElement location="gdx/bin"/>\r
-                               <pathElement location="backends/gdx-backend-applet/libs/gdx-dependencies-applet.jar"/>\r
+                               <pathElement location="gdx/bin"/>                               \r
+                               <pathelement location="backends/dependencies/gluegen-rt.jar"/>\r
+                               <pathelement location="backends/dependencies/javazoom-spi.jar"/>\r
+                               <pathelement location="backends/dependencies/jl1.0.1.jar"/>\r
+                               <pathelement location="backends/dependencies/jogl-natives.jar"/>\r
+                               <pathelement location="backends/dependencies/jogl.jar"/>\r
+                               <pathelement location="backends/dependencies/jorbis.jar"/>\r
+                               <pathelement location="backends/dependencies/tritonus-utils.jar"/>\r
                        </classpath>\r
                </javac>\r
        </target>\r
@@ -83,20 +95,37 @@
        \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">\r
+       <target name="dist" depends="compile">\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
-               <jar destfile="${stable}/gdx-backend-desktop.jar" basedir="backends/gdx-backend-desktop/bin"/>\r
+               <jar destfile="${stable}/gdx-backend-desktop.jar">\r
+                       <fileset dir="backends/gdx-backend-desktop/bin"/>\r
+                       <zipfileset src="backends/dependencies/gluegen-rt.jar"/>\r
+                       <zipfileset src="backends/dependencies/javazoom-spi.jar"/>\r
+                       <zipfileset src="backends/dependencies/jl1.0.1.jar"/>\r
+                       <zipfileset src="backends/dependencies/jogl-natives.jar"/>\r
+                       <zipfileset src="backends/dependencies/jogl.jar"/>\r
+                       <zipfileset src="backends/dependencies/jorbis.jar"/>\r
+                       <zipfileset src="backends/dependencies/tritonus-utils.jar"/>\r
+               </jar>\r
+               <jar destfile="${stable}/gdx-backend-applet.jar">\r
+                       <fileset dir="backends/gdx-backend-applet/bin"/>\r
+                       <zipfileset src="backends/dependencies/gluegen-rt.jar"/>\r
+                       <zipfileset src="backends/dependencies/javazoom-spi.jar"/>\r
+                       <zipfileset src="backends/dependencies/jl1.0.1.jar"/>\r
+                       <zipfileset src="backends/dependencies/jogl-natives.jar"/>\r
+                       <zipfileset src="backends/dependencies/jogl.jar"/>\r
+                       <zipfileset src="backends/dependencies/jorbis.jar"/>\r
+                       <zipfileset src="backends/dependencies/tritonus-utils.jar"/>\r
+               </jar>\r
                <jar destfile="${stable}/gdx-backend-android.jar" basedir="backends/gdx-backend-android/bin"/>\r
-               <jar destfile="${stable}/gdx-backend-applet.jar" basedir="backends/gdx-backend-applet/bin"/>\r
+               \r
                <copy tofile="${stable}/gdx.dll" file="gdx/windows/gdx.dll" failonerror="false"/>\r
                <copy tofile="${stable}/libgdx.so" file="gdx/linux/libgdx.so" failonerror="false"/>\r
                <copy tofile="${stable}/armeabi/libgdx.so" file="gdx/libs/armeabi/libgdx.so"/>\r
                <copy tofile="${stable}/armeabi/libandroidgl20.so" file="gdx/dist/armeabi/libandroidgl20.so"/>\r
-               <copy tofile="${stable}/armeabi-v7a/libgdx.so" file="gdx/libs/armeabi-v7a/libgdx.so"/>          \r
-               <copy tofile="${stable}/gdx-dependencies-desktop.jar" file="backends/gdx-backend-desktop/libs/gdx-dependencies-desktop.jar"/>\r
-               <copy tofile="${stable}/gdx-dependencies-applet.jar" file="backends/gdx-backend-applet/libs/gdx-dependencies-applet.jar"/>              \r
+               <copy tofile="${stable}/armeabi-v7a/libgdx.so" file="gdx/libs/armeabi-v7a/libgdx.so"/>                          \r
                <copy tofile="${stable}/README" file="gdx/dist/README"/>\r
                <copy tofile="${stable}/LICENSE-2.0.html" file="gdx/dist/LICENSE-2.0.html"/>\r
        </target>\r
@@ -106,7 +135,6 @@
                <copy tofile="demos/helloworld/gdx-helloworld/libs/gdx.jar" file="${stable}/gdx.jar"/>\r
                <copy tofile="demos/helloworld/gdx-helloworld/libs/gdx-sources.jar" file="${stable}/gdx-sources.jar"/>\r
                <copy tofile="demos/helloworld/gdx-helloworld/libs/gdx-backend-desktop.jar" file="${stable}/gdx-backend-desktop.jar"/>\r
-               <copy tofile="demos/helloworld/gdx-helloworld/libs/gdx-dependencies-desktop.jar" file="${stable}/gdx-dependencies-desktop.jar"/>\r
                <copy tofile="demos/helloworld/gdx-helloworld/libs/gdx.dll" file="${stable}/gdx.dll" failonerror="false"/>\r
                <copy tofile="demos/helloworld/gdx-helloworld/libs/libgdx.so" file="${stable}/libgdx.so" failonerror="false"/>\r
                \r
@@ -119,7 +147,6 @@
                <copy tofile="demos/invaders/gdx-invaders/libs/gdx.jar" file="${stable}/gdx.jar"/>\r
                <copy tofile="demos/invaders/gdx-invaders/libs/gdx-sources.jar" file="${stable}/gdx-sources.jar"/>\r
                <copy tofile="demos/invaders/gdx-invaders/libs/gdx-backend-desktop.jar" file="${stable}/gdx-backend-desktop.jar"/>\r
-               <copy tofile="demos/invaders/gdx-invaders/libs/gdx-dependencies-desktop.jar" file="${stable}/gdx-dependencies-desktop.jar"/>\r
                <copy tofile="demos/invaders/gdx-invaders/libs/gdx.dll" file="${stable}/gdx.dll" failonerror="false"/>\r
                <copy tofile="demos/invaders/gdx-invaders/libs/libgdx.so" file="${stable}/libgdx.so" failonerror="false"/>\r
                \r