From 7972d45a869a176442f570356737f596879df710 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 15 Sep 2024 12:40:54 +0200 Subject: Core/Common: Compile ServiceWin32 as part of common project instead of directly adding its source files to both server executables (cherry picked from commit 052f2d0a81460ba484c27d05fe34673cf467c75e) --- src/server/bnetserver/Main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server/bnetserver/Main.cpp') diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp index 31ccf0bfb77..cc28891ecef 100644 --- a/src/server/bnetserver/Main.cpp +++ b/src/server/bnetserver/Main.cpp @@ -111,12 +111,13 @@ int main(int argc, char** argv) auto protobufHandle = Trinity::make_unique_ptr_with_deleter(&dummy, [](void*) { google::protobuf::ShutdownProtobufLibrary(); }); #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS + Trinity::Service::Init(serviceLongName, serviceName, serviceDescription, &main, &m_ServiceStatus); if (winServiceAction == "install") - return WinServiceInstall() ? 0 : 1; + return Trinity::Service::Install(); if (winServiceAction == "uninstall") - return WinServiceUninstall() ? 0 : 1; + return Trinity::Service::Uninstall(); if (winServiceAction == "run") - return WinServiceRun() ? 0 : 1; + return Trinity::Service::Run(); #endif std::string configError; -- cgit v1.2.3