From 9a8342abb76e15a194d40be7d568ba9442ac7214 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Sun, 8 Aug 2010 03:33:21 +0200
Subject: Buildsystem: Make core buildable under Windows again - changed
 OpenSSL detection of headers around slightly - changed paths to MySQL-headers
 on Windows in a few files - removed precompiled header for scripts being
 built when building game - added requirement of building revision.h to be
 built before building shared - added some generic buildfixes (thanks zor) -
 use resource-files, allowing for icons to show up on windows

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt         | 7 +++++--
 src/server/shared/Database/Database.h    | 8 ++++----
 src/server/shared/Database/QueryResult.h | 8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/server/shared')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 02d9122b66b..ee361497a34 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -74,6 +74,8 @@ endif()
 
 include_directories(
   ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/externals/mersennetwister
   ${CMAKE_SOURCE_DIR}/externals/SFMT
@@ -92,12 +94,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
   ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${OPENSSL_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
 )
 
+
 add_library(shared STATIC ${shared_STAT_SRCS})
 
+add_dependencies(shared revision.h)
+
 if(WIN32)
   target_link_libraries(shared
     ace
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 762abfd2ede..108ba3539bb 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -28,11 +28,11 @@
 #include "ace/Guard_T.h"
 
 #ifdef _WIN32
-#define FD_SETSIZE 1024
-#include <winsock2.h>
-#include <mysql/mysql.h>
+  #define FD_SETSIZE 1024
+  #include <winsock2.h>
+  #include <mysql.h>
 #else
-#include <mysql.h>
+  #include <mysql/mysql.h>
 #endif
 
 class SqlTransaction;
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index 0c87025843d..b2efdefbda0 100755
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -27,11 +27,11 @@
 #include "Field.h"
 
 #ifdef _WIN32
-#define FD_SETSIZE 1024
-#include <winsock2.h>
-#include <mysql.h>
+  #define FD_SETSIZE 1024
+  #include <winsock2.h>
+  #include <mysql.h>
 #else
-#include <mysql.h>
+  #include <mysql/mysql.h>
 #endif
 
 class QueryResult
-- 
cgit v1.2.3