From 9295a4be1971084d5f5fc6977d76221f32f8838d Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 31 Aug 2013 00:42:03 +0200 Subject: [PATCH] Mac OS fixes for Qt5. --- chatcleaner.pro | 15 ++++++++------- pokerth_db.pro | 3 ++- pokerth_game.pro | 1 + pokerth_lib.pro | 2 +- pokerth_protocol.pro | 3 ++- pokerth_server.pro | 1 + src/pokerth.cpp | 2 ++ 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/chatcleaner.pro b/chatcleaner.pro index c7403776..6d63b4a9 100644 --- a/chatcleaner.pro +++ b/chatcleaner.pro @@ -52,12 +52,13 @@ win32 { INCLUDEPATH += $${PREFIX}/include } mac { - # make it x86_64 only - CONFIG += x86_64 - CONFIG -= x86 - CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - QMAKE_CXXFLAGS -= -std=gnu++0x + # make it x86_64 only + CONFIG += x86_64 + CONFIG -= x86 + CONFIG -= ppc + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_CXXFLAGS -= -std=gnu++0x LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib - INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ + INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ + INCLUDEPATH += /usr/local/include } diff --git a/pokerth_db.pro b/pokerth_db.pro index b610fce2..7c2d1428 100644 --- a/pokerth_db.pro +++ b/pokerth_db.pro @@ -64,7 +64,8 @@ mac{ # 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 += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers + INCLUDEPATH += /usr/local/include } diff --git a/pokerth_game.pro b/pokerth_game.pro index 2c143e8e..1e2ffe21 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -597,6 +597,7 @@ mac { INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers + INCLUDEPATH += /usr/local/include } OTHER_FILES += docs/infomessage-id-desc.txt official_server { diff --git a/pokerth_lib.pro b/pokerth_lib.pro index d3ec4dd3..9a30d60c 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -247,7 +247,7 @@ mac{ INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers - INCLUDEPATH += /opt/local/include + INCLUDEPATH += /usr/local/include } android{ diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro index 14da5993..7a331df5 100644 --- a/pokerth_protocol.pro +++ b/pokerth_protocol.pro @@ -48,7 +48,8 @@ mac { # 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 += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers + INCLUDEPATH += /usr/local/include } diff --git a/pokerth_server.pro b/pokerth_server.pro index 7f069fbe..d27a0e77 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -315,6 +315,7 @@ mac { RC_FILE = pokerth.icns LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ + INCLUDEPATH += /usr/local/include } official_server { diff --git a/src/pokerth.cpp b/src/pokerth.cpp index d5e7c5c2..ab911e5f 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -39,8 +39,10 @@ #include #ifdef __APPLE__ +#if QT_VERSION < 0x050000 #include #endif +#endif #include