diff options
| author | click <none@none> | 2010-08-08 03:33:21 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-08 03:33:21 +0200 |
| commit | 9a8342abb76e15a194d40be7d568ba9442ac7214 (patch) | |
| tree | c723764074ae8e20d3da065acc1c2298f4aae820 /src/server/shared | |
| parent | 8082363fc10419f61dba85e4668b8401bb0cc28f (diff) | |
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
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/server/shared/Database/Database.h | 8 | ||||
| -rwxr-xr-x | src/server/shared/Database/QueryResult.h | 8 |
3 files changed, 13 insertions, 10 deletions
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 |
