diff options
| author | Martin Ridgers <[email protected]> | 2021-10-16 10:53:54 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-16 10:53:54 +0200 |
| commit | 8030078d08379d011781c8c09d6840fc24aaec23 (patch) | |
| tree | 15c5f9b4032140211f34713a034e36ce4b697f78 /zenserver/zenserver.cpp | |
| parent | Merged main (diff) | |
| parent | Fixed up some more windows include issues (diff) | |
| download | zen-8030078d08379d011781c8c09d6840fc24aaec23.tar.xz zen-8030078d08379d011781c8c09d6840fc24aaec23.zip | |
Merged main
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index a1cd01d33..c9b52604d 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -16,17 +16,21 @@ #include <zenstore/cidstore.h> #include <zenutil/zenserverprocess.h> -#include <fmt/format.h> - #if ZEN_USE_MIMALLOC +ZEN_THIRD_PARTY_INCLUDES_START # include <mimalloc-new-delete.h> # include <mimalloc.h> +ZEN_THIRD_PARTY_INCLUDES_END #endif +ZEN_THIRD_PARTY_INCLUDES_START +#include <fmt/format.h> #include <asio.hpp> +#include <lua.hpp> +ZEN_THIRD_PARTY_INCLUDES_END + #include <exception> #include <list> -#include <lua.hpp> #include <optional> #include <regex> #include <set> @@ -64,7 +68,9 @@ #if USE_SENTRY # define SENTRY_BUILD_STATIC 1 +ZEN_THIRD_PARTY_INCLUDES_START # include <sentry.h> +ZEN_THIRD_PARTY_INCLUDES_END // Sentry currently does not automatically add all required Windows // libraries to the linker when consumed via vcpkg |