fixed up ant build to exclude monotouch, some simplifications

diff --git a/build-mac-ios.xml b/build-mac-ios.xml
index f5520c7..63487df 100644 (file)
--- a/build-mac-ios.xml
+++ b/build-mac-ios.xml
@@ -1,45 +1,13 @@
 <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="ios-java-only">
-        <ant antfile="build.xml" target="gdx-backend-iosmonotouch" dir=".">
-                       <property name="compile-natives" value="false"/>
-               </ant>
-        <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>
-        <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/ios32/gdx-backend-ios.dll"/>
-               </ant>
-    </target>
     
-       <target name="core" depends="compile-jars">
+       <target name="core">
                <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/ios32/gdx-backend-ios.dll"/>
-               </ant>
-       </target>
-    
     <target name="backend-robovm" depends="core">
         <exec dir="backends/gdx-backend-robovm" executable="/bin/bash">
             <arg value="build-objectal.sh"/>
@@ -52,10 +20,6 @@
                        <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/ios32/gdx-freetype.dll"/>
-               </ant>
        </target>
        
        <target name="bullet" depends="core">
@@ -64,10 +28,6 @@
                        <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/ios32/gdx-bullet.dll"/>
-               </ant>
        </target>
        
        <target name="controllers" depends="core">
@@ -91,6 +51,6 @@
                </ant>
        </target>
        
-       <target name="all" depends="core,backend-iosmonotouch,backend-robovm,freetype,bullet,audio,image,controllers">  
+       <target name="all" depends="core,backend-robovm,freetype,bullet,audio,image,controllers">       
        </target>
 </project>

diff --git a/build-template.xml b/build-template.xml
index 2c727bf..c0089e9 100644 (file)
--- a/build-template.xml
+++ b/build-template.xml
@@ -86,22 +86,6 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
                <echo message="compiling natives code"/>\r
                <ant antfile="build.xml" target="clean" dir="${jni}"/>\r
                <ant antfile="build.xml" target="all" dir="${jni}"/>\r
-               <!-- copy shared libs for android -->\r
-               <copy failonerror="false" todir="${distDir}/armeabi">\r
-                       <fileset dir="${libs}/armeabi">\r
-                               <include name="**/*.so"/>\r
-                       </fileset>\r
-               </copy>\r
-               <copy failonerror="false" todir="${distDir}/armeabi-v7a">\r
-                       <fileset dir="${libs}/armeabi-v7a">\r
-                               <include name="**/*.so"/>\r
-                       </fileset>\r
-               </copy>\r
-        <copy failonerror="false" todir="${distDir}/x86">\r
-                       <fileset dir="${libs}/x86">\r
-                               <include name="**/*.so"/>\r
-                       </fileset>\r
-               </copy>\r
        </target>\r
        \r
        <!-- create source and class jar -->\r
@@ -120,7 +104,7 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
                        </fileset>\r
                </copy>\r
                \r
-               <!-- copy shared libs for android -->\r
+               <!-- copy shared libs for android & ios -->\r
                <copy failonerror="false" todir="${distDir}/armeabi">\r
                        <fileset dir="${libs}/armeabi">\r
                                <include name="**/*.so"/>\r
@@ -136,6 +120,11 @@ zipfileset id="jarfiles" -> the jar files to be merged with the project's classe
                                <include name="**/*.so"/>\r
                        </fileset>\r
                </copy>\r
+        <copy failonerror="false" todir="${distDir}/ios">\r
+                       <fileset dir="${libs}/ios32">\r
+                               <include name="**/*.a"/>\r
+                       </fileset>\r
+               </copy>\r
                \r
                <!-- class jar -->\r
                <jar destfile="${distDir}/${jar}.jar">\r

diff --git a/build.xml b/build.xml
index a6682f4..6f8de0d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -2,9 +2,6 @@
        <description>libgdx distribution build file</description>\r
        <property environment="env" />\r
 \r
-       <!-- ndk directory -->\r
-       <property name="env.NDK_HOME" value="/home/mzechner/android-ndk-r5"/>\r
-\r
        <!-- library version -->\r
        <property name="version" value="0.9.9-SNAPSHOT"/>\r
 \r
@@ -129,24 +126,6 @@
                </ant>\r
        </target>\r
 \r
