Skip to content

Commit 122cda2

Browse files
committed
added java-ios-only target for build-mac-ios.xml
1 parent 6f6869f commit 122cda2

File tree

5 files changed

+32
-13
lines changed

5 files changed

+32
-13
lines changed

build-mac-ios.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
</ant>
77
</target>
88

9+
<target name="ios-java-only">
10+
<ant antfile="build.xml" target="gdx-backend-iosmonotouch" dir=".">
11+
<property name="compile-natives" value="false"/>
12+
</ant>
13+
<ant antfile="convert-ikvm.xml" dir=".">
14+
<property name="IN" value="-srcpath:gdx/src/ dist/gdx.jar"/>
15+
<property name="OUT" value="gdx/libs/ios32/gdx.dll"/>
16+
</ant>
17+
<ant antfile="convert-ikvm.xml" dir=".">
18+
<property name="IN" value="-r:gdx/libs/ios32/gdx.dll -srcpath:backends/gdx-backend-iosmonotouch/src/ dist/gdx-backend-iosmonotouch.jar"/>
19+
<property name="OUT" value="backends/gdx-backend-iosmonotouch/libs/ios32/gdx-backend-ios.dll"/>
20+
</ant>
21+
</target>
22+
923
<target name="core" depends="compile-jars">
1024
<ant antfile="build-macosx32.xml" dir="gdx/jni">
1125
<target name="clean"/>

demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Properties>
2-
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
2+
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
33
<MonoDevelop.Ide.Workbench ActiveDocument="gdx-vectorpinball-ios/Main.cs">
44
<Files>
55
<File FileName="gdx-vectorpinball-ios/Main.cs" Line="11" Column="3" />
@@ -8,8 +8,10 @@
88
<Pads>
99
<Pad Id="ProjectPad">
1010
<State expanded="True">
11-
<Node name="gdx-vectorpinball-ios" expanded="True" selected="True">
12-
<Node name="References" expanded="True" />
11+
<Node name="gdx-vectorpinball-ios" expanded="True">
12+
<Node name="References" expanded="True">
13+
<Node name="/Users/badlogic/workspace/libgdx/backends/gdx-backend-iosmonotouch/libs/ikvm/bin/IKVM.OpenJDK.Charsets.dll" selected="True" />
14+
</Node>
1315
</Node>
1416
</State>
1517
</Pad>

tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.userprefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Properties>
22
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
3-
<MonoDevelop.Ide.Workbench>
3+
<MonoDevelop.Ide.Workbench ActiveDocument="gdx-tests-iosmonotouch/Main.cs">
44
<Files>
55
<File FileName="gdx-tests-iosmonotouch/Main.cs" Line="20" Column="4" />
66
<File FileName="../gdx-tests-android/assets/data/uiskin.atlas" Line="1" Column="1" />
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
SRC = ../../gdx-tests/src/
2+
CLASSPATH = ../../../gdx/bin
3+
EXCLUDE = **/Internatio*.java
4+
IN = -r:../../../gdx/libs/ios32/gdx.dll -recurse:target/*.class
5+
OUT = gdx-tests.dll
6+
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
<project name="gdx" default="convert" basedir=".">
22
<property environment="env"/>
3-
<property name="IKVM_HOME" value="${env.IKVM_HOME}"/>
3+
<property file="convert.properties" />
4+
<property name="IKVM_HOME" value="../../../../backends/gdx-backend-iosmonotouch/libs/ikvm"/>
45
<property name="MONO_HOME" value="/Developer/MonoTouch/usr/lib/mono/2.1"/>
5-
<property name="IN" value="-recurse:target/core/*.class"/>
6-
<property name="OUT" value="gdx.dll"/>
7-
<property name="SRC" value="src/"/>
8-
<property name="CLASSPATH" value=""/>
9-
<property name="EXCLUDE" value=""/>
106

117
<target name="compile">
128
<delete dir="target"/>
139
<mkdir dir="target"/>
14-
<javac srcdir="${SRC}" destdir="target" classpath="${CLASSPATH}" debug="true" debuglevel="lines, vars, and source">
10+
<javac srcdir="${SRC}" debug="on" source="1.6" target="1.6" destdir="target" classpath="${CLASSPATH}">
1511
<include name="**/*.java"/>
1612
<exclude name="${EXCLUDE}"/>
1713
</javac>
1814
</target>
1915

20-
<target name="convert">
16+
<target name="convert" depends="compile">
2117
<exec executable="mono">
2218
<arg value="${IKVM_HOME}/bin/ikvmc.exe"/>
2319
<arg value="-nostdlib"/>
2420
<arg value="-target:library"/>
2521
<arg value="-debug"/>
22+
<arg value="-srcpath:${SRC}"/>
2623
<arg value="-out:${OUT}"/>
2724
<arg value="-r:${MONO_HOME}/mscorlib.dll"/>
2825
<arg value="-r:${MONO_HOME}/System.dll"/>
@@ -34,4 +31,4 @@
3431
<arg line="${IN}"/>
3532
</exec>
3633
</target>
37-
</project>
34+
</project>

0 commit comments

Comments
 (0)