UnrealEngine/Plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build issues caused by cherry-pick order between v2.0.x and v2.1.x releases; the dev branch already contains these fixes

Browse Source
This commit is contained in:
Mamadou Babaei
2024-08-16 19:55:24 +02:00
parent 2960661a0c
commit ac65009fdd
2 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs
+2 -25
View File
@@ -102,9 +102,6 @@ public class SenseGloveConnectImpl : ModuleRules
{ {
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android"));
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
#else
Debug.Assert(false, "Developing for Android on UE versions older than 5.1 is not supported!");
#endif
LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64")); LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64"));
LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64")); LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64"));
@@ -126,7 +123,7 @@ public class SenseGloveConnectImpl : ModuleRules
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64"));
} }
else if (Target.Platform == UnrealTargetPlatform.LinuxArm64) else if (bIsLinuxArm64)
{ {
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux"));
LibraryName = string.Format("lib{0}.a", LibraryName); LibraryName = string.Format("lib{0}.a", LibraryName);
@@ -225,26 +222,6 @@ public class SenseGloveConnectImpl : ModuleRules
{ {
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android"));
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
#else
Debug.Assert(false, "Developing for Android on UE versions older than 5.1 is not supported!");
#endif
#if UE_5_2_OR_LATER
if (Target.Architecture == UnrealArch.Arm64)
{
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "arm64"));
}
else if (Target.Architecture == UnrealArch.X64)
{
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x64"));
}
else
{
Debug.Assert(false, "Unsupported Android architecture!");
}
#else
IAndroidToolChain ToolChain = AndroidExports.CreateToolChain(Target.ProjectFile);
List<string> Architectures = ToolChain.GetAllArchitectures();
LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64")); LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64"));
LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64")); LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64"));
@@ -266,7 +243,7 @@ public class SenseGloveConnectImpl : ModuleRules
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64"));
} }
else if (Target.Platform == UnrealTargetPlatform.LinuxArm64) else if (bIsLinuxArm64)
{ {
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux"));
LibraryName = string.Format("lib{0}.a", LibraryName); LibraryName = string.Format("lib{0}.a", LibraryName);
Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs
+1 -4
View File
@@ -101,9 +101,6 @@ public class SenseGloveCoreImpl : ModuleRules
{ {
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android"));
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
#else
Debug.Assert(false, "Developing for Android on UE versions older than 5.1 is not supported!");
#endif
LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64")); LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64"));
LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64")); LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64"));
@@ -125,7 +122,7 @@ public class SenseGloveCoreImpl : ModuleRules
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64"));
} }
else if (Target.Platform == UnrealTargetPlatform.LinuxArm64) else if (bIsLinuxArm64)
{ {
LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux"));
LibraryName = string.Format("lib{0}.a", LibraryName); LibraryName = string.Format("lib{0}.a", LibraryName);