From b6d2e61fd81132a10dd6e1cffcb68bdbb7337183 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Mon, 20 Dec 2010 18:27:48 +0000
Subject: [PATCH] Fixing native Windows build.

---
 pokerth_game.pro   | 18 +++++++++++-------
 pokerth_lib.pro    |  4 +++-
 pokerth_server.pro | 21 ++++++++++++---------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/pokerth_game.pro b/pokerth_game.pro
index 55574437..646af685 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -299,8 +299,7 @@ TRANSLATIONS = ts/pokerth_af.ts \
 LIBS += -lpokerth_lib \
 	-lpokerth_db \
 	-lpokerth_protocol \
-	-lcurl \
-	-lsqlite3
+	-lcurl
 
 win32 { 
 	DEFINES += CURL_STATICLIB
@@ -314,6 +313,7 @@ win32 {
 		../GnuTLS/include \
 		../gsasl/include \
 		../curl/include \
+		../sqlite \
 		../zlib
 	LIBPATH += ../boost/stage/lib \
 		../GnuTLS/lib \
@@ -337,6 +337,7 @@ win32 {
 		LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
 	}
 	win32-g++-cross {
+		LIBS += -lsqlite3
 		LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg
 		LIBS += -lboost_thread_win32-mt
 		LIBS += -lboost_filesystem-mt
@@ -345,12 +346,13 @@ win32 {
 		LIBS += -lboost_system-mt
 	}
 	win32-g++ {
+		SOURCES += ../sqlite/sqlite3.c
 		!pkth_win64:LIBS += -ltasn1
-		LIBS += -lboost_thread-mgw45-mt-1_44.dll
-		LIBS += -lboost_filesystem-mgw45-mt-1_44.dll
-		LIBS += -lboost_regex-mgw45-mt-1_44
-		LIBS += -lboost_iostreams-mgw45-mt-1_44.dll
-		LIBS += -lboost_system-mgw45-mt-1_44.dll
+		LIBS += -lboost_thread-mgw45-mt-1_45.dll
+		LIBS += -lboost_filesystem-mgw45-mt-1_45.dll
+		LIBS += -lboost_regex-mgw45-mt-1_45
+		LIBS += -lboost_iostreams-mgw45-mt-1_45.dll
+		LIBS += -lboost_system-mgw45-mt-1_45.dll
 	}
 	LIBS += \
 		-lgdi32 \
@@ -447,6 +449,7 @@ unix:!mac {
 	UNAME = $$system(uname -s)
 	BSD = $$find(UNAME, "BSD")
 	kFreeBSD = $$find(UNAME, "kFreeBSD")
+	LIBS += -lsqlite3
 	LIBS += $$BOOST_LIBS
 	LIBS += -lSDL_mixer \
 		-lgsasl
@@ -509,6 +512,7 @@ mac {
 	# libraries installed on every mac
 	LIBS += -lcrypto \
 		-lssl \
+		-lsqlite3 \
 		-lz \
 		-framework \
 		Carbon
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 596775a1..60de2603 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -227,7 +227,9 @@ win32{
 	DEFINES += CURL_STATICLIB
 	DEFINES += _WIN32_WINNT=0x0501
 	DEPENDPATH += src/net/win32/ src/core/win32
-	INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../openssl/include
+	win32-g++ {
+		INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../sqlite ../openssl/include
+	}
 }
 !win32{
 	##### My release static build options
diff --git a/pokerth_server.pro b/pokerth_server.pro
index 3dca9618..a63bbaad 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -115,14 +115,13 @@ SOURCES += \
 LIBS += -lpokerth_lib \
 	-lpokerth_db \
 	-lpokerth_protocol \
-	-lcurl \
-	-lsqlite3
+	-lcurl
 
 win32 {
 	DEFINES += CURL_STATICLIB
 	DEFINES += _WIN32_WINNT=0x0501
 	DEPENDPATH += src/net/win32/ src/core/win32
-	INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include
+	INCLUDEPATH += ../sqlite ../boost/ ../GnuTLS/include ../gsasl/include
 
 	SOURCES += src/core/win32/convhelper.cpp
 
@@ -138,6 +137,7 @@ win32 {
 		LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
 	}
 	win32-g++-cross {
+		LIBS += -lsqlite3
 		LIBS += -lntlm
 		LIBS += -lboost_thread_win32-mt
 		LIBS += -lboost_filesystem-mt
@@ -147,13 +147,14 @@ win32 {
 		LIBS += -lboost_system-mt
 	}
 	win32-g++ {
+		SOURCES += ../sqlite/sqlite3.c
 		!pkth_win64:LIBS += -ltasn1
-		LIBS += -lboost_thread-mgw45-mt-1_44.dll
-		LIBS += -lboost_filesystem-mgw45-mt-1_44.dll
-		LIBS += -lboost_regex-mgw45-mt-1_44
-		LIBS += -lboost_program_options-mgw45-mt-1_44.dll
-		LIBS += -lboost_iostreams-mgw45-mt-1_44.dll
-		LIBS += -lboost_system-mgw45-mt-1_44.dll
+		LIBS += -lboost_thread-mgw45-mt-1_45.dll
+		LIBS += -lboost_filesystem-mgw45-mt-1_45.dll
+		LIBS += -lboost_regex-mgw45-mt-1_45
+		LIBS += -lboost_program_options-mgw45-mt-1_45.dll
+		LIBS += -lboost_iostreams-mgw45-mt-1_45.dll
+		LIBS += -lboost_system-mgw45-mt-1_45.dll
 	}
 
 	LIBS += -liconv \
@@ -271,6 +272,7 @@ unix : !mac {
 	kFreeBSD = $$find(UNAME, "kFreeBSD")
 
 	LIBS += $$BOOST_LIBS
+	LIBS += -lsqlite3
 	LIBS += -lgsasl
 	!isEmpty( BSD ): isEmpty( kFreeBSD ){
 		LIBS += -lcrypto -liconv
@@ -313,6 +315,7 @@ mac {
 	LIBS += /usr/local/lib/libgsasl.a
 
 	# libraries installed on every mac
+	LIBS += -lsqlite3
 	LIBS += -lcrypto -lssl -lz -liconv
 	# set the application icon
 	RC_FILE = pokerth.icns