sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sdk/Application: Fix compilation in server mode 

Former-commit-id: f22b42bca6bd277e08739e73e93a330943d41385 [formerly ad21870d5a8a0a5ddc69be18de7d815a492e197e] [formerly 8c313395815420b252b4b902c56dd2a950049eb5 [formerly add61b18ad8c4059e410a311aeb3eeaa9572c551]]
Former-commit-id: e01dc9b1b7dd6a686d748988967e19f828027664 [formerly e7665c8d40d3f6402b3730ceca27cefb90a08c22]
Former-commit-id: 81aa4614b0704b6996165553abed7f7c40386f44
This commit is contained in:
Lynix 2016-08-29 18:16:33 +02:00
parent c94048d8c3
commit fe539d33ef
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SDK/include/NDK/Application.hpp
View File

@ -127,12 +127,14 @@ namespace Ndk
template<typename T> void SetupWindow(WindowInfo& info, T* renderTarget, std::true_type /*isRenderTarget*/); template<typename T> void SetupWindow(WindowInfo& info, T* renderTarget, std::true_type /*isRenderTarget*/);
template<typename T> void SetupWindow(WindowInfo& /*info*/, T* /*renderTarget*/, std::false_type /*isNotRenderTarget*/); template<typename T> void SetupWindow(WindowInfo& /*info*/, T* /*renderTarget*/, std::false_type /*isNotRenderTarget*/);
std::map<Nz::String, Nz::String> m_parameters;
std::set<Nz::String> m_options;
std::vector<WindowInfo> m_windows; std::vector<WindowInfo> m_windows;
#endif #endif
std::map<Nz::String, Nz::String> m_parameters;
std::set<Nz::String> m_options;
std::list<World> m_worlds; std::list<World> m_worlds;
Nz::Clock m_updateClock; Nz::Clock m_updateClock;
#ifndef NDK_SERVER #ifndef NDK_SERVER
Nz::UInt32 m_overlayFlags; Nz::UInt32 m_overlayFlags;
bool m_exitOnClosedWindows; bool m_exitOnClosedWindows;

2
SDK/include/NDK/Application.inl
View File

@ -350,6 +350,7 @@ namespace Ndk
return s_application; return s_application;
} }
#ifndef NDK_SERVER
template<typename T> template<typename T>
inline void Application::SetupWindow(WindowInfo& info, T* renderTarget, std::true_type) inline void Application::SetupWindow(WindowInfo& info, T* renderTarget, std::true_type)
{ {
@ -372,7 +373,6 @@ namespace Ndk
{ {
} }
#ifndef NDK_SERVER
inline Application::WindowInfo::WindowInfo(std::unique_ptr<Nz::Window>&& window) : inline Application::WindowInfo::WindowInfo(std::unique_ptr<Nz::Window>&& window) :
window(std::move(window)), window(std::move(window)),
renderTarget(nullptr) renderTarget(nullptr)

3
SDK/src/NDK/Application.cpp
View File

@ -3,6 +3,7 @@
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#include <NDK/Application.hpp> #include <NDK/Application.hpp>
#include <Nazara/Core/Log.hpp>
#include <regex> #include <regex>
#ifndef NDK_SERVER #ifndef NDK_SERVER
@ -63,11 +64,13 @@ namespace Ndk
NazaraWarning("Ignored command-line argument #" + Nz::String::Number(i) + " \"" + argument + '"'); NazaraWarning("Ignored command-line argument #" + Nz::String::Number(i) + " \"" + argument + '"');
} }
#ifndef NDK_SERVER
if (HasOption("console")) if (HasOption("console"))
EnableConsole(true); EnableConsole(true);
if (HasOption("fpscounter")) if (HasOption("fpscounter"))
EnableFPSCounter(true); EnableFPSCounter(true);
#endif
} }
/*! /*!