Skip to content

Commit

Permalink
fixed build...
Browse files Browse the repository at this point in the history
  • Loading branch information
@badlogic
badlogic committed Feb 3, 2013
1 parent cfcef0e commit 2715c7c
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
/extensions/gdx-bullet/libs/linux64
/extensions/gdx-bullet/libs/windows32
/extensions/gdx-bullet/libs/windows64
/extensions/gdx-bullet/libs/ios32/
/extensions/gdx-bullet/jni/vs/gdxBullet/gdxBullet.sdf
/extensions/gdx-bullet/jni/vs/gdxBullet/x64
/extensions/gdx-bullet/jni/vs/gdxBullet/Debug
Expand All @@ -132,6 +133,7 @@
/extensions/gdx-freetype/libs/linux64
/extensions/gdx-freetype/libs/windows32
/extensions/gdx-freetype/libs/windows64
/extensions/gdx-freetype/libs/ios32

/extensions/gdx-image/bin
/extensions/gdx-image/jni/target
Expand Down
5 changes: 0 additions & 5 deletions build-ios.xml
View file

This file was deleted.

75 changes: 75 additions & 0 deletions build-mac-ios.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<project name="gdx-ios-build" default="all" basedir=".">
<!-- compile the distribution so we have all jars we need, do not compile natives -->
<target name="compile-jars">
<ant antfile="build.xml" dir=".">
<property name="compile-natives" value="false"/>
</ant>
</target>

<target name="core" depends="compile-jars">
<ant antfile="build-macosx32.xml" dir="gdx/jni">
<target name="clean"/>
<target name="postcompile"/>
</ant>
<ant antfile="build-ios32.xml" dir="gdx/jni"/>
<ant antfile="convert-ikvm.xml" dir=".">
<property name="IN" value="-srcpath:gdx/src/ dist/gdx.jar"/>
<property name="OUT" value="gdx/libs/ios32/gdx.dll"/>
</ant>
</target>

<target name="backend-iosmonotouch" depends="core">
<ant antfile="convert-ikvm.xml" dir=".">
<property name="IN" value="-r:gdx/libs/ios32/gdx.dll -srcpath:backends/gdx-backend-iosmonotouch/src/ dist/gdx-backend-iosmonotouch.jar"/>
<property name="OUT" value="backends/gdx-backend-iosmonotouch/libs/gdx-backend-ios.dll"/>
</ant>
</target>

<target name="freetype" depends="core">
<ant antfile="build-macosx32.xml" dir="extensions/gdx-freetype/jni">
<target name="clean"/>
<target name="postcompile"/>
</ant>
<ant antfile="build-ios32.xml" dir="extensions/gdx-freetype/jni"/>
<ant antfile="convert-ikvm.xml" dir=".">
<property name="IN" value="-r:gdx/libs/ios32/gdx.dll -srcpath:extensions/gdx-freetype/src/ dist/extensions/gdx-freetype/gdx-freetype.jar"/>
<property name="OUT" value="extensions/gdx-freetype/libs/gdx-freetype.dll"/>
</ant>
</target>

<target name="bullet" depends="core">
<ant antfile="build-macosx32.xml" dir="extensions/gdx-bullet/jni">
<target name="clean"/>
<target name="postcompile"/>
</ant>
<ant antfile="build-ios32.xml" dir="extensions/gdx-bullet/jni"/>
<ant antfile="convert-ikvm.xml" dir=".">
<property name="IN" value="-r:gdx/libs/ios32/gdx.dll -srcpath:extensions/gdx-bullet/src/ dist/extensions/gdx-bullet/gdx-bullet.jar"/>
<property name="OUT" value="extensions/gdx-bullet/libs/gdx-bullet.dll"/>
</ant>
</target>

<target name="controllers" depends="core">
<ant antfile="build-macosx32.xml" dir="extensions/gdx-controllers/gdx-controllers-desktop/jni">
<target name="clean"/>
<target name="postcompile"/>
</ant>
</target>

<target name="audio" depends="core">
<ant antfile="build-macosx32.xml" dir="extensions/gdx-audio/jni">
<target name="clean"/>
<target name="postcompile"/>
</ant>
</target>

<target name="image" depends="core">
<ant antfile="build-macosx32.xml" dir="extensions/gdx-image/jni">
<target name="clean"/>
<target name="postcompile"/>
</ant>
</target>

