iOS: Build x86_64 instead of i386, update jar-excludes (new naming scheme of jme), ignore "ios-base" Library since it doesn't seem to be used anymore.

jme3-ios/ios-data/templates/ios.properties

@@ -5,6 +5,7 @@ ios.platform=ios
 ios.arm.flag=armv7
 ios.arm64.flag=arm64
 ios.i386.flag=i386
+ios.x86_64.flag=x86_64
 
 # java build paths
 ios.build.classpath.dir=build/ios-classpath
@@ -12,11 +13,11 @@ ios.java.classes.dir=${ios.build.classpath.dir}/build
 ios.build.classes.dir=${ios.build.classpath.dir}/classpath
 ios.build.resources.jar=${ios.build.classpath.dir}/resources.jar
 ios.classpath.checkfile=${ios.build.classpath.dir}/.classpath.last
-ios.jar.excludes=jME3-desktop.jar, \
-jME3-blender.jar, \
-jME3-lwjgl.jar, \
-jME3-lwjgl-natives.jar, \
-jME3-bullet-natives.jar, \
+ios.jar.excludes=jme3-desktop-*.jar, \
+jme3-blender-*.jar, \
+jme3-lwjgl-*.jar, \
+jme3-lwjgl-platform-*-natives-*.jar, \
+jme3-bullet-native-*.jar, \
 jinput.jar, \
 lwjgl.jar
 ios.classpath.excludes=**/de/lessvoid/nifty/ClipboardAWT.class
@@ -61,9 +62,11 @@ ios.cc.cflags=-D__IPHONE_OS_VERSION_MIN_REQUIRED=30202 \
 ios.avian.path.arm=${ios.avian.path}/avian-arm
 ios.avian.path.arm64=${ios.avian.path}/avian-arm64
 ios.avian.path.i386=${ios.avian.path}/avian-i386
+ios.avian.path.x86_64=${ios.avian.path}/avian-x86_64
 ios.avian.arm.classpath=${ios.avian.path}/classpath
 ios.avian.arm64.classpath=${ios.avian.path}/classpath
 ios.avian.i386.classpath=${ios.avian.path}/classpath
+ios.avian.x86_64.classpath=${ios.avian.path}/classpath
 
 ios.avian.arm.bootimage-generator=${ios.avian.path.arm}/bootimage-generator
 ios.avian.arm.generator=${ios.avian.path.arm}/generator
@@ -77,6 +80,10 @@ ios.avian.i386.bootimage-generator=${ios.avian.path.i386}/bootimage-generator
 ios.avian.i386.generator=${ios.avian.path.i386}/generator
 ios.avian.i386.converter=${ios.avian.path.i386}/binaryToObject
 ios.avian.i386.binary=${ios.avian.path.i386}/libavian.a
+ios.avian.x86_64.bootimage-generator=${ios.avian.path.x86_64}/bootimage-generator
+ios.avian.x86_64.generator=${ios.avian.path.x86_64}/generator
+ios.avian.x86_64.converter=${ios.avian.path.x86_64}/binaryToObject
+ios.avian.x86_64.binary=${ios.avian.path.x86_64}/libavian.a
 
 # XCode project
 ios.xcode.project.dir=ios/project

jme3-ios/src/com/jme3/gde/ios/ios-targets.xml

@@ -1,7 +1,7 @@
     <target name="build-ios">
         <antcall target="build-ios-arm" inheritall="false" inheritrefs="false"/>
         <antcall target="build-ios-arm64" inheritall="false" inheritrefs="false"/>
-        <antcall target="build-ios-i386" inheritall="false" inheritrefs="false"/>
+        <antcall target="build-ios-x86_64" inheritall="false" inheritrefs="false"/>
         <echo>The needed native iOS libraries have been built, open the XCode project at ios/project to run the application on iOS.</echo>
     </target>
 
@@ -9,7 +9,7 @@
     
     <target name="build-ios-arm64" depends="init, -init-platform-arm64, -create-properties, -build-ios" description="Builds iOS libraries for device"/>
     
-    <target name="build-ios-i386" depends="init, -init-platform-i386, -create-properties, -build-ios" description="Builds iOS libraries for simulator"/>
+    <target name="build-ios-x86_64" depends="init, -init-platform-x86_64, -create-properties, -build-ios" description="Builds iOS libraries for simulator (64 bit)"/>
 
     <target name="-init-platform-arm" description="Initialize for arm platform">
         <property name="ios.arch" value="arm"/>
@@ -21,12 +21,12 @@
         <property file="ios/ios.properties"/>
     </target>
     
-    <target name="-init-platform-i386" description="Initialize for i386 platform">
-        <property name="ios.arch" value="i386"/>
+    <target name="-init-platform-x86_64" description="Initialize for x86_64 platform">
+        <property name="ios.arch" value="x86_64"/>
         <property file="ios/ios.properties"/>
     </target>
     
