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

Fixing MacOS build. Runs on 10.6/10.7 only.

Browse Source
This commit is contained in:
lotodore
2011-10-21 10:24:25 +00:00
parent 8ae7db3e96
commit 5b9a6c532c
6 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chatcleaner.pro
+7 -6
View File
@@ -54,11 +54,12 @@ win32 {
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
} }
mac { mac {
# make it universal # make it x86_64 only
CONFIG += x86 CONFIG += x86_64
CONFIG -= ppc CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 CONFIG -= ppc
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
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.5.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
} }
pokerth_db.pro
+7 -6
View File
@@ -54,17 +54,18 @@ win32{
} }
mac{ mac{
# make it universal # make it x86_64 only
CONFIG += x86 CONFIG += x86_64
CONFIG -= ppc CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 CONFIG -= ppc
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_CXXFLAGS -= -std=gnu++0x
# 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.5.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
} }
pokerth_game.pro
+8 -8
View File
@@ -489,10 +489,11 @@ unix:!mac {
desktop desktop
} }
mac { mac {
# make it universal # make it x86_64 only
CONFIG += x86 CONFIG += x86_64
CONFIG -= ppc CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
# workaround for problems with boost_filesystem exceptions # workaround for problems with boost_filesystem exceptions
@@ -515,8 +516,7 @@ mac {
LIBS += -framework \ LIBS += -framework \
SDL_mixer SDL_mixer
# standard path for darwinports # make sure you have an x86_64 version of boost
# make sure you have a universal version of boost
LIBS += /usr/local/lib/libboost_thread.a LIBS += /usr/local/lib/libboost_thread.a
LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_filesystem.a
LIBS += /usr/local/lib/libboost_regex.a LIBS += /usr/local/lib/libboost_regex.a
@@ -536,8 +536,8 @@ mac {
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.5.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
} }
pokerth_lib.pro
+7 -6
View File
@@ -226,17 +226,18 @@ win32{
} }
mac{ mac{
# make it universal # make it x86_64 only
CONFIG += x86 CONFIG += x86_64
CONFIG -= ppc CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 CONFIG -= ppc
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_CXXFLAGS -= -std=gnu++0x
# 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.5.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 += /opt/local/include
pokerth_protocol.pro
+6 -5
View File
@@ -340,15 +340,16 @@ win32 {
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
} }
mac { mac {
# make it universal # make it x86_64 only
CONFIG += x86 CONFIG += x86_64
CONFIG -= ppc CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
# 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.5.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
} }
pokerth_server.pro
+8 -8
View File
@@ -295,10 +295,11 @@ unix : !mac {
} }
mac { mac {
# make it universal # make it x86_64 only
CONFIG += x86 CONFIG += x86_64
CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
# workaround for problems with boost_filesystem exceptions # workaround for problems with boost_filesystem exceptions
@@ -309,9 +310,8 @@ mac {
# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
LIBPATH += lib LIBPATH += lib
# standard path for darwinports # make sure you have an x86_64 version of boost
# make sure you have a universal version of boost LIBS += /usr/local/lib/libboost_thread.a
LIBS += /usr/local/lib/libboost_thread.a
LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_filesystem.a
LIBS += /usr/local/lib/libboost_regex.a LIBS += /usr/local/lib/libboost_regex.a
LIBS += /usr/local/lib/libboost_random.a LIBS += /usr/local/lib/libboost_random.a
@@ -326,8 +326,8 @@ mac {
LIBS += -lcrypto -lssl -lz -liconv LIBS += -lcrypto -lssl -lz -liconv
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
} }
official_server { official_server {