From 8dbb11db926b2dbac03fdbe7eae2f20d253afbb3 Mon Sep 17 00:00:00 2001 From: lotodore Date: Fri, 18 Sep 2009 23:38:57 +0000 Subject: [PATCH] Mac OS: Using snow leopard as build platform. PowerPC architecture no longer supported. SDK set to 10.5 (leopard) due to problems compiling boost. Hopefully still runs on 10.4 (tiger), but I cannot check... --- chatcleaner.pro | 10 ++++++++++ pokerth_game.pro | 21 +++++++++------------ pokerth_lib.pro | 8 ++++---- pokerth_protocol.pro | 6 +++--- pokerth_server.pro | 22 +++++++++++----------- src/core/linux/convhelper.cpp | 2 +- 6 files changed, 38 insertions(+), 31 deletions(-) diff --git a/chatcleaner.pro b/chatcleaner.pro index 9c0030e0..d3d5ba13 100644 --- a/chatcleaner.pro +++ b/chatcleaner.pro @@ -54,3 +54,13 @@ win32 { debug:LIBPATH += Debug/lib release:LIBPATH += Release/lib } + +mac { + # make it universal + CONFIG += x86 + CONFIG -= ppc + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 + + LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib + INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ +} diff --git a/pokerth_game.pro b/pokerth_game.pro index b58bb292..2fee1c2e 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -434,8 +434,8 @@ unix:!mac { mac { # make it universal CONFIG += x86 - CONFIG += ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 + CONFIG -= ppc + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # for universal-compilation on PPC-Mac uncomment the following line # on Intel-Mac you have to comment this line out or build will fail. @@ -444,9 +444,6 @@ mac { LIBS += -lpokerth_lib \ -lpokerth_protocol - # Qt static (path is standard for self-compiling qt) - # LIBS += /usr/local/Trolltech/Qt-4.2.3/lib/libQtCore.a - # LIBS += /usr/local/Trolltech/Qt-4.2.3/lib/libQtGui.a # QT dynamic linked framework (see also mac_post_make.sh) LIBS += -framework \ QtCore @@ -461,11 +458,11 @@ mac { # standard path for darwinports # make sure you have a universal version of boost - LIBS += /usr/local/lib/libboost_thread-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_filesystem-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_regex-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_system-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_iostreams-xgcc40-mt.a + LIBS += /usr/local/lib/libboost_thread.a + LIBS += /usr/local/lib/libboost_filesystem.a + LIBS += /usr/local/lib/libboost_regex.a + LIBS += /usr/local/lib/libboost_system.a + LIBS += /usr/local/lib/libboost_iostreams.a # libraries installed on every mac LIBS += -lcrypto \ @@ -477,8 +474,8 @@ mac { # set the application icon RC_FILE = pokerth.icns - LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib - INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/ + LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib + INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 7a17ac23..26844b52 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -233,15 +233,15 @@ win32{ mac{ # make it universal - CONFIG += x86 - CONFIG += ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 + CONFIG += x86 + CONFIG -= ppc + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # 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.4u.sdk/usr/include/ + INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro index 46beece8..4f2cc1b4 100644 --- a/pokerth_protocol.pro +++ b/pokerth_protocol.pro @@ -279,13 +279,13 @@ win32 { mac { # make it universal CONFIG += x86 - CONFIG += ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 + CONFIG -= ppc + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # 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.4u.sdk/usr/include/ + INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } diff --git a/pokerth_server.pro b/pokerth_server.pro index a4b6c935..a526cc2f 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -263,9 +263,9 @@ unix : !mac { mac { # make it universal - CONFIG += x86 - CONFIG += ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 + CONFIG += x86 + CONFIG -= ppc + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # for universal-compilation on PPC-Mac uncomment the following line # on Intel-Mac you have to comment this line out or build will fail. @@ -275,16 +275,16 @@ mac { LIBS += -lpokerth_lib -lpokerth_protocol # standard path for darwinports # make sure you have a universal version of boost - LIBS += /usr/local/lib/libboost_thread-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_filesystem-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_regex-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_system-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_iostreams-xgcc40-mt.a - LIBS += /usr/local/lib/libboost_program_options-xgcc40-mt.a + LIBS += /usr/local/lib/libboost_thread.a + LIBS += /usr/local/lib/libboost_filesystem.a + LIBS += /usr/local/lib/libboost_regex.a + LIBS += /usr/local/lib/libboost_system.a + LIBS += /usr/local/lib/libboost_iostreams.a + LIBS += /usr/local/lib/libboost_program_options.a # libraries installed on every mac LIBS += -lcrypto -lssl -lz -lcurl -liconv # set the application icon RC_FILE = pokerth.icns - LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib - INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/ + LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib + INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ } diff --git a/src/core/linux/convhelper.cpp b/src/core/linux/convhelper.cpp index 9bf00074..934dbdcf 100644 --- a/src/core/linux/convhelper.cpp +++ b/src/core/linux/convhelper.cpp @@ -24,7 +24,7 @@ #error This file is not for Windows. #endif -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) #define HAVE_ICONV_CONST #endif