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

make clean pokerthlib, -no_dead_strip_inits_and_terms only on macosx

Browse Source
This commit is contained in:
doitux
2011-05-08 22:20:26 +00:00
parent 7715063fe6
commit 796493f582
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_db.pro
+1
View File
@@ -10,6 +10,7 @@ CODECFORSRC = UTF-8
CONFIG += staticlib thread exceptions rtti stl warn_on CONFIG += staticlib thread exceptions rtti stl warn_on
UI_DIR = uics UI_DIR = uics
TARGET = lib/pokerth_db TARGET = lib/pokerth_db
QMAKE_CLEAN += ./lib/libpokerth_db.a
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6 TIXML_USE_STL DEFINES += ENABLE_IPV6 TIXML_USE_STL
pokerth_game.pro
+3 -2
View File
@@ -368,8 +368,6 @@ win32 {
-lwldap32 -lwldap32
RC_FILE = pokerth.rc RC_FILE = pokerth.rc
} }
unix:# workaround for problems with boost_filesystem exceptions
QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
unix:!mac { unix:!mac {
# #### My release static build options # #### My release static build options
# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
@@ -479,6 +477,9 @@ mac {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
QMAKE_CXXFLAGS -= -std=gnu++0x 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 # 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/
pokerth_lib.pro
+1
View File
@@ -10,6 +10,7 @@ CODECFORSRC = UTF-8
CONFIG += staticlib thread exceptions rtti stl warn_on CONFIG += staticlib thread exceptions rtti stl warn_on
UI_DIR = uics UI_DIR = uics
TARGET = lib/pokerth_lib TARGET = lib/pokerth_lib
QMAKE_CLEAN += ./lib/libpokerth_lib.a
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_VERSION=2 DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_VERSION=2
pokerth_protocol.pro
+1
View File
@@ -9,6 +9,7 @@ CONFIG += staticlib \
warn_on warn_on
UI_DIR = uics UI_DIR = uics
TARGET = lib/pokerth_protocol TARGET = lib/pokerth_protocol
QMAKE_CLEAN += ./lib/libpokerth_protocol.a
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6 DEFINES += ENABLE_IPV6
pokerth_server.pro
+3 -5
View File
@@ -179,11 +179,6 @@ win32 {
SOURCES += src/core/linux/convhelper.cpp SOURCES += src/core/linux/convhelper.cpp
} }
unix {
# workaround for problems with boost_filesystem exceptions
QMAKE_LFLAGS += -no_dead_strip_inits_and_terms
}
unix : !mac { unix : !mac {
##### My release static build options ##### My release static build options
@@ -296,6 +291,9 @@ mac {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
QMAKE_CXXFLAGS -= -std=gnu++0x 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 # 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/
zlib_compress.pro
+3 -5
View File
@@ -41,11 +41,6 @@ win32 {
LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 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 { unix : !mac {
##### My release static build options ##### My release static build options
@@ -94,6 +89,9 @@ mac{
CONFIG += ppc CONFIG += ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 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 # 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/