From 0a8ecd6223e25e8125477093ecc2c87fdd369767 Mon Sep 17 00:00:00 2001 From: linear 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. --- src/kristall.pro | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src') 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