From 72748ee9f1cb7899bb298c58c79cf1a2048cbea7 Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Tue, 6 Apr 2021 19:24:16 +0700
Subject: [PATCH] refactor(Core/Common): generalise platform specific includes
 in common/Platform (#5058)

---
 src/common/CMakeLists.txt                           | 1 +
 src/common/{Utilities => Platform}/ServiceWin32.cpp | 0
 src/common/{Utilities => Platform}/ServiceWin32.h   | 0
 src/server/CMakeLists.txt                           | 8 +++++++-
 src/server/worldserver/CMakeLists.txt               | 2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)
 rename src/common/{Utilities => Platform}/ServiceWin32.cpp (100%)
 rename src/common/{Utilities => Platform}/ServiceWin32.h (100%)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index cdc0d95d4..ae8c21fba 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -14,6 +14,7 @@ CollectSourceFiles(
   PRIVATE_SOURCES
   # Exclude
   ${CMAKE_CURRENT_SOURCE_DIR}/Debugging
+  ${CMAKE_CURRENT_SOURCE_DIR}/Platform
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
 # Manually set sources for Debugging directory as we don't want to include WheatyExceptionReport in common project
diff --git a/src/common/Utilities/ServiceWin32.cpp b/src/common/Platform/ServiceWin32.cpp
similarity index 100%
rename from src/common/Utilities/ServiceWin32.cpp
rename to src/common/Platform/ServiceWin32.cpp
diff --git a/src/common/Utilities/ServiceWin32.h b/src/common/Platform/ServiceWin32.h
similarity index 100%
rename from src/common/Utilities/ServiceWin32.h
rename to src/common/Platform/ServiceWin32.h
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 5d82a1415..ee9271ddd 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -9,11 +9,17 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# Crash logs for windows
+# Specified files for Windows
 if (WIN32)
+# Crash logs
 set(winDebugging
   ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
   ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h)
+
+# Service
+set(winService
+  ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.cpp
+  ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.h)
 endif()
 
 add_subdirectory(shared)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index a249c8501..6cd093486 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -16,7 +16,7 @@ CollectSourceFiles(
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
 if( WIN32 )
-  list(APPEND PRIVATE_SOURCES ${winDebugging})
+  list(APPEND PRIVATE_SOURCES ${winDebugging} ${winService})
   if ( MSVC )
     list(APPEND PRIVATE_SOURCES worldserver.rc)
   endif()