Mac OS fixes for Qt5.
This commit is contained in:
@@ -60,4 +60,5 @@ mac {
|
||||
QMAKE_CXXFLAGS -= -std=gnu++0x
|
||||
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
|
||||
INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
|
||||
INCLUDEPATH += /usr/local/include
|
||||
}
|
||||
|
||||
@@ -67,4 +67,5 @@ 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
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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{
|
||||
|
||||
@@ -51,4 +51,5 @@ 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
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -39,8 +39,10 @@
|
||||
#include <QtCore>
|
||||
|
||||
#ifdef __APPLE__
|
||||
#if QT_VERSION < 0x050000
|
||||
#include <QMacStyle>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <curl/curl.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user