Attempt to fix compilation of DbSqliteWx under Mac

pawelsalawa · Nov 29, 2024 · 8ca663f · 8ca663f
1 parent 291952e
commit 8ca663f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Plugins/DbSqliteCipher/DbSqliteCipher.pro b/Plugins/DbSqliteCipher/DbSqliteCipher.pro
@@ -25,7 +25,7 @@ HEADERS += dbsqlitecipher.h \
     dbsqlitecipherinstance.h
     sqlcipher.h
 
-mac: {
+macx: {
     exists( /opt/local/include/openssl-3/openssl/crypto.h ) {
         message( "Configuring OpenSSL from MacPorts" )
         INCLUDEPATH += /opt/local/include/openssl-3

diff --git a/Plugins/DbSqliteWx/DbSqliteWx.pro b/Plugins/DbSqliteWx/DbSqliteWx.pro
@@ -27,9 +27,16 @@ isEmpty(WXSQLITE_LIB): {
     HEADERS += wxsqlite3.h
 }
 
-max: {
-    INCLUDEPATH += /usr/local/opt/openssl/include
-    LIBS += -L/usr/local/opt/openssl/lib
+macx: {
+    exists( /opt/local/include/openssl-3/openssl/crypto.h ) {
+        message( "Configuring OpenSSL from MacPorts" )
+        INCLUDEPATH += /opt/local/include/openssl-3
+        LIBS += -L/opt/local/lib/openssl-3
+    } else {
+        message( "Configuring OpenSSL from HomeBrew" )
+        INCLUDEPATH += /usr/local/opt/openssl/include
+        LIBS += -L/usr/local/opt/openssl/lib
+    }
 }
 !macx: {
     LIBS += -L$${PWD}/../deps/lib/$${PLATFORM}/