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 /make/gluegen-properties.xml | |
| 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 'make/gluegen-properties.xml')
| -rwxr-xr-x | make/gluegen-properties.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index 8038de3..54fbc8c 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -88,10 +88,16 @@ <!-- maybe overriden, e.g. with "clang" --> <echo message="Setting default gcc.compat.compiler" /> <condition property="gcc.compat.compiler" value="xcode.clang"> <!-- default for OSX --> - <and> - <os family="mac"/> - <os family="unix"/> - </and> + <or> + <istrue value="${isOSX}"/> + <istrue value="${isIOS}"/> + <istrue value="${isIOSAmd64}"/> + <istrue value="${isIOSArm64}"/> + <and> + <os family="mac"/> + <os family="unix"/> + </and> + </or> </condition> <property name="gcc.compat.compiler" value="gcc"/> <!-- default for all others .. --> <echo message="gcc.compat.compiler=${gcc.compat.compiler}" /> |