From ba788616e80194dfb4ce562fcccadc9c2807772a Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Tue, 5 Dec 2023 03:27:38 +0000 Subject: [PATCH] Bugfix SocketIO Plugin Not Building Correctly for LinuxARM64 --- .../SocketIOClient/SocketIOClient.Build.cs | 46 ++++---- .../Source/SocketIOLib/SocketIOLib.Build.cs | 110 +++++++++--------- 2 files changed, 77 insertions(+), 79 deletions(-) diff --git a/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOClient/SocketIOClient.Build.cs b/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOClient/SocketIOClient.Build.cs index 765c98f..1690d7c 100644 --- a/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOClient/SocketIOClient.Build.cs +++ b/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOClient/SocketIOClient.Build.cs @@ -25,28 +25,32 @@ namespace UnrealBuildTool.Rules public bool LoadLib(ReadOnlyTargetRules Target) { - bool isLibrarySupported = false; + bool isLibrarySupported = true; - if (Target.Platform == UnrealTargetPlatform.Win64) - { - isLibrarySupported = true; - } - else if (Target.Platform == UnrealTargetPlatform.Linux) - { - isLibrarySupported = true; - } - else if (Target.Platform == UnrealTargetPlatform.IOS) - { - isLibrarySupported = true; - } - else if (Target.Platform == UnrealTargetPlatform.Mac) - { - isLibrarySupported = true; - } - else if (Target.Platform == UnrealTargetPlatform.Android) - { - isLibrarySupported = true; - } + //if (Target.Platform == UnrealTargetPlatform.Win64) + //{ + // isLibrarySupported = true; + //} + //else if (Target.Platform == UnrealTargetPlatform.Linux) + //{ + // isLibrarySupported = true; + //} + //else if (Target.Platform == UnrealTargetPlatform.LinuxAArch64) + //{ + // isLibrarySupported = true; + //} + //else if (Target.Platform == UnrealTargetPlatform.IOS) + //{ + // isLibrarySupported = true; + //} + //else if (Target.Platform == UnrealTargetPlatform.Mac) + //{ + // isLibrarySupported = true; + //} + //else if (Target.Platform == UnrealTargetPlatform.Android) + //{ + // isLibrarySupported = true; + //} return isLibrarySupported; } diff --git a/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOLib/SocketIOLib.Build.cs b/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOLib/SocketIOLib.Build.cs index eec6c8c..b21ff7e 100644 --- a/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOLib/SocketIOLib.Build.cs +++ b/CorruptedMemory/Plugins/SocketIOClient/Source/SocketIOLib/SocketIOLib.Build.cs @@ -13,65 +13,59 @@ namespace UnrealBuildTool.Rules get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../ThirdParty/")); } } - public SocketIOLib(ReadOnlyTargetRules Target) : base(Target) - { - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - bUseRTTI = true; - bEnableExceptions = true; + public SocketIOLib(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + bUseRTTI = true; + bEnableExceptions = true; - PublicIncludePaths.AddRange( - new string[] { - Path.Combine(ModuleDirectory, "Public"), - } - ); - - - PrivateIncludePaths.AddRange( - new string[] { - Path.Combine(ModuleDirectory, "Private"), - Path.Combine(ModuleDirectory, "Private/internal"), - Path.Combine(ThirdPartyPath, "websocketpp"), - Path.Combine(ThirdPartyPath, "asio/asio/include"), - Path.Combine(ThirdPartyPath, "rapidjson/include"), - } - ); - - - PublicDependencyModuleNames.AddRange( - new string[] - { - "Core", - } - ); - - - PrivateDependencyModuleNames.AddRange( - new string[] - { - "CoreUObject", - "Engine", - "OpenSSL" - } - ); - - - DynamicallyLoadedModuleNames.AddRange( - new string[] - { - } - ); - - //Setup TLS support | Maybe other platforms work as well (untested) - if ( - Target.Platform == UnrealTargetPlatform.Win64 || - Target.Platform == UnrealTargetPlatform.Mac || - Target.Platform == UnrealTargetPlatform.Linux || - Target.Platform == UnrealTargetPlatform.IOS|| - Target.Platform == UnrealTargetPlatform.Android - ) + PublicIncludePaths.AddRange( + new string[] { - PublicDefinitions.Add("SIO_TLS=1"); + Path.Combine(ModuleDirectory, "Public"), } - } + ); + + + PrivateIncludePaths.AddRange( + new string[] + { + Path.Combine(ModuleDirectory, "Private"), + Path.Combine(ModuleDirectory, "Private/internal"), + Path.Combine(ThirdPartyPath, "websocketpp"), + Path.Combine(ThirdPartyPath, "asio/asio/include"), + Path.Combine(ThirdPartyPath, "rapidjson/include"), + } + ); + + + PublicDependencyModuleNames.AddRange( + new string[] + { + "Core", + } + ); + + + PrivateDependencyModuleNames.AddRange( + new string[] + { + "CoreUObject", + "Engine", + "OpenSSL" + } + ); + + + DynamicallyLoadedModuleNames.AddRange( + new string[] + { + } + ); + + //Setup TLS support | Maybe other platforms work as well (untested) + + PublicDefinitions.Add("SIO_TLS=1"); + } } -} +} \ No newline at end of file