diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 8cac554..8410ec9 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -218,20 +218,10 @@ <condition property="c.strip.libraries"><isfalse value="${c.compiler.debug}"/></condition> <!-- NOTE: the values of the macos<arch> attributes will not be overridden if already set externally --> - <property name="macosppc" value="false" /> - <property name="macosx64" value="true" /> - <property name="macosx32" value="false" /> <!-- we disable 32bit on OSX for good now --> + <property name="macosppc" value="false" /> <!-- permanently disabled --> + <property name="macosx32" value="false" /> <!-- permanently disabled --> + <property name="macosx64" value="true" /> <!-- for x86_64 and arm64 --> - <!-- Need a way to be able to disable the macosx64 property specification in a build.xml --> - <condition property="use.macosppc"> - <istrue value="${macosppc}" /> - </condition> - <condition property="use.macosx32"> - <and> - <istrue value="${macosx32}" /> - <os family="mac"/> - </and> - </condition> <condition property="use.macosx64"> <and> <istrue value="${macosx64}" /> @@ -1223,40 +1213,16 @@ <!-- MacOSX compiler configuration. - 2023-05-04 Actively supported architectures are 'x86_64' and 'arm64'. - - XCode 14.2 on a MacOS 12.6.5 x86_64 (mac-mini) machine - using MacOS SDK 11.3 is capable to produce fat-lipo code - for MacOS >= 10.5 lipo libs covering 'x86_64' and 'arm64'. - The MacOS SDK 11.3 has been re-added from a previous XCode installation. - However, alternative source is <https://github.com/phracker/MacOSX-SDKs>. - - Only for using C++ and hence the C++ STL, - the minimum version is 10.7 due to clang++ libc++. - This is currently the case for JOAL's bundled openal-soft, - as well as for JOGL's optional oculusvr-sdk (disabled). - - The official JogAmp build uses - - `export SDKROOT=macosx11.3` (environment variable) - - `java.lib.dir.platform=/Users/jogamp/temurin-17.jdk.fat.lib` (file ~/gluegen.properties) - - generated by `make/scripts/make.macosx.jdk_lipo_libs.sh` - - Sync with doc/HowToBuild.html + See and sync-with doc/HowToBuild.html and doc/JogAmpMacOSVersions.md --> <compiler id="compiler.cfg.macosx" name="${gcc.compat.compiler}"> - <!-- Note: Apple doesn't seem to provide ppc binaries on Snow Leopard --> - <compilerarg value="-arch" if="use.macosppc"/> - <compilerarg value="ppc" if="use.macosppc"/> - <compilerarg value="-arch" if="use.macosx32"/> - <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=10.7"/> <!-- sysincludepath path="${macosx.sdkroot}" if="macosx.sdkroot"/ --> <defineset> <define name="_DEBUG" if="c.compiler.use-debug"/> @@ -1483,15 +1449,11 @@ <linker id="linker.cfg.macosx" name="${gcc.compat.compiler}"> <!-- compilerarg value="-v"/ --> - <linkerarg value="-arch" if="use.macosppc"/> - <linkerarg value="ppc" if="use.macosppc"/> - <linkerarg value="-arch" if="use.macosx32"/> - <linkerarg value="i386" if="use.macosx32"/> <linkerarg value="-arch" if="use.macosx64"/> <linkerarg value="x86_64" if="use.macosx64"/> <linkerarg value="-arch" if="use.macosx64"/> <linkerarg value="arm64" if="use.macosx64"/> - <linkerarg value="-mmacosx-version-min=11.0"/> + <linkerarg value="-mmacosx-version-min=10.7"/> <linkerarg value="-static-libgcc" if="isGCC"/> <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> |