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

11 files changed, 42 insertions, 34 deletions

diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index 29a4656032a..01f7d20e5d2 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -12,7 +12,7 @@
 
   set(OPENSSL_FOUND 0)
 
-  if(WIN32)
+  if( MSVC )
     if(PLATFORM MATCHES X64)
       set(TMP_OPENSSL_INCLUDE_DIR
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include"
@@ -38,12 +38,12 @@
     NAMES
       openssl/ssl.h
     PATHS
+      ${TMP_OPENSSL_INCLUDE_DIR}
       /usr/include
       /usr/include/openssl
       /usr/local/include
       /usr/local/include/openssl
       /usr/local/openssl/include
-      ${TMP_OPENSSL_INCLUDE_DIR}
     DOC
       "Specify the directory containing openssl.h."
   )
@@ -53,12 +53,12 @@
       ssleay32
       ssl
     PATHS
+      ${TMP_OPENSSL_LIBRARIES}
       /usr/lib
       /usr/lib/ssl
       /usr/local/lib
       /usr/local/lib/ssl
       /usr/local/ssl/lib
-      ${TMP_OPENSSL_LIBRARIES}
     DOC "Specify the OpenSSL library here."
   )
 
diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc
index 74ce7f43858..bb8542c7dd5 100644
--- a/src/server/authserver/authserver.rc
+++ b/src/server/authserver/authserver.rc
@@ -17,7 +17,7 @@
  */
 
 #include "resource.h"
-#include "../shared/revision.h"
+#include "revision.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 711add64122..28256361d14 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -16,8 +16,9 @@ set(collision_STAT_SRCS
 
 include_directories(
   ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
-  ${CMAKE_SOURCE_DIR}/externals/mysql
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 2e51f5575b9..2222e517586 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -50,7 +50,6 @@ file(GLOB_RECURSE sources_Spells Spells/*.cpp Spells/*.h)
 file(GLOB_RECURSE sources_Tools Tools/*.cpp Tools/*.h)
 file(GLOB_RECURSE sources_Weather Weather/*.cpp Weather/*.h)
 file(GLOB_RECURSE sources_World World/*.cpp World/*.h)
-file(GLOB_RECURSE sources_PrecompiledHeaders PrecompiledHeaders/*.cpp PrecompiledHeaders/*.h)
 
 # Create game-libary
 set(game_STAT_SRCS
@@ -92,6 +91,10 @@ set(game_STAT_SRCS
 )
 
 if( MSVC )
+  set(sources_PrecompiledHeaders 
+    PrecompiledHeaders/gamePCH.cpp
+    PrecompiledHeaders/gamePCH.h
+  )
   set(game_STAT_SRCS
     ${game_STAT_SRCS}
     ${sources_PrecompiledHeaders}
@@ -99,6 +102,9 @@ if( MSVC )
 endif()
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/externals/mersennetwister
   ${CMAKE_SOURCE_DIR}/externals/zlib
@@ -184,8 +190,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Tools
   ${CMAKE_SOURCE_DIR}/src/server/game/Weather
   ${CMAKE_SOURCE_DIR}/src/server/game/World
-  ${MYSQL_INCLUDE_DIR}
-  ${ACE_INCLUDE_DIR}
 )
 
 add_library(game STATIC ${game_STAT_SRCS})
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 1b8c2613ebe..05c4ba43223 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -40,6 +40,7 @@
 #include "ace/Singleton.h"
 #include "SQLStorage.h"
 #include "Vehicle.h"
+#include "Weather.h"
 #include "ObjectMgr.h"
 #include <string>
 #include <map>
@@ -294,20 +295,6 @@ struct QuestPOI
 typedef std::vector<QuestPOI> QuestPOIVector;
 typedef UNORDERED_MAP<uint32, QuestPOIVector> QuestPOIMap;
 
-#define WEATHER_SEASONS 4
-struct WeatherSeasonChances
-{
-    uint32 rainChance;
-    uint32 snowChance;
-    uint32 stormChance;
-};
-
-struct WeatherData
-{
-    WeatherSeasonChances data[WEATHER_SEASONS];
-    uint32 ScriptId;
-};
-
 struct GraveYardData
 {
     uint32 safeLocId;
diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index bfe901fc527..9699b65927d 100644
--- a/src/server/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
@@ -31,6 +31,20 @@
 
 class Player;
 
+#define WEATHER_SEASONS 4
+struct WeatherSeasonChances
+{
+    uint32 rainChance;
+    uint32 snowChance;
+    uint32 stormChance;
+};
+
+struct WeatherData
+{
+    WeatherSeasonChances data[WEATHER_SEASONS];
+    uint32 ScriptId;
+};
+
 enum WeatherState
 {
     WEATHER_STATE_FINE              = 0,
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
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 8b36f80effe..eb59ace8c88 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -38,7 +38,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/externals/gsoap
   ${CMAKE_SOURCE_DIR}/externals/sockets/include
   ${CMAKE_SOURCE_DIR}/externals/mersennetwister
-  ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/src/server/collision
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/shared
diff --git a/src/server/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc
index 939d6bdd355..191e904300f 100644
--- a/src/server/worldserver/worldserver.rc
+++ b/src/server/worldserver/worldserver.rc
@@ -17,7 +17,7 @@
  */
 
 #include "resource.h"
-#include "../shared/revision.h"
+#include "revision.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////