diff options
| author | Per Larsson <[email protected]> | 2021-09-17 13:11:04 +0200 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-09-17 13:11:04 +0200 |
| commit | d812fcc3eab88733cbef084eefd089d22177aae4 (patch) | |
| tree | bb64fa6c64f9707246577de148749b35d1e25987 /zenserver/zenserver.cpp | |
| parent | Added helper function for iterating string tokens. (diff) | |
| parent | Added namespace scopes to more includes for better consistency (diff) | |
| download | zen-d812fcc3eab88733cbef084eefd089d22177aae4.tar.xz zen-d812fcc3eab88733cbef084eefd089d22177aae4.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index f1960ab36..eb0324161 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -11,7 +11,7 @@ #include <zencore/timer.h> #include <zencore/windows.h> #include <zenhttp/httpserver.h> -#include <zenserverprocess.h> +#include <zenutil/zenserverprocess.h> #include <zenstore/cas.h> #include <zenstore/cidstore.h> @@ -82,6 +82,8 @@ #define ZEN_APP_NAME "Zen store" +namespace zen { + class ZenServer { ZenServerState::ZenServerEntry* m_ServerEntry = nullptr; @@ -420,9 +422,13 @@ private: bool m_DebugOptionForcedCrash = false; }; +} + int main(int argc, char* argv[]) { + using namespace zen; + mi_version(); ZenServerOptions GlobalOptions; |