From f302b707128c22d7f2d1e069406ee3c01cb232f6 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 19 Aug 2011 14:54:34 +0200 Subject: [PATCH] Changed: #1323 Cmake with snowballs (patch provided by dfighter) --- code/snowballs2/client/src/snowballs_client.cpp | 4 ++++ code/snowballs2/server/chat/src/main.cpp | 3 +++ code/snowballs2/server/collision/src/collision_service.cpp | 4 ++++ code/snowballs2/server/frontend/src/CMakeLists.txt | 2 +- code/snowballs2/server/frontend/src/main.cpp | 4 ++++ code/snowballs2/server/position/src/main.cpp | 3 +++ 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/snowballs2/client/src/snowballs_client.cpp b/code/snowballs2/client/src/snowballs_client.cpp index 3aa4d5540..79ccef7e6 100644 --- a/code/snowballs2/client/src/snowballs_client.cpp +++ b/code/snowballs2/client/src/snowballs_client.cpp @@ -70,6 +70,10 @@ #include "internationalization.h" #include "game_time.h" +#ifdef NL_OS_WINDOWS +#include +#endif + using namespace std; using namespace NLMISC; using namespace NL3D; diff --git a/code/snowballs2/server/chat/src/main.cpp b/code/snowballs2/server/chat/src/main.cpp index 9a1a3d057..37f58eb92 100644 --- a/code/snowballs2/server/chat/src/main.cpp +++ b/code/snowballs2/server/chat/src/main.cpp @@ -36,6 +36,9 @@ // We're using the NeL Service framework, and layer 5 #include +#ifdef NL_OS_WINDOWS +#include +#endif using namespace std; using namespace NLMISC; diff --git a/code/snowballs2/server/collision/src/collision_service.cpp b/code/snowballs2/server/collision/src/collision_service.cpp index fc48d02c3..ffde0c725 100644 --- a/code/snowballs2/server/collision/src/collision_service.cpp +++ b/code/snowballs2/server/collision/src/collision_service.cpp @@ -17,6 +17,10 @@ #include "collision_service.h" #include +#ifdef NL_OS_WINDOWS +#include +#endif + using namespace SBSERVICE; using namespace NLMISC; using namespace NLNET; diff --git a/code/snowballs2/server/frontend/src/CMakeLists.txt b/code/snowballs2/server/frontend/src/CMakeLists.txt index 086ecfcd1..d24c6743e 100644 --- a/code/snowballs2/server/frontend/src/CMakeLists.txt +++ b/code/snowballs2/server/frontend/src/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB SRC *.cpp *.h) -ADD_EXECUTABLE(snowballs_frontend_service ${SRC}) +ADD_EXECUTABLE(snowballs_frontend_service WIN32 ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) diff --git a/code/snowballs2/server/frontend/src/main.cpp b/code/snowballs2/server/frontend/src/main.cpp index ff036fe51..74ccdc50f 100644 --- a/code/snowballs2/server/frontend/src/main.cpp +++ b/code/snowballs2/server/frontend/src/main.cpp @@ -38,6 +38,10 @@ #include #include +#ifdef NL_OS_WINDOWS +#include +#endif + using namespace NLMISC; using namespace NLNET; using namespace std; diff --git a/code/snowballs2/server/position/src/main.cpp b/code/snowballs2/server/position/src/main.cpp index b908d1e73..44a94d560 100644 --- a/code/snowballs2/server/position/src/main.cpp +++ b/code/snowballs2/server/position/src/main.cpp @@ -41,6 +41,9 @@ #include "physics.h" +#ifdef NL_OS_WINDOWS +#include +#endif using namespace NLMISC; using namespace NLNET;