aboutsummaryrefslogtreecommitdiff
path: root/zenserver/zenserver.cpp
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-11-03 09:26:28 +0100
committerMartin Ridgers <[email protected]>2021-11-03 09:26:28 +0100
commit429cea06fb0b1f675608e81166ae4904cd02701c (patch)
treeb3f4c5bd8ef34f35d1dfe16f11a56c754eecf2d9 /zenserver/zenserver.cpp
parentRemoved if-def ZEN_PLATFORM_WINDOWS as its covered by WITH_COMPUTE now (diff)
downloadzen-429cea06fb0b1f675608e81166ae4904cd02701c.tar.xz
zen-429cea06fb0b1f675608e81166ae4904cd02701c.zip
Broadened if-def ZEN_PLATFORM_WINDOWS in zenserver.cpp:main()
Diffstat (limited to 'zenserver/zenserver.cpp')
-rw-r--r--zenserver/zenserver.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index d8f213e56..7795a2890 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -942,6 +942,7 @@ main(int argc, char* argv[])
try
{
+#if ZEN_PLATFORM_WINDOWS
ZenServerOptions GlobalOptions;
ZenServiceConfig ServiceConfig;
ParseGlobalCliOptions(argc, argv, GlobalOptions, ServiceConfig);
@@ -952,7 +953,6 @@ main(int argc, char* argv[])
std::filesystem::create_directories(GlobalOptions.DataDir);
}
-#if ZEN_PLATFORM_WINDOWS
if (GlobalOptions.InstallService)
{
WindowsService::Install();
@@ -966,10 +966,11 @@ main(int argc, char* argv[])
std::exit(0);
}
-#endif
ZenWindowsService App(GlobalOptions, ServiceConfig);
return App.ServiceMain();
+#else
+#endif // ZEN_PLATFORM_WINDOWS
}
catch (std::exception& Ex)
{