From: badlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Date: Fri, 17 Dec 2010 13:41:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2cf35cd9b0998ab1e7a8f5ecda260f7e399024d5;p=mikumikustudio%2Flibgdx-mikumikustudio.git

---

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