-       <!-- gdx ios-monotouch backend -->\r
-       <target name="gdx-backend-iosmonotouch" depends="gdx-core">\r
-               <path id="classpath">\r
-                       <pathelement location="${distDir}/gdx.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/monotouch-5.4.0.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/mscorlib-4.0.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/opentk-5.4.0.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/system-2.1.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/system-core-2.1.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/monotouch-jars/system-data-2.1.jar"/>\r
-                       <pathelement location="${basedir}/backends/gdx-backend-iosmonotouch/libs/objectal/libObjectAL.jar"/>\r
-               </path>\r
-               <ant antfile="../../build-template.xml" dir="backends/gdx-backend-iosmonotouch">\r
-                       <property name="jar" value="gdx-backend-iosmonotouch"/>\r
-                       <reference refid="classpath"/>\r
-               </ant>\r
-       </target>\r
-\r
        <!-- build the extensions -->\r
        <!-- gdx tools -->\r
        <target name="gdx-tools" depends="gdx-core,gdx-backend-lwjgl,gdx-backend-lwjgl">\r
@@ -327,62 +306,17 @@
                        <fileset dir="backends" includes="gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglApplet.java"/>\r
                        <fileset dir="backends" includes="gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java"/>\r
                        <fileset dir="backends" includes="gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplicationConfiguration.java"/>\r
-                       <fileset dir="backends" includes="gdx-backend-iosmonotouch/src/com/badlogic/gdx/backends/ios/IOSApplication.java"/>\r
-                       <fileset dir="backends" includes="gdx-backend-iosmonotouch/src/com/badlogic/gdx/backends/ios/IOSApplicationConfiguration.java"/>\r
                        <fileset dir="backends" includes="gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/GwtApplication.java"/>\r
                        <fileset dir="backends" includes="gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/GwtApplicationConfiguration.java"/>\r
+            <fileset dir="backends" includes="gdx-backend-robovm/src/com/badlogic/gdx/backends/iosrobovm/IOSApplication.java"/>\r
+                       <fileset dir="backends" includes="gdx-backend-robovm/src/com/badlogic/gdx/backends/iosrobovm/IOSApplicationConfiguration.java"/>\r
                </javadoc>\r
        </target>\r
 \r
-       <!-- assumes that all the .dll and .a files have been compiled on a Mac and copied on top\r
-       of the current libgdx folder -->\r
-       <target name="copy-iosfiles">\r
-               <!-- copy dll and .a files as well as IKVM, monotouch and ObjectAL binaries to ios folder-->\r
-               <copy todir="${distDir}/ios" flatten="true" failonerror="false">\r
-                       <fileset dir="gdx/libs/ios32/">\r
-                               <include name="*.a"/>\r
-                               <include name="*.dll"/>\r
-                               <include name="*.dll.mdb"/>\r
-                       </fileset>\r
-                       <fileset dir="backends/gdx-backend-iosmonotouch/libs/ios32">\r
-                               <include name="*.dll"/>\r
-                               <include name="*.dll.mdb"/>\r
-                               <include name="*.a"/>\r
-                       </fileset>\r
-               </copy>\r
-               <copy todir="${distDir}/ios/ikvm" failonerror="false">\r
-                       <fileset dir="backends/gdx-backend-iosmonotouch/libs/ikvm"/>\r
-               </copy>\r
-               <copy todir="${distDir}/ios/monotouch-jars" failonerror="false">\r
-                       <fileset dir="backends/gdx-backend-iosmonotouch/libs/monotouch-jars"/>\r
-               </copy>\r
-               <copy todir="${distDir}/ios/objectal" failonerror="false">\r
-                       <fileset dir="backends/gdx-backend-iosmonotouch/libs/objectal"/>\r
-               </copy>\r
-\r
-               <!-- copy freetype extension dll and .a files -->\r
-               <copy todir="${distDir}/extensions/gdx-freetype/ios" failonerror="false">\r
-                       <fileset dir="extensions/gdx-freetype/libs/ios32">\r
-                               <include name="*.a"/>\r
-                               <include name="*.dll"/>\r
-                               <include name="*.dll.mdb"/>\r
-                       </fileset>\r
-               </copy>\r
-\r
-               <!-- copy bullet extension dll and .a files -->\r
-               <copy todir="${distDir}/extensions/gdx-bullet/ios" failonerror="false">\r
-                       <fileset dir="extensions/gdx-bullet/libs/ios32">\r
-                               <include name="*.a"/>\r
-                               <include name="*.dll"/>\r
-                               <include name="*.dll.mdb"/>\r
-                       </fileset>\r
-               </copy>\r
-       </target>\r
-\r
        <target name="jars"\r
