From 2fc456b93588f9a6973403cb27409bbf54ecbef4 Mon Sep 17 00:00:00 2001 From: Sven Gothel 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 --- doc/HowToBuild.html | 8 ++++---- make/gluegen-cpptasks-base.xml | 8 ++++++-- make/jogamp-env.xml | 12 +++++++++++- src/java/jogamp/common/os/PlatformPropsImpl.java | 4 ++++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html index 168cc27..941cf88 100644 --- a/doc/HowToBuild.html +++ b/doc/HowToBuild.html @@ -55,7 +55,7 @@
  • Use your Unix distribution's version, if available, or
  • Source Code for GNU/Linux, MacOS, .., or
  • Git on Windows is provided by cygwin
  • -
  • Git ≥ 2.11 on MacOS is provided by Xcode ≥ 8.3.3
  • +
  • Git ≥ 2.37 provided by Xcode ≥ 14
  • @@ -146,11 +146,11 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
  • MacOS and iOS Intel and Arm64
  • Windows/x86 (32 bit) 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 @@ + + - + @@ -1465,7 +1467,9 @@ - + + + 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 @@ + + + + + @@ -109,6 +114,11 @@ + + + + + diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java index 1d38f30..aff3d68 100644 --- a/src/java/jogamp/common/os/PlatformPropsImpl.java +++ b/src/java/jogamp/common/os/PlatformPropsImpl.java @@ -46,6 +46,10 @@ public abstract class PlatformPropsImpl { public static final VersionNumber Lion = new VersionNumber(10,7,0); /** OSX Mavericks, i.e. 10.9.0 */ public static final VersionNumber Mavericks = new VersionNumber(10,9,0); + /** OSX Mojave, i.e. 10.14.0 */ + public static final VersionNumber Mojave = new VersionNumber(10,14,0); + /** OSX Big Sur, i.e. 11.00.0 */ + public static final VersionNumber BigSur = new VersionNumber(11,0,0); } /** -- cgit v1.2.3