jordon/HarmonyLinkUE
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Successful compile, untested

Browse source
This commit is contained in:
Jordon Brooks 2024-05-27 19:43:19 +01:00
parent 15a2622991
commit 47008fcefe
Signed by: jordon
GPG key ID: DBD9758CD53E786A
10 changed files with 84 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/HarmonyLink/HarmonyLink.Build.cs
View file

@ -21,7 +21,6 @@ public class HarmonyLink : ModuleRules
PrivateIncludePaths.AddRange(
new string[] {
// ... add other private include paths required here ...
"ThirdParty/HarmonyLinkLib/include"
}
);
@ -40,34 +39,10 @@ public class HarmonyLink : ModuleRules
PrivateDependencyModuleNames.AddRange(
new string[]
{
// ... add private dependencies that you statically link with here ...
// ... add private dependencies that you statically link with here ...
"HarmonyLinkLib",
}
);
DynamicallyLoadedModuleNames.AddRange(
new string[]
{
// ... add any modules that your module loads dynamically here ...
}
);
// Platform-specific settings for static libraries
if (Target.Platform == UnrealTargetPlatform.Win64)
{
PublicAdditionalLibraries.Add(Path.Combine(PluginDirectory, "Source/ThirdParty/HarmonyLinkLib/lib/Win64/HarmonyLinkLibStatic.lib"));
PublicDefinitions.Add("HARMONYLINKLIB_STATIC=1");
}
else if (Target.Platform == UnrealTargetPlatform.Linux)
{
PublicAdditionalLibraries.Add(Path.Combine(PluginDirectory, "Source/ThirdParty/HarmonyLinkLib/lib/Linux/libHarmonyLinkLibStatic.a"));
PublicDefinitions.Add("HARMONYLINKLIB_STATIC=1");
}
// I shall include this if anyone wishes to provide Mac binaries of HarmonyLink but these are not included by default as I don't own one.
else if (Target.Platform == UnrealTargetPlatform.Mac)
{
PublicAdditionalLibraries.Add(Path.Combine(PluginDirectory, "Source/ThirdParty/HarmonyLinkLib/lib/Mac/libHarmonyLinkLibStatic.a"));
PublicDefinitions.Add("HARMONYLINKLIB_STATIC=1");
}
}
}

2
Source/HarmonyLink/Private/HarmonyLinkLibrary.cpp
View file

@ -2,7 +2,7 @@
#include "HarmonyLinkLibrary.h"
#include <HarmonyLinkLib.h>
#include "HarmonyLinkLib.h"
bool UHarmonyLinkLibrary::IsWine()
{

5
Source/HarmonyLink/Private/Structs/CPUInfo.cpp
View file

@ -11,11 +11,6 @@ FCPUInfo::FCPUInfo(HarmonyLinkLib::FCPUInfo* cpu_info)
PhysicalCores = cpu_info->Physical_Cores;
LogicalCores = cpu_info->Logical_Cores;
for (const HarmonyLinkLib::FString& Flag : cpu_info->Flags)
{
Flags.Add(Flag.c_str());
}
cpu_info->free();
}
else

4
Source/HarmonyLink/Public/Structs/CPUInfo.h
View file

@ -33,10 +33,6 @@ struct FCPUInfo
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="HarmonyLink")
int32 LogicalCores = 0;
// A set of flags representing various features or capabilities of the CPU.
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="HarmonyLink")
TSet<FString> Flags;
// Constructor that initializes the struct with information from an external CPU info source.
// @param cpu_info Pointer to an external FCPUInfo structure to copy data from.
FCPUInfo(HarmonyLinkLib::FCPUInfo* cpu_info);