From 4745f73655a42ce53f889c091808bbba1eacc142 Mon Sep 17 00:00:00 2001
From: David Chavez <david@dcvz.io>
Date: Tue, 19 Jul 2022 01:30:29 +0200
Subject: [PATCH] [macOS] Bring support down to macOS 10.15 (#816)

* Pull out CC and CXX flags

* Set minimum deployment target

* Update version to 3.0.0
---
 Jenkinsfile           | 9 +++++++--
 soh/macosx/Info.plist | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8ea6317a4..7f3589ec8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -125,6 +125,11 @@ pipeline {
                     agent {
                         label "SoH-Mac-Builders"
                     }
+                    environment {
+                        CC = 'clang -arch arm64 -arch x86_64'
+                        CXX = 'clang++ -arch arm64 -arch x86_64'
+                        MACOSX_DEPLOYMENT_TARGET = 10.15
+                    }
                     steps {
                         checkout([
                             $class: 'GitSCM',
@@ -137,8 +142,8 @@ pipeline {
                             sh '''
                             cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
                             cd soh
-                            export CC="clang -arch arm64 -arch x86_64"; export CXX="clang++ -arch arm64 -arch x86_64"; make setup -j4 OPTFLAGS=-O2 DEBUG=0 LD="ld"
-                            export CC="clang -arch arm64 -arch x86_64"; export CXX="clang++ -arch arm64 -arch x86_64"; make -j4 DEBUG=0 OPTFLAGS=-O2 LD="ld"
+                            make setup -j4 OPTFLAGS=-O2 DEBUG=0 LD="ld"
+                            make -j4 DEBUG=0 OPTFLAGS=-O2 LD="ld"
                             make -j4 appbundle
                             mv ../README.md readme.txt
                             7z a soh-mac.7z soh.app readme.txt
diff --git a/soh/macosx/Info.plist b/soh/macosx/Info.plist
index f657ef657..d42198f02 100644
--- a/soh/macosx/Info.plist
+++ b/soh/macosx/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleExecutable</key>
     <string>soh</string>
     <key>CFBundleGetInfoString</key>
-    <string>2.0.0</string>
+    <string>3.0.0</string>
     <key>CFBundleIconFile</key>
     <string>soh.icns</string>
     <key>CFBundleIdentifier</key>
@@ -22,14 +22,14 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.0.0</string>
+    <string>3.0.0</string>
     <key>CFBundleSignature</key>
     <string>ZOoT</string>
     <key>CFBundleVersion</key>
-    <string>2.0.0</string>
+    <string>3.0.0</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 2022 HarbourMasters.</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.3</string>
+    <string>10.15</string>
 </dict>
 </plist>