-    <target name="-check-properties-platform" description="Checks the used platform (arm/i386)">
+    <target name="-check-properties-platform" description="Checks the used platform (arm/x86_64)">
         <taskdef resource="proguard/ant/task.properties"
              classpath="${libs.pro-guard.classpath}"/>
         <condition property="ios.do.arm">
@@ -35,8 +35,8 @@
         <condition property="ios.do.arm64">
             <equals arg1="${ios.arch}" arg2="arm64"/>
         </condition>
-        <condition property="ios.do.i386">
-            <equals arg1="${ios.arch}" arg2="i386"/>
+        <condition property="ios.do.x86_64">
+            <equals arg1="${ios.arch}" arg2="x86_64"/>
         </condition>
     </target>
     
@@ -62,18 +62,18 @@
         <property name="ios.avian.binary" value="${ios.avian.arm64.binary}"/>
     </target>
 
-    <target name="-create-properties-i386" if="ios.do.i386" description="Sets properties for i386 build">
+    <target name="-create-properties-x86_64" if="ios.do.x86_64" description="Sets properties for x86_64 build">
         <property name="ios.target" value="iPhoneSimulator"/>
-        <property name="ios.arch.flag" value="${ios.i386.flag}"/>
+        <property name="ios.arch.flag" value="${ios.x86_64.flag}"/>
         
-        <property name="ios.avian.classpath" value="${ios.avian.i386.classpath}"/>
-        <property name="ios.avian.bootimage-generator" value="${ios.avian.i386.bootimage-generator}"/>
-        <property name="ios.avian.generator" value="${ios.avian.i386.generator}"/>
-        <property name="ios.avian.converter" value="${ios.avian.i386.converter}"/>
-        <property name="ios.avian.binary" value="${ios.avian.i386.binary}"/>
+        <property name="ios.avian.classpath" value="${ios.avian.x86_64.classpath}"/>
+        <property name="ios.avian.bootimage-generator" value="${ios.avian.x86_64.bootimage-generator}"/>
+        <property name="ios.avian.generator" value="${ios.avian.x86_64.generator}"/>
+        <property name="ios.avian.converter" value="${ios.avian.x86_64.converter}"/>
+        <property name="ios.avian.binary" value="${ios.avian.x86_64.binary}"/>
     </target>
     
-    <target name="-create-properties" depends="-check-properties-platform, -create-properties-arm, -create-properties-arm64, -create-properties-i386" description="Sets global properties based on platform">
+    <target name="-create-properties" depends="-check-properties-platform, -create-properties-arm, -create-properties-arm64, -create-properties-x86_64" description="Sets global properties based on platform">
         <property name="ios.sdk.sysroot" value="${ios.dev.root}/Platforms/${ios.target}.platform/Developer/SDKs/${ios.target}${ios.version}.sdk"/>
         <property name="ios.cc.compiler.path" value="${ios.dev.root}/Toolchains/XcodeDefault.xctoolchain/usr/bin/${ios.cc.compiler}"/>
         <property name="ios.cc.flags" value="-isysroot ${ios.sdk.sysroot} -arch ${ios.arch.flag}"/>
@@ -92,7 +92,7 @@
         <javac
             destdir="${ios.java.classes.dir}"
             srcdir="${ios.cc.source.dir}"
-            classpath="${run.classpath}:${libs.ios-base.classpath}"/>
+            classpath="${run.classpath}"/>
         <copy todir="${ios.java.classes.dir}">
             <fileset dir="${ios.cc.source.dir}" excludes="${build.classes.excludes},${excludes},**/*.c,**/*.m" includes="${includes}"/>
         </copy>
@@ -120,7 +120,7 @@
             </path>
         </pathconvert>
         <proguard>
-            -injars  ${ios.avian.classpath}:${ios.java.classes.dir}:${libs.ios-base.classpath}:${ios.avian.project.classpath}
+            -injars  ${ios.avian.classpath}:${ios.java.classes.dir}:${ios.avian.project.classpath}
             -outjars ${ios.build.classes.dir}(**.class)
             -outjars ${ios.build.resources.jar}
             -include ${ios.proguard.vm.path}

jme3-ios/src/com/jme3/gde/ios/panel/IosCompositeProvider.java

@@ -106,7 +106,6 @@ public class IosCompositeProvider implements ProjectCustomizer.CompositeCategory
         public SavePropsListener(ProjectExtensionProperties props, Project project) {
             this.properties = props;
             this.project = project;
-            manager.setAntTaskLibrary("ios-base");
         }
 
         public void actionPerformed(ActionEvent e) {