From 796493f582a7b6df44ef907255de3176e6cf7fb4 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 8 May 2011 22:20:26 +0000 Subject: [PATCH] make clean pokerthlib, -no_dead_strip_inits_and_terms only on macosx --- pokerth_db.pro | 1 + pokerth_game.pro | 5 +++-- pokerth_lib.pro | 1 + pokerth_protocol.pro | 1 + pokerth_server.pro | 8 +++----- zlib_compress.pro | 8 +++----- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pokerth_db.pro b/pokerth_db.pro index cca3c54d..30fa9f27 100644 --- a/pokerth_db.pro +++ b/pokerth_db.pro @@ -10,6 +10,7 @@ CODECFORSRC = UTF-8 CONFIG += staticlib thread exceptions rtti stl warn_on UI_DIR = uics TARGET = lib/pokerth_db +QMAKE_CLEAN += ./lib/libpokerth_db.a MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += ENABLE_IPV6 TIXML_USE_STL diff --git a/pokerth_game.pro b/pokerth_game.pro index 91c88c7d..0a7b4453 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -368,8 +368,6 @@ win32 { -lwldap32 RC_FILE = pokerth.rc } -unix:# workaround for problems with boost_filesystem exceptions -QMAKE_LFLAGS += -no_dead_strip_inits_and_terms unix:!mac { # #### My release static build options # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections @@ -479,6 +477,9 @@ mac { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_CXXFLAGS -= -std=gnu++0x + # workaround for problems with boost_filesystem exceptions + QMAKE_LFLAGS += -no_dead_strip_inits_and_terms + # 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/ diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 615beeeb..31557623 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -10,6 +10,7 @@ CODECFORSRC = UTF-8 CONFIG += staticlib thread exceptions rtti stl warn_on UI_DIR = uics TARGET = lib/pokerth_lib +QMAKE_CLEAN += ./lib/libpokerth_lib.a MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_VERSION=2 diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro index 6c370cc5..8b4b01e6 100644 --- a/pokerth_protocol.pro +++ b/pokerth_protocol.pro @@ -9,6 +9,7 @@ CONFIG += staticlib \ warn_on UI_DIR = uics TARGET = lib/pokerth_protocol +QMAKE_CLEAN += ./lib/libpokerth_protocol.a MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += ENABLE_IPV6 diff --git a/pokerth_server.pro b/pokerth_server.pro index 7039ced9..dc93d9a8 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -179,11 +179,6 @@ win32 { SOURCES += src/core/linux/convhelper.cpp } -unix { - # workaround for problems with boost_filesystem exceptions - QMAKE_LFLAGS += -no_dead_strip_inits_and_terms -} - unix : !mac { ##### My release static build options @@ -296,6 +291,9 @@ mac { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_CXXFLAGS -= -std=gnu++0x + # workaround for problems with boost_filesystem exceptions + QMAKE_LFLAGS += -no_dead_strip_inits_and_terms + # 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/ diff --git a/zlib_compress.pro b/zlib_compress.pro index 97e2bad7..8e0758b5 100644 --- a/zlib_compress.pro +++ b/zlib_compress.pro @@ -41,11 +41,6 @@ win32 { LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 } -unix { - # workaround for problems with boost_filesystem exceptions - QMAKE_LFLAGS += -no_dead_strip_inits_and_terms -} - unix : !mac { ##### My release static build options @@ -94,6 +89,9 @@ mac{ CONFIG += ppc QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 + # workaround for problems with boost_filesystem exceptions + QMAKE_LFLAGS += -no_dead_strip_inits_and_terms + # 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/