-depends="clean,gdx-setup-ui,gdx-core,gdx-openal,gdx-backend-lwjgl,gdx-backend-jglfw,gdx-backend-android,gdx-backend-gwt,gdx-backend-robovm,gdx-backend-iosmonotouch,gdx-tools,gdx-controllers,gdx-controllers-desktop,gdx-controllers-android,gdx-controllers-gwt,gdx-image,gdx-audio,gdx-freetype,gdx-bullet,gdx-tiled-preprocessor"/>\r
+depends="clean,gdx-setup-ui,gdx-core,gdx-openal,gdx-backend-lwjgl,gdx-backend-jglfw,gdx-backend-android,gdx-backend-gwt,gdx-backend-robovm,gdx-tools,gdx-controllers,gdx-controllers-desktop,gdx-controllers-android,gdx-controllers-gwt,gdx-image,gdx-audio,gdx-freetype,gdx-bullet,gdx-tiled-preprocessor"/>\r
 \r
-       <target name="all" depends="jars,docs,copy-iosfiles">\r
+       <target name="all" depends="jars,docs">\r
                <!-- copy distribution files (licences etc.) -->\r
                <copy tofile="${distDir}/README" file="README.md"/>\r
                <copy tofile="${distDir}/LICENSE" file="LICENSE"/>\r

diff --git a/extensions/gdx-bullet/jni/build-ios32.xml b/extensions/gdx-bullet/jni/build-ios32.xml
index d2dd28b..616b375 100755 (executable)
--- a/extensions/gdx-bullet/jni/build-ios32.xml
+++ b/extensions/gdx-bullet/jni/build-ios32.xml
@@ -12,35 +12,35 @@
        <!-- 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" 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"/>\r
-               <include name="**/*.c"/>\r
+                               <include name="memcpy_wrap.c"/>
+               <include name="**/*.c"/>
 \r
-                               <exclude name="src/bullet/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
+                               <exclude name="src/bullet/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \r
        </fileset>\r
        \r
        <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${compilerPrefix}g++"/>\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 -fno-strict-aliasing -fno-rtti -DBT_NO_PROFILE"/>\r
        <fileset id="g++-files" dir="./">\r
                <exclude name="target/"/>\r
-                               <include name="**/*.cpp"/>\r
+                               <include name="**/*.cpp"/>
 \r
-                               <exclude name="src/bullet/BulletMultiThreaded/GpuSoftBodySolvers/**"/>\r
+                               <exclude name="src/bullet/BulletMultiThreaded/GpuSoftBodySolvers/**"/>
 \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
@@ -77,14 +77,14 @@
        <!-- 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
-                                               <arg value="-Isrc/bullet/"/>\r
-                       <arg value="-Isrc/custom/"/>\r
-                       <arg value="-Isrc/extras/Serialize/"/>\r
+                                               <arg value="-Isrc/bullet/"/>
+                       <arg value="-Isrc/custom/"/>
+                       <arg value="-Isrc/extras/Serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
@@ -95,14 +95,14 @@
                                <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
-                                               <arg value="-Isrc/bullet/"/>\r
-                       <arg value="-Isrc/custom/"/>\r
-                       <arg value="-Isrc/extras/Serialize/"/>\r
+                                               <arg value="-Isrc/bullet/"/>
+                       <arg value="-Isrc/custom/"/>
+                       <arg value="-Isrc/extras/Serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
@@ -123,7 +123,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
@@ -134,14 +134,14 @@
        <!-- 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
-                                               <arg value="-Isrc/bullet/"/>\r
-                       <arg value="-Isrc/custom/"/>\r
-                       <arg value="-Isrc/extras/Serialize/"/>\r
+                                               <arg value="-Isrc/bullet/"/>
+                       <arg value="-Isrc/custom/"/>
+                       <arg value="-Isrc/extras/Serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
@@ -152,14 +152,14 @@
                                <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
