Moving db stuff to a separate lib due to dependency trouble with ld.

This commit is contained in:
lotodore
2009-09-26 21:01:06 +00:00
parent 0e5e8baa22
commit 1b23d9e609
5 changed files with 77 additions and 20 deletions
+10 -8
View File
@@ -121,7 +121,7 @@ win32 {
LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../curl/lib ../zlib
LIBS += -lpokerth_lib -lpokerth_protocol
LIBS += -lpokerth_lib -lpokerth_db -lpokerth_protocol
win32-msvc2005 {
LIBPATH += Release/lib
@@ -241,6 +241,7 @@ unix : !mac {
kFreeBSD = $$find(UNAME, "kFreeBSD")
LIBS += -lpokerth_lib \
-lpokerth_db \
-lpokerth_protocol
LIBS += $$BOOST_LIBS
LIBS += -lcurl
@@ -251,6 +252,7 @@ unix : !mac {
}
TARGETDEPS += ./lib/libpokerth_lib.a \
./lib/libpokerth_db.a \
./lib/libpokerth_protocol.a
#### INSTALL ####
@@ -261,12 +263,6 @@ unix : !mac {
INSTALLS += binary
}
official_server {
LIBPATH += pkth_stat/daemon_lib/lib
LIBS += -lpokerth_closed -lpokerth_lib -lmysqlpp
DEFINES += POKERTH_OFFICIAL_SERVER
}
mac {
# make it universal
CONFIG += x86
@@ -278,7 +274,7 @@ mac {
# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
LIBPATH += lib
LIBS += -lpokerth_lib -lpokerth_protocol
LIBS += -lpokerth_lib -lpokerth_db -lpokerth_protocol
# standard path for darwinports
# make sure you have a universal version of boost
LIBS += /usr/local/lib/libboost_thread.a
@@ -294,3 +290,9 @@ mac {
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
}
official_server {
LIBPATH += pkth_stat/daemon_lib/lib
LIBS += -lpokerth_closed -lmysqlpp
DEFINES += POKERTH_OFFICIAL_SERVER
}