(Hopefully) fixed compile issue when using full boost build with both mt and non mt libs.
This commit is contained in:
+20
-12
@@ -272,13 +272,17 @@ unix: !mac{
|
||||
message("Found libboost_thread-mt")
|
||||
LIBS += -lboost_thread-mt
|
||||
}
|
||||
exists( /usr/lib/libboost_thread.so ){
|
||||
message("Found libboost_thread")
|
||||
LIBS += -lboost_thread
|
||||
!exists( /usr/lib/libboost_thread-mt.so ){
|
||||
exists( /usr/lib/libboost_thread.so ){
|
||||
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 ){
|
||||
@@ -289,13 +293,17 @@ unix: !mac{
|
||||
message("Found libboost_filesystem-mt")
|
||||
LIBS += -lboost_filesystem-mt
|
||||
}
|
||||
exists( /usr/lib/libboost_filesystem.so ){
|
||||
message("Found libboost_filesystem")
|
||||
LIBS += -lboost_filesystem
|
||||
!exists( /usr/lib/libboost_filesystem-mt.so ){
|
||||
exists( /usr/lib/libboost_filesystem.so ){
|
||||
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 ){
|
||||
message("Found libboost_filesystem")
|
||||
LIBS += -lboost_filesystem
|
||||
}
|
||||
}
|
||||
LIBPATH += lib
|
||||
LIBS += -lpokerth_lib
|
||||
|
||||
+47
-39
@@ -141,44 +141,52 @@ win32 {
|
||||
}
|
||||
|
||||
unix : !mac {
|
||||
exists( /usr/lib/libboost_thread-mt.so ){
|
||||
message("Found libboost_thread-mt")
|
||||
LIBS += -lboost_thread-mt
|
||||
}
|
||||
exists( /usr/lib64/libboost_thread-mt.so ){
|
||||
message("Found libboost_thread-mt")
|
||||
LIBS += -lboost_thread-mt
|
||||
}
|
||||
exists( /usr/lib/libboost_thread.so ){
|
||||
message("Found libboost_thread")
|
||||
LIBS += -lboost_thread
|
||||
}
|
||||
exists( /usr/lib64/libboost_thread.so ){
|
||||
message("Found libboost_thread")
|
||||
LIBS += -lboost_thread
|
||||
}
|
||||
exists( /usr/lib/libboost_thread-mt.so ){
|
||||
message("Found libboost_thread-mt")
|
||||
LIBS += -lboost_thread-mt
|
||||
}
|
||||
exists( /usr/lib64/libboost_thread-mt.so ){
|
||||
message("Found libboost_thread-mt")
|
||||
LIBS += -lboost_thread-mt
|
||||
}
|
||||
!exists( /usr/lib/libboost_thread-mt.so ){
|
||||
exists( /usr/lib/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 ){
|
||||
message("Found libboost_filesystem-mt")
|
||||
LIBS += -lboost_filesystem-mt
|
||||
}
|
||||
exists( /usr/lib64/libboost_filesystem-mt.so ){
|
||||
message("Found libboost_filesystem-mt")
|
||||
LIBS += -lboost_filesystem-mt
|
||||
}
|
||||
exists( /usr/lib/libboost_filesystem.so ){
|
||||
message("Found libboost_filesystem")
|
||||
LIBS += -lboost_filesystem
|
||||
}
|
||||
exists( /usr/lib64/libboost_filesystem.so ){
|
||||
message("Found libboost_filesystem")
|
||||
LIBS += -lboost_filesystem
|
||||
}
|
||||
LIBPATH += lib
|
||||
LIBS += -lpokerth_lib
|
||||
LIBS += -lcrypto
|
||||
TARGETDEPS += ./lib/libpokerth_lib.a
|
||||
exists( /usr/lib/libboost_filesystem-mt.so ){
|
||||
message("Found libboost_filesystem-mt")
|
||||
LIBS += -lboost_filesystem-mt
|
||||
}
|
||||
exists( /usr/lib64/libboost_filesystem-mt.so ){
|
||||
message("Found libboost_filesystem-mt")
|
||||
LIBS += -lboost_filesystem-mt
|
||||
}
|
||||
!exists( /usr/lib/libboost_filesystem-mt.so ){
|
||||
exists( /usr/lib/libboost_filesystem.so ){
|
||||
message("Found libboost_filesystem")
|
||||
LIBS += -lboost_filesystem
|
||||
}
|
||||
}
|
||||
!exists( /usr/lib64/libboost_filesystem-mt.so ){
|
||||
exists( /usr/lib64/libboost_filesystem.so ){
|
||||
message("Found libboost_filesystem")
|
||||
LIBS += -lboost_filesystem
|
||||
}
|
||||
}
|
||||
LIBPATH += lib
|
||||
LIBS += -lpokerth_lib
|
||||
LIBS += -lcrypto
|
||||
TARGETDEPS += ./lib/libpokerth_lib.a
|
||||
|
||||
## My release static libs
|
||||
#LIBS += -lcrypto
|
||||
}
|
||||
## My release static libs
|
||||
#LIBS += -lcrypto
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user