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
+5 -2
View File
@@ -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
+4 -4
View File
@@ -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;
+4 -4
View File
@@ -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