-                                               <arg value="-Isrc/bullet/"/>\r
-                       <arg value="-Isrc/custom/"/>\r
-                       <arg value="-Isrc/extras/Serialize/"/>\r
+                                               <arg value="-Isrc/bullet/"/>
+                       <arg value="-Isrc/custom/"/>
+                       <arg value="-Isrc/extras/Serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
@@ -180,7 +180,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

diff --git a/extensions/gdx-freetype/jni/build-ios32.xml b/extensions/gdx-freetype/jni/build-ios32.xml
index 0180a3d..d9c079b 100755 (executable)
--- a/extensions/gdx-freetype/jni/build-ios32.xml
+++ b/extensions/gdx-freetype/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 -miphoneos-version-min=5.1 -std=c99 -DFT2_BUILD_LIBRARY"/>\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 -DFT2_BUILD_LIBRARY"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
                                <include name="memcpy_wrap.c"/>
@@ -71,8 +71,8 @@
        </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 -miphoneos-version-min=5.1 -std=c99 -DFT2_BUILD_LIBRARY"/>\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 -DFT2_BUILD_LIBRARY"/>\r
        <fileset id="g++-files" dir="./">\r
                <exclude name="target/"/>\r
                                <include name="**/*.cpp"/>
@@ -81,7 +81,7 @@
        </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
@@ -118,7 +118,7 @@
        <!-- 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
@@ -134,7 +134,7 @@
                                <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
@@ -160,7 +160,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
@@ -171,7 +171,7 @@
        <!-- 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
@@ -187,7 +187,7 @@
                                <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
@@ -213,7 +213,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

diff --git a/extensions/gdx-freetype/jni/build-macosx32.xml b/extensions/gdx-freetype/jni/build-macosx32.xml
index 6d5db41..7cc0792 100644 (file)
--- a/extensions/gdx-freetype/jni/build-macosx32.xml
+++ b/extensions/gdx-freetype/jni/build-macosx32.xml
@@ -16,7 +16,7 @@
        \r
        <!-- define gcc compiler, options and files to compile -->\r
        <property name="gcc" value="${compilerPrefix}gcc${compilerSuffix}"/>    \r
-       <property name="gcc-opts" value="-c -Wall -O2 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5 -std=c99 -DFT2_BUILD_LIBRARY"/>\r
+       <property name="gcc-opts" value="-c -Wall -O2 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5 -DFT2_BUILD_LIBRARY"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
                                <include name="memcpy_wrap.c"/>
@@ -70,7 +70,7 @@
        \r
        <!-- define g++ compiler, options and files to compile -->\r
        <property name="g++" value="${compilerPrefix}g++${compilerSuffix}"/>\r
-       <property name="g++-opts" value="-c -Wall -O2 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5 -std=c99 -DFT2_BUILD_LIBRARY"/>\r
+       <property name="g++-opts" value="-c -Wall -O2 -arch i386 -arch x86_64 -DFIXED_POINT -fmessage-length=0 -fPIC -mmacosx-version-min=10.5 -DFT2_BUILD_LIBRARY"/>\r
        <fileset id="g++-files" dir="./">\r
                <exclude name="target/"/>\r
                                <include name="**/*.cpp"/>

diff --git a/extensions/gdx-freetype/src/com/badlogic/gdx/graphics/g2d/freetype/FreetypeBuild.java b/extensions/gdx-freetype/src/com/badlogic/gdx/graphics/g2d/freetype/FreetypeBuild.java
index 947ce8b..7eb43d1 100644 (file)
--- a/extensions/gdx-freetype/src/com/badlogic/gdx/graphics/g2d/freetype/FreetypeBuild.java
+++ b/extensions/gdx-freetype/src/com/badlogic/gdx/graphics/g2d/freetype/FreetypeBuild.java
@@ -104,8 +104,8 @@ public class FreetypeBuild {
                BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, false);\r
                mac.headerDirs = headers;\r
                mac.cIncludes = sources;\r
