Inject different DLLs for galaxy and aspyr builds

Author: jweigelt

SWBF2Admin/Gameserver/ServerManager.cs

@@ -36,7 +36,8 @@ public enum ServerStatus
 
     public class ServerManager : ComponentBase
     {
-        private const string DLLLOADER_FILENAME = "dllloader.exe";
+        private const string DLLLOADER_FILENAME_32 = "dllloader_32.exe";
+        private const string DLLLOADER_FILENAME_64 = "dllloader_64.exe";
         private const int STEAMMODE_PDECT_TIMEOUT = 1000;
         private const int STEAMMODE_MAX_RETRY = 30;
 
@@ -269,10 +270,22 @@ private void InjectRconDllIfRequired()
         {
             if (serverType == GameserverType.GoG || serverType == GameserverType.Steam || serverType == GameserverType.Aspyr)
             {
-                string loader = $"{Core.Files.ParseFileName(Core.Config.ServerPath)}/{DLLLOADER_FILENAME}";
+                string loader;
+                string dll;
+                if (serverType == GameserverType.Aspyr)
+                {
+                    loader = $"{Core.Files.ParseFileName(Core.Config.ServerPath)}/{DLLLOADER_FILENAME_64}";
+                    dll = "rconserver_64.dll";
+                }
+                else
+                {
+                    loader = $"{Core.Files.ParseFileName(Core.Config.ServerPath)}/{DLLLOADER_FILENAME_32}";
+                    dll = "rconserver_32.dll";
+                }
+                
                 if (File.Exists(loader))
                 {
-                    Process.Start(loader, string.Format("--pid {0} --dll {1}", serverProcess.Id, "RconServer.dll"));
+                    Process.Start(loader, string.Format("--pid {0} --dll {1}", serverProcess.Id, dll));
                 }
                 else
                 {

rconserver-aspyr/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(rconserver)
+project(rconserver_64)
 
 set(CMAKE_BUILD_TYPE Release)
 set(CMAKE_GENERATOR_PLATFORM amd64)
@@ -10,9 +10,9 @@ set(SOURCES
         Logger.cpp
         )
 
-add_library(rconserver SHARED ${SOURCES})
-target_compile_definitions(rconserver PRIVATE RCONSERVER_EXPORTS _WINDOWS _USRDLL)
-set_property(TARGET rconserver PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedRelease")
+add_library(rconserver_64 SHARED ${SOURCES})
+target_compile_definitions(rconserver_64 PRIVATE RCONSERVER_EXPORTS _WINDOWS _USRDLL)
+set_property(TARGET rconserver_64 PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedRelease")
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     message(STATUS "Compiling for 64-bit architecture")

rconserver-galaxy/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(rconserver)
+project(rconserver_32)
 
 set(CMAKE_BUILD_TYPE Release)
 set(CMAKE_GENERATOR_PLATFORM x86)
@@ -13,6 +13,6 @@ set(SOURCES
         RconServer.cpp
         )
 
-add_library(rconserver SHARED ${SOURCES})
-target_compile_definitions(rconserver PRIVATE RCONSERVER_EXPORTS _WINDOWS _USRDLL)
+add_library(rconserver_32 SHARED ${SOURCES})
+target_compile_definitions(rconserver_32 PRIVATE RCONSERVER_EXPORTS _WINDOWS _USRDLL)
 set_property(TARGET rconserver PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedRelease")