diff options
| author | Sven Gothel <[email protected]> | 2023-01-14 17:41:44 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-14 17:41:44 +0100 |
| commit | 2fc456b93588f9a6973403cb27409bbf54ecbef4 (patch) | |
| tree | cfb713049ff37e06cd4ae7db790b004982b8cdd8 /make | |
| parent | 0b441cfc14947b1c8cabdc87705ae95a0afec4d9 (diff) | |
MacOS: Add fat universal build w/ x86_64 + aarch64; Bump min SDK version >= 11.0
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 8 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 414a4de..cda6592 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1229,10 +1229,12 @@ <compilerarg value="i386" if="use.macosx32"/> <compilerarg value="-arch" if="use.macosx64"/> <compilerarg value="x86_64" if="use.macosx64"/> + <compilerarg value="-arch" if="use.macosx64"/> + <compilerarg value="arm64" if="use.macosx64"/> <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard --> <compilerarg value="-Wmost" /> <compilerarg value="-ObjC" /> - <compilerarg value="-mmacosx-version-min=10.5"/> + <compilerarg value="-mmacosx-version-min=11.0"/> <!-- sysincludepath path="${macosx.sdkroot}" if="macosx.sdkroot"/ --> <defineset> <define name="_DEBUG" if="c.compiler.use-debug"/> @@ -1465,7 +1467,9 @@ <linkerarg value="i386" if="use.macosx32"/> <linkerarg value="-arch" if="use.macosx64"/> <linkerarg value="x86_64" if="use.macosx64"/> - <linkerarg value="-mmacosx-version-min=10.5"/> + <linkerarg value="-arch" if="use.macosx64"/> + <linkerarg value="arm64" if="use.macosx64"/> + <linkerarg value="-mmacosx-version-min=11.0"/> <linkerarg value="-static-libgcc" if="isGCC"/> <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index a5575f8..b49d1f4 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -8,7 +8,7 @@ - Java 1.8 (Level 8.0) - Android SDK API level 24 (Version 7.0 Nougat, released August 2016) - Official production builds are performed _on_ OpenJDK 11 + Official production builds are performed _on_ OpenJDK 11 or 17 and a Java JDK 11 or greater is required! Target Java 8 baseline is chosen today, June 2019, @@ -86,6 +86,11 @@ <equals arg1="${ant.java.version}" arg2="12"/> <equals arg1="${ant.java.version}" arg2="13"/> <equals arg1="${ant.java.version}" arg2="14"/> + <equals arg1="${ant.java.version}" arg2="15"/> + <equals arg1="${ant.java.version}" arg2="16"/> + <equals arg1="${ant.java.version}" arg2="17"/> + <equals arg1="${ant.java.version}" arg2="18"/> + <equals arg1="${ant.java.version}" arg2="19"/> </or> </not> </condition> @@ -109,6 +114,11 @@ <equals arg1="${ant.java.version}" arg2="12"/> <equals arg1="${ant.java.version}" arg2="13"/> <equals arg1="${ant.java.version}" arg2="14"/> + <equals arg1="${ant.java.version}" arg2="15"/> + <equals arg1="${ant.java.version}" arg2="16"/> + <equals arg1="${ant.java.version}" arg2="17"/> + <equals arg1="${ant.java.version}" arg2="18"/> + <equals arg1="${ant.java.version}" arg2="19"/> </or> </condition> <echo message="javadoc.xarg1 ${javadoc.xarg1}"/> |