fixed up ant build to exclude monotouch, some simplifications

[mikumikustudio/libgdx-mikumikustudio.git] / gdx / jni / build-ios32.xml

diff --git a/gdx/jni/build-ios32.xml b/gdx/jni/build-ios32.xml
index 35fa678..42f71e9 100755 (executable)
--- a/gdx/jni/build-ios32.xml
+++ b/gdx/jni/build-ios32.xml
@@ -12,13 +12,13 @@
        <!-- the compilerPrefix for the C & C++ compilers -->\r
        <property name="compilerPrefix" value=""/>      \r
        <property name="iphoneos-platform" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin"/>\r
-       <property name="iphoneos-sdk" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/"/>\r
+       <property name="iphoneos-sdk" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/"/>\r
        <property name="iphonesimulator-platform" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin"/>\r
-       <property name="iphonesimulator-sdk" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk/"/>\r
+       <property name="iphonesimulator-sdk" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.0.sdk"/>\r
        \r
        <!-- define gcc compiler, options and files to compile -->\r
-       <property name="gcc" value="${compilerPrefix}gcc"/>     \r
-       <property name="gcc-opts" value="-c -Wall -O2"/>\r
+       <property name="gcc" value="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"/>     \r
+       <property name="gcc-opts" value="-c -Wall -O2 -miphoneos-version-min=5.1"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
                                <include name="memcpy_wrap.c"/>
@@ -28,17 +28,18 @@
        </fileset>\r
        \r
        <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${compilerPrefix}g++"/>\r
-       <property name="g++-opts" value="-c -Wall -O2"/>\r
+       <property name="g++" value="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"/>\r
+       <property name="g++-opts" value="-c -Wall -O2 -miphoneos-version-min=5.1"/>\r
        <fileset id="g++-files" dir="./">\r
                <exclude name="target/"/>\r
                                <include name="**/*.cpp"/>
 \r
-               \r
+                               <exclude name="android/**"/>
+\r
        </fileset>\r
 \r
        <!-- define linker and options -->\r
-       <property name="linker" value="${compilerPrefix}ar"/>\r
+       <property name="linker" value="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar"/>\r
        <property name="linker-opts" value="rcs"/>\r
        <property name="libraries" value=""/>\r
        \r
@@ -75,12 +76,13 @@
        <!-- compiles all C and C++ files to object files in the build directory, for 386 builds-->\r
        <target name="compile-386" depends="clean,create-build-dir">\r
                <mkdir dir="${buildDir}"/>\r
-               <apply failonerror="true" executable="${iphonesimulator-platform}/${g++}" dest="${buildDir}" verbose="true">\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
                        <arg line="-isysroot ${iphonesimulator-sdk} -arch i386 ${g++-opts}"/>\r
                        <arg value="-Ijni-headers"/>\r
                        <arg value="-Ijni-headers/${jniPlatform}"/>\r
                        <arg value="-I."/>\r
-                       \r
+                                               <arg value="-Iiosgl"/>
+\r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <targetfile/>\r
@@ -90,12 +92,13 @@
                                <mapper type="glob" from="*.mm" to="*.o"/>\r
                        </compositemapper>\r
                </apply>\r
-               <apply failonerror="true" executable="${iphonesimulator-platform}/${gcc}" dest="${buildDir}" verbose="true">\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="-isysroot ${iphonesimulator-sdk} -arch i386 ${gcc-opts}"/>\r
                        <arg value="-Ijni-headers"/>\r
                        <arg value="-Ijni-headers/${jniPlatform}"/>\r
                        <arg value="-I."/>\r
-                       \r
+                                               <arg value="-Iiosgl"/>
+\r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <targetfile/>\r
@@ -115,7 +118,7 @@
                </fileset>\r
                <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
                <mkdir dir="${libsDir}" />\r
-               <exec executable="${iphonesimulator-platform}/${linker}" failonerror="true" dir="${buildDir}">\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
                        <arg line="${linker-opts}" />\r
                        <arg path="${libsDir}/${libName}.386" />\r
                        <arg line="${objFiles}"/>\r
@@ -126,12 +129,13 @@
        <!-- compiles all C and C++ files to object files in the build directory, for 386 builds-->\r
        <target name="compile-arm" depends="create-build-dir,clean-objfiles">\r
                <mkdir dir="${buildDir}"/>\r
-               <apply failonerror="true" executable="${iphoneos-platform}/${g++}" dest="${buildDir}" verbose="true">\r
+               <apply failonerror="true" executable="${g++}" dest="${buildDir}" verbose="true">\r
                        <arg line="-isysroot ${iphoneos-sdk} -arch armv7 ${g++-opts}"/>\r
                        <arg value="-Ijni-headers"/>\r
                        <arg value="-Ijni-headers/${jniPlatform}"/>\r
                        <arg value="-I."/>\r
-                       \r
+                                               <arg value="-Iiosgl"/>
+\r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <targetfile/>\r
@@ -141,12 +145,13 @@
                                <mapper type="glob" from="*.mm" to="*.o"/>\r
                        </compositemapper>\r
                </apply>\r
-               <apply failonerror="true" executable="${iphoneos-platform}/${gcc}" dest="${buildDir}" verbose="true">\r
+               <apply failonerror="true" executable="${gcc}" dest="${buildDir}" verbose="true">\r
                        <arg line="-isysroot ${iphoneos-sdk} -arch armv7 ${gcc-opts}"/>\r
                        <arg value="-Ijni-headers"/>\r
                        <arg value="-Ijni-headers/${jniPlatform}"/>\r
                        <arg value="-I."/>\r
-                       \r
+                                               <arg value="-Iiosgl"/>
+\r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <targetfile/>\r
@@ -166,7 +171,7 @@
                </fileset>\r
                <pathconvert pathsep=" " property="objFiles" refid="objFileSet" />\r
                <mkdir dir="${libsDir}" />\r
-               <exec executable="${iphoneos-platform}/${linker}" failonerror="true" dir="${buildDir}">\r
+               <exec executable="${linker}" failonerror="true" dir="${buildDir}">\r
                        <arg line="${linker-opts}" />\r
                        <arg path="${libsDir}/${libName}.armv7" />\r
                        <arg line="${objFiles}"/>\r