diff options
| author | Stefan Boberg <[email protected]> | 2023-04-19 10:43:28 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-04-19 10:52:48 +0200 |
| commit | 9fb9d6ce5aaedd4ecf4f7bdc9c33a94b1e6597b2 (patch) | |
| tree | 924c8ede64e087a5bdfeeb87862bc08e325f4ddc /zenserver | |
| parent | added missing #pragma once (diff) | |
| download | zen-9fb9d6ce5aaedd4ecf4f7bdc9c33a94b1e6597b2.tar.xz zen-9fb9d6ce5aaedd4ecf4f7bdc9c33a94b1e6597b2.zip | |
tweaks for enabling unity builds
mostly changes to make sure anonymous namespaces don't clash and a change to avoid windows headers from leaking into other compilation units
unity builds are not yet enabled by default, but can be enabled by uncommenting this line in the root `xmake.lua`
```
--add_rules("c++.unity_build")
```
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/auth/authservice.cpp | 3 | ||||
| -rw-r--r-- | zenserver/diag/logging.cpp | 6 | ||||
| -rw-r--r-- | zenserver/xmake.lua | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/zenserver/auth/authservice.cpp b/zenserver/auth/authservice.cpp index 761c087f4..1cc679540 100644 --- a/zenserver/auth/authservice.cpp +++ b/zenserver/auth/authservice.cpp @@ -1,8 +1,9 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include <auth/authmgr.h> #include <auth/authservice.h> +#include <auth/authmgr.h> + #include <zencore/compactbinarybuilder.h> #include <zencore/string.h> diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp index 1a8b427ca..ca569c467 100644 --- a/zenserver/diag/logging.cpp +++ b/zenserver/diag/logging.cpp @@ -326,7 +326,6 @@ private: memory_buf_t m_CachedDatetime; std::string m_LogId; }; -} // namespace logging bool EnableVTMode() @@ -355,6 +354,8 @@ EnableVTMode() return true; } +} // namespace logging + #if ZEN_USE_SENTRY class sentry_sink final : public spdlog::sinks::base_sink<spdlog::details::null_mutex> @@ -391,8 +392,7 @@ void InitializeLogging(const ZenServerOptions& GlobalOptions) { zen::logging::InitializeLogging(); - - EnableVTMode(); + logging::EnableVTMode(); bool IsAsync = true; spdlog::level::level_enum LogLevel = spdlog::level::info; diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index 992923d48..23bfb9535 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -2,9 +2,10 @@ target("zenserver") set_kind("binary") + add_deps("zencore", "zenhttp", "zenstore", "zenutil") add_headerfiles("**.h") add_files("**.cpp") - add_deps("zencore", "zenhttp", "zenstore", "zenutil") + add_files("zenserver.cpp", {unity_ignored = true }) add_includedirs(".") set_symbols("debug") @@ -17,6 +18,7 @@ target("zenserver") add_ldflags("/MANIFEST:EMBED") add_ldflags("/LTCG") add_files("zenserver.rc") + add_cxxflags("/bigobj") else remove_files("windows/**") end |