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...

This commit is contained in:
lotodore
2009-09-18 23:38:57 +00:00
parent c403640c4a
commit 8dbb11db92
6 changed files with 38 additions and 31 deletions
+10
View File
@@ -54,3 +54,13 @@ win32 {
debug:LIBPATH += Debug/lib debug:LIBPATH += Debug/lib
release:LIBPATH += Release/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/
}
+9 -12
View File
@@ -434,8 +434,8 @@ unix:!mac {
mac { mac {
# make it universal # make it universal
CONFIG += x86 CONFIG += x86
CONFIG += ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
# 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.
@@ -444,9 +444,6 @@ mac {
LIBS += -lpokerth_lib \ LIBS += -lpokerth_lib \
-lpokerth_protocol -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) # QT dynamic linked framework (see also mac_post_make.sh)
LIBS += -framework \ LIBS += -framework \
QtCore QtCore
@@ -461,11 +458,11 @@ mac {
# standard path for darwinports # standard path for darwinports
# make sure you have a universal version of boost # make sure you have a universal version of boost
LIBS += /usr/local/lib/libboost_thread-xgcc40-mt.a LIBS += /usr/local/lib/libboost_thread.a
LIBS += /usr/local/lib/libboost_filesystem-xgcc40-mt.a LIBS += /usr/local/lib/libboost_filesystem.a
LIBS += /usr/local/lib/libboost_regex-xgcc40-mt.a LIBS += /usr/local/lib/libboost_regex.a
LIBS += /usr/local/lib/libboost_system-xgcc40-mt.a LIBS += /usr/local/lib/libboost_system.a
LIBS += /usr/local/lib/libboost_iostreams-xgcc40-mt.a LIBS += /usr/local/lib/libboost_iostreams.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lcrypto \ LIBS += -lcrypto \
@@ -477,8 +474,8 @@ mac {
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
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.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
} }
+4 -4
View File
@@ -233,15 +233,15 @@ win32{
mac{ mac{
# make it universal # make it universal
CONFIG += x86 CONFIG += x86
CONFIG += ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
# 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.4u.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.5.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
} }
+3 -3
View File
@@ -279,13 +279,13 @@ win32 {
mac { mac {
# make it universal # make it universal
CONFIG += x86 CONFIG += x86
CONFIG += ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
# 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.4u.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.5.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
} }
+11 -11
View File
@@ -263,9 +263,9 @@ unix : !mac {
mac { mac {
# make it universal # make it universal
CONFIG += x86 CONFIG += x86
CONFIG += ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
# 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.
@@ -275,16 +275,16 @@ mac {
LIBS += -lpokerth_lib -lpokerth_protocol LIBS += -lpokerth_lib -lpokerth_protocol
# standard path for darwinports # standard path for darwinports
# make sure you have a universal version of boost # make sure you have a universal version of boost
LIBS += /usr/local/lib/libboost_thread-xgcc40-mt.a LIBS += /usr/local/lib/libboost_thread.a
LIBS += /usr/local/lib/libboost_filesystem-xgcc40-mt.a LIBS += /usr/local/lib/libboost_filesystem.a
LIBS += /usr/local/lib/libboost_regex-xgcc40-mt.a LIBS += /usr/local/lib/libboost_regex.a
LIBS += /usr/local/lib/libboost_system-xgcc40-mt.a LIBS += /usr/local/lib/libboost_system.a
LIBS += /usr/local/lib/libboost_iostreams-xgcc40-mt.a LIBS += /usr/local/lib/libboost_iostreams.a
LIBS += /usr/local/lib/libboost_program_options-xgcc40-mt.a LIBS += /usr/local/lib/libboost_program_options.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lcrypto -lssl -lz -lcurl -liconv LIBS += -lcrypto -lssl -lz -lcurl -liconv
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
} }
+1 -1
View File
@@ -24,7 +24,7 @@
#error This file is not for Windows. #error This file is not for Windows.
#endif #endif
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__)
#define HAVE_ICONV_CONST #define HAVE_ICONV_CONST
#endif #endif