diff options
author | click <none@none> | 2010-08-07 21:48:20 +0200 |
---|---|---|
committer | click <none@none> | 2010-08-07 21:48:20 +0200 |
commit | 6baf3f9a597bc66f645cf36e3ccb0284a9df9026 (patch) | |
tree | 768eb3a1886a5c2a109a235829088f4ab748904f /src | |
parent | f8fe880982986dfb81847815ee6fe42025ee2768 (diff) |
Buildsystem/CMake: Adjust headerlocations on Windows so that they are correctly detected.
- Remove caching of OpenSSL info (for you, zor!)
- Adjust MySQL header-location in a DB-file (haha to Machiavelli, more work for you!)
- Add OpenSSL-header location to the shared-library (Fixes build)
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/server/shared/CMakeLists.txt | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | src/server/shared/Database/QueryResult.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index be46386813c..02d9122b66b 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -92,6 +92,7 @@ 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} ) diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h index 5562a9abfa4..0c87025843d 100644..100755 --- a/src/server/shared/Database/QueryResult.h +++ b/src/server/shared/Database/QueryResult.h @@ -29,7 +29,7 @@ #ifdef _WIN32 #define FD_SETSIZE 1024 #include <winsock2.h> -#include <mysql/mysql.h> +#include <mysql.h> #else #include <mysql.h> #endif |