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
This commit is contained in:
click
2010-08-08 03:33:21 +02:00
parent 8082363fc1
commit 9a8342abb7
11 changed files with 42 additions and 34 deletions
+7 -3
View File
@@ -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})
+1 -14
View File
@@ -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;
+14
View File
@@ -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,