Fix linux build (part 2/X).

dchapyshev · Aug 27, 2023 · 2a61b06 · 2a61b06
1 parent fb4b4d4
commit 2a61b06
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/source/host/CMakeLists.txt b/source/host/CMakeLists.txt
@@ -59,6 +59,8 @@ list(APPEND SOURCE_HOST_CORE
     service.h
     service_constants.cc
     service_constants.h
+    service_main.cc
+    service_main.h
     system_settings.cc
     system_settings.h
     unconfirmed_client_session.cc
@@ -140,8 +142,6 @@ if (WIN32)
     list(APPEND SOURCE_HOST_CORE_WIN
         win/sas_injector.cc
         win/sas_injector.h
-        win/service_main.cc
-        win/service_main.h
         win/updater_launcher.cc
         win/updater_launcher.h)
 endif()
@@ -226,7 +226,7 @@ endif()
 target_link_libraries(aspia_host aspia_host_core ${HOST_PLATFORM_LIBS})
 
 # Aspia Host Service
-add_executable(aspia_host_service win/service_entry_point.cc win/service.rc)
+add_executable(aspia_host_service service_entry_point.cc service.rc)
 if (WIN32)
     set_target_properties(aspia_host_service PROPERTIES LINK_FLAGS "/MANIFEST:NO")
 endif()

diff --git a/source/host/linux/aspia-host.service → source/host/linux/aspia-host-service.service b/source/host/linux/aspia-host.service → source/host/linux/aspia-host-service.service
@@ -7,9 +7,9 @@ Conflicts=shutdown.target
 [Service]
 WorkingDirectory=/usr/bin
 #EnvironmentFile=/usr/bin/env.sh
-#Environment=SVC=aspia-host
+#Environment=SVC=aspia-host-service
 Restart=always
-ExecStart=/usr/bin/aspia_host
+ExecStart=/usr/bin/aspia_host_service
 RestartSec=5000ms
 
 [Install]

diff --git a/source/host/win/service.manifest → source/host/service.manifest b/source/host/win/service.manifest → source/host/service.manifest
diff --git a/source/host/win/service.rc → source/host/service.rc b/source/host/win/service.rc → source/host/service.rc
diff --git a/source/host/win/service_entry_point.cc → source/host/service_entry_point.cc b/source/host/win/service_entry_point.cc → source/host/service_entry_point.cc
@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#include "host/win/service_main.h"
+#include "host/service_main.h"
 
 #include "build/build_config.h"
 

diff --git a/source/host/win/service_main.cc → source/host/service_main.cc b/source/host/win/service_main.cc → source/host/service_main.cc
@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#include "host/win/service_main.h"
+#include "host/service_main.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
@@ -46,7 +46,7 @@ void startService()
     if (!controller.isValid())
     {
         std::cout << "Failed to access the service. Not enough rights or service not installed."
-            << std::endl;
+                  << std::endl;
     }
     else
     {
@@ -69,7 +69,7 @@ void stopService()
     if (!controller.isValid())
     {
         std::cout << "Failed to access the service. Not enough rights or service not installed."
-            << std::endl;
+                  << std::endl;
     }
     else
     {

diff --git a/source/host/win/service_main.h → source/host/service_main.h b/source/host/win/service_main.h → source/host/service_main.h
@@ -16,8 +16,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#ifndef HOST_WIN_SERVICE_MAIN_H
-#define HOST_WIN_SERVICE_MAIN_H
+#ifndef HOST_SERVICE_MAIN_H
+#define HOST_SERVICE_MAIN_H
 
 #include "host/host_export.h"
 #include "build/build_config.h"
@@ -32,4 +32,4 @@ int HOST_EXPORT hostServiceMain(int argc, char* argv[]);
 
 } // namespace host
 
-#endif // HOST_WIN_SERVICE_MAIN_H
+#endif // HOST_SERVICE_MAIN_H