<target name="all" depends="core,backend-iosmonotouch,freetype,bullet,audio,image,controllers">
</target>
</project>
3 changes: 2 additions & 1 deletion build-template-bullet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
<mkdir dir="${libs}/macosx32" />
<mkdir dir="${libs}/windows32" />
<mkdir dir="${libs}/windows64" />
<mkdir dir="${libs}/ios32"/>

<mkdir dir="${target}" />
<mkdir dir="${target}/java" />
Expand All @@ -55,7 +56,7 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe

<!-- compiles the java code -->
<target name="compile" depends="init">
<javac debug="on" encoding="utf-8" srcdir="${src}" destdir="${target}/java">
<javac debug="on" encoding="utf-8" source="1.6" target="1.6" srcdir="${src}" destdir="${target}/java">
<src path="jni/swig-src"/>
<classpath>
<path refid="classpath"/>
Expand Down
3 changes: 2 additions & 1 deletion build-template.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
<mkdir dir="${libs}/macosx32" />
<mkdir dir="${libs}/windows32" />
<mkdir dir="${libs}/windows64" />
<mkdir dir="${libs}/ios32"/>

<mkdir dir="${target}" />
<mkdir dir="${target}/java" />
Expand All @@ -55,7 +56,7 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe

<!-- compiles the java code -->
<target name="compile" depends="init">
<javac debug="on" encoding="utf-8" srcdir="${src}" destdir="${target}/java">
<javac debug="on" encoding="utf-8" source="1.6" target="1.6" srcdir="${src}" destdir="${target}/java">
<classpath>
<path refid="classpath"/>
<fileset file="${libs}/*.jar">
Expand Down
21 changes: 20 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,25 @@
</ant>
</target>

<!-- gdx ios-monotouch backend -->
<target name="gdx-backend-iosmonotouch" depends="gdx-core">
<path id="classpath">
<pathelement location="${distDir}/gdx.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/monotouch-5.4.0.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/mscorlib-4.0.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/opentk-5.4.0.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/system-2.1.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/system-core-2.1.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/system-data-2.1.jar"/>
<pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/objectal/libObjectAL.jar"/>
</path>
<ant antfile="../../build-template.xml" dir="backends/gdx-backend-iosmonotouch">
<property name="jar" value="gdx-backend-iosmonotouch"/>
<reference refid="classpath"/>
<reference refid="jarfiles"/>
</ant>
</target>

<!-- build the extensions -->
<!-- gdx tools -->
<target name="gdx-tools" depends="gdx-core,gdx-backend-lwjgl,gdx-backend-lwjgl">
Expand Down Expand Up @@ -292,7 +311,7 @@
</target>

<target name="jars"
depends="clean,gdx-setup-ui,gdx-core,gdx-openal,gdx-backend-lwjgl,gdx-backend-android,gdx-backend-gwt,gdx-tools,gdx-tiled-preprocessor,gdx-controllers,gdx-controllers-desktop,gdx-controllers-android,gdx-controllers-gwt,gdx-image,gdx-audio,gdx-freetype,gdx-bullet"/>
depends="clean,gdx-setup-ui,gdx-core,gdx-openal,gdx-backend-lwjgl,gdx-backend-android,gdx-backend-gwt,gdx-backend-iosmonotouch,gdx-tools,gdx-tiled-preprocessor,gdx-controllers,gdx-controllers-desktop,gdx-controllers-android,gdx-controllers-gwt,gdx-image,gdx-audio,gdx-freetype,gdx-bullet"/>

<target name="all" depends="jars,docs,copy-iosfiles">
<!-- copy distribution files (licences etc.) -->
Expand Down
2 changes: 1 addition & 1 deletion convert-ikvm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<arg value="-target:library"/>
<arg value="-debug"/>
<arg value="-out:${OUT}"/>
<arg value="-r:libs/objectal/libObjectAL.dll"/>
<arg value="-r:backends/gdx-backend-iosmonotouch/libs/objectal/libObjectAL.dll"/>
<arg value="-r:${MONO_HOME}/mscorlib.dll"/>
<arg value="-r:${MONO_HOME}/System.dll"/>
<arg value="-r:${MONO_HOME}/System.Core.dll"/>
Expand Down
Binary file removed gdx/libs/macosx32/libgdx.dylib
View file
Binary file not shown.

0 comments on commit 2715c7c

Please sign in to comment.