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

(Hopefully) fixed compile issue when using full boost build with both mt and non mt libs.

Browse Source
This commit is contained in:
lotodore
2007-10-16 19:55:08 +00:00
parent 979a726ec3
commit f4f654b5f3
2 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+20 -12
View File
@@ -272,13 +272,17 @@ unix: !mac{
message("Found libboost_thread-mt") message("Found libboost_thread-mt")
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
} }
exists( /usr/lib/libboost_thread.so ){ !exists( /usr/lib/libboost_thread-mt.so ){
message("Found libboost_thread") exists( /usr/lib/libboost_thread.so ){
LIBS += -lboost_thread message("Found libboost_thread")
LIBS += -lboost_thread
}
} }
exists( /usr/lib64/libboost_thread.so ){ !exists( /usr/lib64/libboost_thread-mt.so ){
message("Found libboost_thread") exists( /usr/lib64/libboost_thread.so ){
LIBS += -lboost_thread message("Found libboost_thread")
LIBS += -lboost_thread
}
} }
exists( /usr/lib/libboost_filesystem-mt.so ){ exists( /usr/lib/libboost_filesystem-mt.so ){
@@ -289,13 +293,17 @@ unix: !mac{
message("Found libboost_filesystem-mt") message("Found libboost_filesystem-mt")
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
} }
exists( /usr/lib/libboost_filesystem.so ){ !exists( /usr/lib/libboost_filesystem-mt.so ){
message("Found libboost_filesystem") exists( /usr/lib/libboost_filesystem.so ){
LIBS += -lboost_filesystem message("Found libboost_filesystem")
LIBS += -lboost_filesystem
}
} }
exists( /usr/lib64/libboost_filesystem.so ){ !exists( /usr/lib64/libboost_filesystem-mt.so ){
message("Found libboost_filesystem") exists( /usr/lib64/libboost_filesystem.so ){
LIBS += -lboost_filesystem message("Found libboost_filesystem")
LIBS += -lboost_filesystem
}
} }
LIBPATH += lib LIBPATH += lib
LIBS += -lpokerth_lib LIBS += -lpokerth_lib
pokerth_server.pro
+47 -39
View File
@@ -141,44 +141,52 @@ win32 {
} }
unix : !mac { unix : !mac {
exists( /usr/lib/libboost_thread-mt.so ){ exists( /usr/lib/libboost_thread-mt.so ){
message("Found libboost_thread-mt") message("Found libboost_thread-mt")
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
} }
exists( /usr/lib64/libboost_thread-mt.so ){ exists( /usr/lib64/libboost_thread-mt.so ){
message("Found libboost_thread-mt") message("Found libboost_thread-mt")
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
} }
exists( /usr/lib/libboost_thread.so ){ !exists( /usr/lib/libboost_thread-mt.so ){
message("Found libboost_thread") exists( /usr/lib/libboost_thread.so ){
LIBS += -lboost_thread message("Found libboost_thread")
} LIBS += -lboost_thread
exists( /usr/lib64/libboost_thread.so ){ }
message("Found libboost_thread") }
LIBS += -lboost_thread !exists( /usr/lib64/libboost_thread-mt.so ){
} exists( /usr/lib64/libboost_thread.so ){
message("Found libboost_thread")
LIBS += -lboost_thread
}
}
exists( /usr/lib/libboost_filesystem-mt.so ){ exists( /usr/lib/libboost_filesystem-mt.so ){
message("Found libboost_filesystem-mt") message("Found libboost_filesystem-mt")
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
} }
exists( /usr/lib64/libboost_filesystem-mt.so ){ exists( /usr/lib64/libboost_filesystem-mt.so ){
message("Found libboost_filesystem-mt") message("Found libboost_filesystem-mt")
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
} }
exists( /usr/lib/libboost_filesystem.so ){ !exists( /usr/lib/libboost_filesystem-mt.so ){
message("Found libboost_filesystem") exists( /usr/lib/libboost_filesystem.so ){
LIBS += -lboost_filesystem message("Found libboost_filesystem")
} LIBS += -lboost_filesystem
exists( /usr/lib64/libboost_filesystem.so ){ }
message("Found libboost_filesystem") }
LIBS += -lboost_filesystem !exists( /usr/lib64/libboost_filesystem-mt.so ){
} exists( /usr/lib64/libboost_filesystem.so ){
LIBPATH += lib message("Found libboost_filesystem")
LIBS += -lpokerth_lib LIBS += -lboost_filesystem
LIBS += -lcrypto }
TARGETDEPS += ./lib/libpokerth_lib.a }
LIBPATH += lib
LIBS += -lpokerth_lib
LIBS += -lcrypto
TARGETDEPS += ./lib/libpokerth_lib.a
## My release static libs ## My release static libs
#LIBS += -lcrypto #LIBS += -lcrypto
} }