sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mac OS fixes for Qt5.

Browse Source
This commit is contained in:
lotodore
2013-08-31 00:42:03 +02:00
parent 448987d363
commit 9295a4be19
7 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chatcleaner.pro
+8 -7
View File
@@ -52,12 +52,13 @@ win32 {
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
} }
mac { mac {
# make it x86_64 only # make it x86_64 only
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib 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
} }
pokerth_db.pro
+2 -1
View File
@@ -64,7 +64,8 @@ mac{
# on Intel-Mac you have to comment this line out or build will fail. # on Intel-Mac you have to comment this line out or build will fail.
# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ # 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.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /usr/local/include
} }
pokerth_game.pro
+1
View File
@@ -597,6 +597,7 @@ mac {
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.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /usr/local/include
} }
OTHER_FILES += docs/infomessage-id-desc.txt OTHER_FILES += docs/infomessage-id-desc.txt
official_server { official_server {
pokerth_lib.pro
+1 -1
View File
@@ -247,7 +247,7 @@ mac{
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.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /opt/local/include INCLUDEPATH += /usr/local/include
} }
android{ android{
pokerth_protocol.pro
+2 -1
View File
@@ -48,7 +48,8 @@ mac {
# for universal-compilation on PPC-Mac uncomment the following line # for universal-compilation on PPC-Mac uncomment the following line
# on Intel-Mac you have to comment this line out or build will fail. # on Intel-Mac you have to comment this line out or build will fail.
# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ # 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.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /usr/local/include
} }
pokerth_server.pro
+1
View File
@@ -315,6 +315,7 @@ mac {
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
INCLUDEPATH += /usr/local/include
} }
official_server { official_server {
src/pokerth.cpp
+2
View File
@@ -39,8 +39,10 @@
#include <QtCore> #include <QtCore>
#ifdef __APPLE__ #ifdef __APPLE__
#if QT_VERSION < 0x050000
#include <QMacStyle> #include <QMacStyle>
#endif #endif
#endif
#include <curl/curl.h> #include <curl/curl.h>