(Hopefully) fixed compile issue when using full boost build with both mt and non mt libs.
This commit is contained in:
@@ -272,14 +272,18 @@ 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-mt.so ){
|
||||||
exists( /usr/lib/libboost_thread.so ){
|
exists( /usr/lib/libboost_thread.so ){
|
||||||
message("Found libboost_thread")
|
message("Found libboost_thread")
|
||||||
LIBS += -lboost_thread
|
LIBS += -lboost_thread
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
!exists( /usr/lib64/libboost_thread-mt.so ){
|
||||||
exists( /usr/lib64/libboost_thread.so ){
|
exists( /usr/lib64/libboost_thread.so ){
|
||||||
message("Found libboost_thread")
|
message("Found libboost_thread")
|
||||||
LIBS += -lboost_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")
|
||||||
@@ -289,14 +293,18 @@ 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-mt.so ){
|
||||||
exists( /usr/lib/libboost_filesystem.so ){
|
exists( /usr/lib/libboost_filesystem.so ){
|
||||||
message("Found libboost_filesystem")
|
message("Found libboost_filesystem")
|
||||||
LIBS += -lboost_filesystem
|
LIBS += -lboost_filesystem
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
!exists( /usr/lib64/libboost_filesystem-mt.so ){
|
||||||
exists( /usr/lib64/libboost_filesystem.so ){
|
exists( /usr/lib64/libboost_filesystem.so ){
|
||||||
message("Found libboost_filesystem")
|
message("Found libboost_filesystem")
|
||||||
LIBS += -lboost_filesystem
|
LIBS += -lboost_filesystem
|
||||||
}
|
}
|
||||||
|
}
|
||||||
LIBPATH += lib
|
LIBPATH += lib
|
||||||
LIBS += -lpokerth_lib
|
LIBS += -lpokerth_lib
|
||||||
LIBS += -lcrypto -lSDL_mixer
|
LIBS += -lcrypto -lSDL_mixer
|
||||||
|
|||||||
+9
-1
@@ -149,14 +149,18 @@ 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-mt.so ){
|
||||||
exists( /usr/lib/libboost_thread.so ){
|
exists( /usr/lib/libboost_thread.so ){
|
||||||
message("Found libboost_thread")
|
message("Found libboost_thread")
|
||||||
LIBS += -lboost_thread
|
LIBS += -lboost_thread
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
!exists( /usr/lib64/libboost_thread-mt.so ){
|
||||||
exists( /usr/lib64/libboost_thread.so ){
|
exists( /usr/lib64/libboost_thread.so ){
|
||||||
message("Found libboost_thread")
|
message("Found libboost_thread")
|
||||||
LIBS += -lboost_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")
|
||||||
@@ -166,14 +170,18 @@ 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-mt.so ){
|
||||||
exists( /usr/lib/libboost_filesystem.so ){
|
exists( /usr/lib/libboost_filesystem.so ){
|
||||||
message("Found libboost_filesystem")
|
message("Found libboost_filesystem")
|
||||||
LIBS += -lboost_filesystem
|
LIBS += -lboost_filesystem
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
!exists( /usr/lib64/libboost_filesystem-mt.so ){
|
||||||
exists( /usr/lib64/libboost_filesystem.so ){
|
exists( /usr/lib64/libboost_filesystem.so ){
|
||||||
message("Found libboost_filesystem")
|
message("Found libboost_filesystem")
|
||||||
LIBS += -lboost_filesystem
|
LIBS += -lboost_filesystem
|
||||||
}
|
}
|
||||||
|
}
|
||||||
LIBPATH += lib
|
LIBPATH += lib
|
||||||
LIBS += -lpokerth_lib
|
LIBS += -lpokerth_lib
|
||||||
LIBS += -lcrypto
|
LIBS += -lcrypto
|
||||||
@@ -181,4 +189,4 @@ unix : !mac {
|
|||||||
|
|
||||||
## My release static libs
|
## My release static libs
|
||||||
#LIBS += -lcrypto
|
#LIBS += -lcrypto
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user