diff --git a/mac_post_make.sh b/mac_post_make.sh index f0aa99b1..40edddb5 100755 --- a/mac_post_make.sh +++ b/mac_post_make.sh @@ -9,8 +9,8 @@ # of binary-size if you leave Qt out. # (see http://trolltech.com/developer/downloads/qt/mac) -QT_FW_PATH="/Developer/Qt5/5/clang_64/lib" -QT_PLUGIN_PATH="/Developer/Qt5/5/clang_64/plugins" +QT_FW_PATH="/Users/$USER/Qt/5.9/clang_64/lib" +QT_PLUGIN_PATH="/Users/$USER/Qt/5.9/clang_64/plugins" SDL_FW_PATH="/Library/Frameworks" APPLICATION="./pokerth.app" BINARY="$APPLICATION/Contents/MacOs/pokerth" diff --git a/pokerth_db.pro b/pokerth_db.pro index 0a7a9b72..035c7817 100644 --- a/pokerth_db.pro +++ b/pokerth_db.pro @@ -60,7 +60,7 @@ mac{ CONFIG += x86_64 CONFIG -= x86 CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_CXXFLAGS -= -std=gnu++0x # for universal-compilation on PPC-Mac uncomment the following line diff --git a/pokerth_game.pro b/pokerth_game.pro index 122be9df..4ec08abb 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -576,7 +576,7 @@ mac { CONFIG += x86_64 CONFIG -= x86 CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_CXXFLAGS -= -std=gnu++0x # workaround for problems with boost_filesystem exceptions @@ -588,19 +588,18 @@ mac { LIBPATH += lib # QT dynamic linked framework (see also mac_post_make.sh) + LIBS += -F /Library/Frameworks LIBS += -framework \ QtCore LIBS += -framework \ QtGui - - # SDL and SDL_mixer come as frameworks - LIBS += -framework \ - SDL - LIBS += -framework \ - SDL_mixer + LIBS += -framework \ + SDL + LIBS += -framework \ + SDL_mixer # make sure you have an x86_64 version of boost - LIBS += /usr/local/lib/libboost_thread.a + LIBS += /usr/local/lib/libboost_thread-mt.a LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_regex.a LIBS += /usr/local/lib/libboost_random.a @@ -616,15 +615,21 @@ mac { -lprotobuf \ -lz \ -framework \ - Carbon + Cocoa # set the application icon RC_FILE = pokerth.icns - LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib - INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ - INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers - INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers + + LIBPATH += /usr/local/lib + LIBPATH += /usr/local/opt/openssl/lib + LIBPATH += /usr/local/opt/tinyxml/lib + LIBPATH += /usr/local/opt/protobuf/lib INCLUDEPATH += /usr/local/include + INCLUDEPATH += /usr/local/opt/openssl/include + INCLUDEPATH += /usr/local/opt/tinyxml/include + INCLUDEPATH += /usr/local/opt/protobuf/include + INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers + INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } OTHER_FILES += docs/infomessage-id-desc.txt official_server { diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 37577ac4..7f9b00d6 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -294,17 +294,17 @@ mac{ CONFIG += x86_64 CONFIG -= x86 CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_CXXFLAGS -= -std=gnu++0x # for universal-compilation on PPC-Mac uncomment the following line # on Intel-Mac you have to comment this line out or build will fail. # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ - - INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ - INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers - INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers + LIBPATH += /usr/local/opt/openssl/lib + INCLUDEPATH += /usr/local/opt/openssl/include INCLUDEPATH += /usr/local/include + INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers + INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } android{ diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro index 6f29c786..ede4fb16 100644 --- a/pokerth_protocol.pro +++ b/pokerth_protocol.pro @@ -52,7 +52,7 @@ mac { CONFIG += x86_64 CONFIG -= x86 CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 # for universal-compilation on PPC-Mac uncomment the following line # on Intel-Mac you have to comment this line out or build will fail. diff --git a/pokerth_server.pro b/pokerth_server.pro index 0c632b55..1f701b16 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -310,7 +310,7 @@ mac { CONFIG += x86_64 CONFIG -= x86 CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12 QMAKE_CXXFLAGS -= -std=gnu++0x # workaround for problems with boost_filesystem exceptions @@ -322,7 +322,7 @@ mac { LIBPATH += lib # make sure you have an x86_64 version of boost - LIBS += /usr/local/lib/libboost_thread.a + LIBS += /usr/local/lib/libboost_thread-mt.a LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_regex.a LIBS += /usr/local/lib/libboost_random.a