From 0a8ecd6223e25e8125477093ecc2c87fdd369767 Mon Sep 17 00:00:00 2001
From: linear <dev@linear.network>
Date: Sun, 5 Sep 2021 01:06:37 -0700
Subject: Fix building on macOS/arm64

Homebrew installs to a different directory on macOS/arm64.

this adds checks in the Makefile and in kristall.pro, and sets
the correct paths to Homebrew depending on whether the build is
targeting arm64 or not.
---
 Makefile         |  7 ++++++-
 src/kristall.pro | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 8e38b75..77c2bf5 100644
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,14 @@ QMAKE_COMMAND := qmake
 # QMAKE_COMMAND := /usr/bin/qmake-qt5
 
 UNAME := $(shell uname)
+UNAME_M := $(shell uname -m)
 # Homebrew on macOS does not link Qt5 into the system path.
 ifeq ($(UNAME),Darwin)
-	HOMEBREW_PATH=export PATH="$(PATH):/usr/local/opt/qt/bin";
+	ifeq ($(UNAME_M),arm64)
+		HOMEBREW_PATH=export PATH="$(PATH):/opt/homebrew/opt/qt/bin";
+	else
+		HOMEBREW_PATH=export PATH="$(PATH):/usr/local/opt/qt/bin";
+	endif
 endif
 
 kristall: build/kristall
diff --git a/src/kristall.pro b/src/kristall.pro
index 8b8ce98..cca3b72 100644
--- a/src/kristall.pro
+++ b/src/kristall.pro
@@ -55,11 +55,19 @@ win32-g++ {
 
 macx {
     # Homebrew include paths
-    INCLUDEPATH += /usr/local/opt/qt/include
-    LIBS += -L/usr/local/opt/qt/lib
-
-    INCLUDEPATH += /usr/local/opt/openssl/include
-    LIBS += -L/usr/local/opt/openssl/lib
+    contains(QMAKE_HOST.arch, arm.*):{
+        INCLUDEPATH += /opt/homebrew/opt/qt/include
+        LIBS += -L/opt/homebrew/opt/qt/lib
+    
+        INCLUDEPATH += /opt/homebrew/opt/openssl/include
+        LIBS += -L/opt/homebrew/opt/openssl/lib
+    } else {
+        INCLUDEPATH += /usr/local/opt/qt/include
+        LIBS += -L/usr/local/opt/qt/lib
+
+        INCLUDEPATH += /usr/local/opt/openssl/include
+        LIBS += -L/usr/local/opt/openssl/lib
+    }
 
     ICON = icons/AppIcon.icns
 }
-- 
cgit v1.2.3