-               mac.cFlags += " -std=c99 -DFT2_BUILD_LIBRARY";\r
-               mac.cppFlags += " -std=c99 -DFT2_BUILD_LIBRARY";\r
+               mac.cFlags += " -DFT2_BUILD_LIBRARY";\r
+               mac.cppFlags += " -DFT2_BUILD_LIBRARY";\r
                mac.linkerFlags += " -framework CoreServices -framework Carbon";\r
 \r
                BuildTarget android = BuildTarget.newDefaultTarget(TargetOs.Android, false);\r
@@ -117,8 +117,8 @@ public class FreetypeBuild {
                BuildTarget ios = BuildTarget.newDefaultTarget(TargetOs.IOS, false);\r
                ios.headerDirs = headers;\r
                ios.cIncludes = sources;\r
-               ios.cFlags += " -std=c99 -DFT2_BUILD_LIBRARY";\r
-               ios.cppFlags += " -std=c99 -DFT2_BUILD_LIBRARY";\r
+               ios.cFlags += " -DFT2_BUILD_LIBRARY";\r
+               ios.cppFlags += " -DFT2_BUILD_LIBRARY";\r
 \r
                new NativeCodeGenerator().generate();\r
                new AntScriptGenerator().generate(new BuildConfig("gdx-freetype"), win32home, win32, win64, lin32, lin64, mac, android, ios);\r

diff --git a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template
index e3a6eb5..974722f 100755 (executable)
--- a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template
+++ b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/resources/scripts/build-ios.xml.template
@@ -12,12 +12,12 @@
        <!-- the compilerPrefix for the C & C++ compilers -->\r
        <property name="compilerPrefix" value="%compilerPrefix%"/>      \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" value="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"/>     \r
        <property name="gcc-opts" value="%cFlags%"/>\r
        <fileset id="gcc-files" dir="./">\r
                <exclude name="target/"/>               \r
@@ -26,7 +26,7 @@
        </fileset>\r
        \r
        <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${compilerPrefix}g++"/>\r
+       <property name="g++" value="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"/>\r
        <property name="g++-opts" value="%cppFlags%"/>\r
        <fileset id="g++-files" dir="./">\r
                <exclude name="target/"/>\r
@@ -35,7 +35,7 @@
        </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="%linkerFlags%"/>\r
        <property name="libraries" value="%libraries%"/>\r
        \r
@@ -72,7 +72,7 @@
        <!-- 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
@@ -87,7 +87,7 @@
                                <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
@@ -112,7 +112,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
@@ -123,7 +123,7 @@
        <!-- 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
@@ -138,7 +138,7 @@
                                <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
@@ -163,7 +163,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

diff --git a/gdx/jni/build-ios32.xml b/gdx/jni/build-ios32.xml
index 40effcb..42f71e9 100755 (executable)
--- a/gdx/jni/build-ios32.xml
+++ b/gdx/jni/build-ios32.xml
@@ -12,12 +12,12 @@
        <!-- 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" 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
@@ -28,7 +28,7 @@
        </fileset>\r
        \r
        <!-- define g++ compiler, options and files to compile -->\r
-       <property name="g++" value="${compilerPrefix}g++"/>\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
@@ -39,7 +39,7 @@
        </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
@@ -76,7 +76,7 @@
        <!-- 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
@@ -92,7 +92,7 @@
                                <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
@@ -118,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
@@ -129,7 +129,7 @@
        <!-- 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
@@ -145,7 +145,7 @@
                                <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
@@ -171,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

diff --git a/gdx/src/com/badlogic/gdx.gwt.xml b/gdx/src/com/badlogic/gdx.gwt.xml
index 30fdc81..9c5a759 100644 (file)
--- a/gdx/src/com/badlogic/gdx.gwt.xml
+++ b/gdx/src/com/badlogic/gdx.gwt.xml
@@ -398,6 +398,7 @@
                <include name="scenes/scene2d/utils/ChangeListener.java"/>
                <include name="scenes/scene2d/utils/ClickListener.java"/>
                <include name="scenes/scene2d/utils/Cullable.java"/>
+               <include name="scenes/scene2d/utils/Disableable.java"/>
                <include name="scenes/scene2d/utils/DragAndDrop.java"/>
                <include name="scenes/scene2d/utils/DragListener.java"/>
                <include name="scenes/scene2d/utils/DragScrollListener.java"/>