make clean pokerthlib, -no_dead_strip_inits_and_terms only on macosx
This commit is contained in:
@@ -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
|
||||
|
||||
+3
-2
@@ -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/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+3
-5
@@ -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/
|
||||
|
||||
+3
-5
@@ -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/
|
||||
|
||||
Reference in New Issue
Block a user