From: Keith Packard <keithp@keithp.com>
Date: Wed, 9 Feb 2022 17:51:33 +0000 (-0800)
Subject: libaltos: Build Mac OSX libaltos.dylib for arm64 too
X-Git-Tag: 1.9.10.4~55
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d11edd6d595eb1a0786f61d4ae4bdf37ecf1a4fb

libaltos: Build Mac OSX libaltos.dylib for arm64 too

Make this work on the M1.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/install-macosx b/altosui/install-macosx
index c39fb85e..721a3d1c 100755
--- a/altosui/install-macosx
+++ b/altosui/install-macosx
@@ -20,8 +20,8 @@ case `id -u` in
 esac
 
 # Check for java
-if ls "$JVM" | grep -q adopt; then
-    echo "Adopt OpenJDK already present"
+if ls "$JVM" | grep -q temurin; then
+    echo "Adoptium already present"
 else
     open https://adoptium.net/
     osascript -e 'display dialog "Install Java from https://adoptium.net then click Continue" buttons {"Continue"} default button 1 with title "Install Java"' >/dev/null
diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone
index 77c7cca5..dce602a9 100644
--- a/libaltos/Makefile-standalone
+++ b/libaltos/Makefile-standalone
@@ -34,11 +34,11 @@ OS_SRCS=libaltos_posix.c libaltos_darwin.c
 #	-iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
 
 XCODE=/Applications/Xcode.app
-SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk
+SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
 MINVERSION=10.5
 
 OS_LIB_CFLAGS=\
-	-DDARWIN -DPOSIX_TTY -arch x86_64 -isysroot $(SDK) \
+	-DDARWIN -DPOSIX_TTY -arch x86_64 -arch arm64 -isysroot $(SDK) \
 	-mmacosx-version-min=10.5 \
 	-iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
 	-iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib
index 0d5b9c46..fcc46efe 100755
Binary files a/libaltos/libaltos.dylib and b/libaltos/libaltos.dylib differ