Sfoglia il codice sorgente

iOS:
- update avian compiler to jdk 1.7u40

Former-commit-id: 971227098b253b2b66d8fc3ba2c92f1c84efdc1e

normen667 11 anni fa
parent
commit
c07668770c

+ 2 - 1
ios-data/templates/ios.properties

@@ -45,7 +45,8 @@ ios.proguard.options=-keep public class com.jme3.system.ios.*{public *;} \
 -keep public class * implements de.lessvoid.nifty.screen.ScreenController{public *;} \
 -keep public class * implements javax.xml.parsers.SAXParserFactory{public *;} \
 -keep public class com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl \
--keep public class com.sun.org.apache.xerces.internal.impl.dv.dtd.DTDDVFactoryImpl
+-keep public class com.sun.org.apache.xerces.internal.impl.dv.dtd.DTDDVFactoryImpl \
+-keep public class sun.nio.fs.MacOSXFileSystemProvider
 
 # native compile
 ios.cc.source.dir=ios/src

+ 2 - 2
nbproject/project.properties

@@ -1,8 +1,8 @@
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 # avian compile locations
-avian.jdk.path=/Users/normenhansen/Documents/Code-Import/avian-ios/1.7.0u4.jdk/Contents/Home/
-avian.jdk.src.path=/Users/normenhansen/Documents/Code-Import/avian-ios/jdk7u4/jdk/src/
+avian.jdk.path=/Users/normenhansen/Documents/Code-Import/avian-ios/openjdk-1.7.0-u40-unofficial-macosx-x86_64-image
+avian.jdk.src.path=/Users/normenhansen/Documents/Code-Import/avian-ios/openjdk7u40/jdk/src/
 avian.src.path=/Users/normenhansen/Documents/Code-Import/avian-ios/avian/
 hello-ios.src.path=/Users/normenhansen/Documents/Code-Import/avian-ios/hello-ios/
 license.file=licenses.txt

+ 1 - 1
src/com/jme3/gde/ios/avian-openjdk-mac.zip.REMOVED.git-id

@@ -1 +1 @@
-73e91dc012e609bf8746f5ab21d22b3e479b00dc
+f50bfbcee0717a0574d08c068a0d6b529cd828f7

BIN
src/com/jme3/gde/ios/ios-data.zip


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

@@ -96,8 +96,8 @@ public class IosCompositeProvider implements ProjectCustomizer.CompositeCategory
     private class SavePropsListener implements ActionListener {
 
         private String extensionName = "ios";
-        private String extensionVersion = "v0.3";
-        private String avianVersion = "v0.4.3";
+        private String extensionVersion = "v0.4";
+        private String avianVersion = "v0.5";
         private String[] extensionDependencies = new String[]{"jar", "build-ios"};
         private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies);
         private ProjectExtensionProperties properties;