Bugfix SocketIO Plugin Not Building Correctly for LinuxARM64

This commit is contained in:
Philip W 2023-12-05 03:27:38 +00:00
parent 1b64b02c0d
commit ba788616e8
2 changed files with 77 additions and 79 deletions

View File

@ -25,28 +25,32 @@ namespace UnrealBuildTool.Rules
public bool LoadLib(ReadOnlyTargetRules Target) public bool LoadLib(ReadOnlyTargetRules Target)
{ {
bool isLibrarySupported = false; bool isLibrarySupported = true;
if (Target.Platform == UnrealTargetPlatform.Win64) //if (Target.Platform == UnrealTargetPlatform.Win64)
{ //{
isLibrarySupported = true; // isLibrarySupported = true;
} //}
else if (Target.Platform == UnrealTargetPlatform.Linux) //else if (Target.Platform == UnrealTargetPlatform.Linux)
{ //{
isLibrarySupported = true; // isLibrarySupported = true;
} //}
else if (Target.Platform == UnrealTargetPlatform.IOS) //else if (Target.Platform == UnrealTargetPlatform.LinuxAArch64)
{ //{
isLibrarySupported = true; // isLibrarySupported = true;
} //}
else if (Target.Platform == UnrealTargetPlatform.Mac) //else if (Target.Platform == UnrealTargetPlatform.IOS)
{ //{
isLibrarySupported = true; // isLibrarySupported = true;
} //}
else if (Target.Platform == UnrealTargetPlatform.Android) //else if (Target.Platform == UnrealTargetPlatform.Mac)
{ //{
isLibrarySupported = true; // isLibrarySupported = true;
} //}
//else if (Target.Platform == UnrealTargetPlatform.Android)
//{
// isLibrarySupported = true;
//}
return isLibrarySupported; return isLibrarySupported;
} }

View File

@ -13,65 +13,59 @@ namespace UnrealBuildTool.Rules
get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../ThirdParty/")); } get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../ThirdParty/")); }
} }
public SocketIOLib(ReadOnlyTargetRules Target) : base(Target) public SocketIOLib(ReadOnlyTargetRules Target) : base(Target)
{ {
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
bUseRTTI = true; bUseRTTI = true;
bEnableExceptions = true; bEnableExceptions = true;
PublicIncludePaths.AddRange( PublicIncludePaths.AddRange(
new string[] { 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
)
{ {
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");
}
} }
} }