<!-- 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.0.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.0.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"/>
</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
<!-- 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
<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
</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
<!-- 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
<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
</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