From dd30c9a6217d27872de0f58517397ac3ad202deb Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 3 Jun 2012 23:36:40 -0700 Subject: [PATCH] Make this stuff compile on MSVC Fix some missing headers I have to redo the tests --- src/CMakeLists.txt | 3 ++- src/kernel/connection.c | 1 + src/kernel/faction.c | 1 + src/kernel/pool_test.c | 2 ++ src/tests_test.c | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07f926c5b..951245cab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,8 @@ set (CORE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "Eressea Core h find_package (Lua51 REQUIRED) find_package (LibXml2 REQUIRED) +find_package (Curses REQUIRED) +find_package (SQLite3 REQUIRED) include_directories (${CORE_INCLUDE_DIR}) include_directories (${CRITBIT_INCLUDE_DIR}) @@ -139,7 +141,6 @@ add_library(${PROJECT_NAME} modules/wormhole.c modules/xecmd.c modules/xmas.c - tests.c tests_test.c triggers/changefaction.c triggers/changerace.c diff --git a/src/kernel/connection.c b/src/kernel/connection.c index ec3c31b67..5d4d24d19 100644 --- a/src/kernel/connection.c +++ b/src/kernel/connection.c @@ -27,6 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "version.h" #include +#include #include #include #include diff --git a/src/kernel/faction.c b/src/kernel/faction.c index ff011bc38..7cde125de 100644 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -36,6 +36,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* util includes */ #include #include +#include #include #include #include diff --git a/src/kernel/pool_test.c b/src/kernel/pool_test.c index 38be7aaae..3b801a9b9 100644 --- a/src/kernel/pool_test.c +++ b/src/kernel/pool_test.c @@ -2,10 +2,12 @@ #include #include "pool.h" +#include "magic.h" #include "unit.h" #include "item.h" #include "region.h" #include "skill.h" + #include #include diff --git a/src/tests_test.c b/src/tests_test.c index c685d8a50..250ea5ec6 100644 --- a/src/tests_test.c +++ b/src/tests_test.c @@ -7,6 +7,7 @@ #include #include +#include static void test_recreate_world(CuTest * tc) {