From 2fc456b93588f9a6973403cb27409bbf54ecbef4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 14 Jan 2023 17:41:44 +0100
Subject: MacOS: Add fat universal build w/ x86_64 + aarch64; Bump min SDK
 version >= 11.0

---
 make/gluegen-cpptasks-base.xml |  8 ++++++--
 make/jogamp-env.xml            | 12 +++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'make')

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}"/>
-- 
cgit v1.2.3