From f4f654b5f31d357f232b1c297a01e85cd741b97e Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Tue, 16 Oct 2007 19:55:08 +0000
Subject: [PATCH] (Hopefully) fixed compile issue when using full boost build
 with both mt and non mt libs.

---
 pokerth_game.pro   | 32 ++++++++++-------
 pokerth_server.pro | 86 +++++++++++++++++++++++++---------------------
 2 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/pokerth_game.pro b/pokerth_game.pro
index dd3a8410..0f7155d9 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -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
diff --git a/pokerth_server.pro b/pokerth_server.pro
index 1d472bba..890ec960 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -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
+}