diff options
author | Sven Gothel <[email protected]> | 2019-06-17 03:59:22 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-06-17 03:59:22 +0200 |
commit | 52a6d4ef4133a998824236af9bb48d0ea65359a9 (patch) | |
tree | 938009aba624e4609cd62803586d2eaf7b0e17a1 /src/java/com/jogamp/common/util | |
parent | 97622eb70b1ff720d91d768768b7a996ac01ad78 (diff) |
iOS: Initial iOS support commit: build.xml targets, java code-path etc
Current build system for JogAmp iOS Build is:
- Build Machine: OSX Mojave 10.14
- Using own (still proprietary) OpenJDK 9 iOS Build
- OpenJDK 1.8 (This will be replaced by OpenJDK 11 soon)
- Xcode 10.2
Diffstat (limited to 'src/java/com/jogamp/common/util')
-rw-r--r-- | src/java/com/jogamp/common/util/IOUtil.java | 3 | ||||
-rw-r--r-- | src/java/com/jogamp/common/util/JarUtil.java | 2 | ||||
-rw-r--r-- | src/java/com/jogamp/common/util/VersionUtil.java | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java index 0bee22b..380cb00 100644 --- a/src/java/com/jogamp/common/util/IOUtil.java +++ b/src/java/com/jogamp/common/util/IOUtil.java @@ -863,6 +863,7 @@ public class IOUtil { switch(PlatformPropsImpl.OS_TYPE) { case ANDROID: case MACOS: + case IOS: case WINDOWS: case OPENKODE: return false; @@ -1273,7 +1274,7 @@ public class IOUtil { // 1) java.io.tmpdir/jogamp if( null == tempRootExec && null != java_io_tmpdir ) { - if( Platform.OSType.MACOS == PlatformPropsImpl.OS_TYPE ) { + if( Platform.OSType.MACOS == PlatformPropsImpl.OS_TYPE || Platform.OSType.IOS == PlatformPropsImpl.OS_TYPE ) { // Bug 865: Safari >= 6.1 [OSX] May employ xattr on 'com.apple.quarantine' on 'PluginProcess.app' // We attempt to fix this issue _after_ gluegen native lib is loaded, see JarUtil.fixNativeLibAttribs(File). tempRootExec = getSubTempDir(java_io_tmpdir, tmpSubDir, false /* executable */, "tempX1"); diff --git a/src/java/com/jogamp/common/util/JarUtil.java b/src/java/com/jogamp/common/util/JarUtil.java index d6c8fd4..aa5719c 100644 --- a/src/java/com/jogamp/common/util/JarUtil.java +++ b/src/java/com/jogamp/common/util/JarUtil.java @@ -660,7 +660,7 @@ public class JarUtil { // We tolerate UnsatisfiedLinkError (and derived) to solve the chicken and egg problem // of loading gluegen's native library. // On Safari(OSX), Bug 865, we simply hope the destination folder is executable. - if( Platform.OSType.MACOS == Platform.getOSType() ) { + if( Platform.OSType.MACOS == Platform.getOSType() || Platform.OSType.IOS == Platform.getOSType() ) { final String fileAbsPath = file.getAbsolutePath(); try { fixNativeLibAttribs(fileAbsPath); diff --git a/src/java/com/jogamp/common/util/VersionUtil.java b/src/java/com/jogamp/common/util/VersionUtil.java index 6fec8fa..b9e8568 100644 --- a/src/java/com/jogamp/common/util/VersionUtil.java +++ b/src/java/com/jogamp/common/util/VersionUtil.java @@ -75,6 +75,7 @@ public class VersionUtil { sb.append("Platform: Java Vendor: ").append(Platform.getJavaVendor()).append(", ").append(Platform.getJavaVendorURL()); sb.append(", JavaSE: ").append(PlatformPropsImpl.JAVA_SE); sb.append(", Java6: ").append(PlatformPropsImpl.JAVA_6); + sb.append(", dynamicLib: ").append(PlatformPropsImpl.useDynamicLibraries); sb.append(", AWT enabled: ").append(Platform.AWT_AVAILABLE); sb.append(Platform.getNewline()).append(SEPERATOR); |