diff --git a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs index 07d73d73..be34b2d8 100644 --- a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs +++ b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs @@ -102,9 +102,6 @@ public class SenseGloveConnectImpl : ModuleRules { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android")); 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")); LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64")); @@ -126,7 +123,7 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64")); } - else if (Target.Platform == UnrealTargetPlatform.LinuxArm64) + else if (bIsLinuxArm64) { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); 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, "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 Architectures = ToolChain.GetAllArchitectures(); LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64")); LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64")); @@ -266,7 +243,7 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64")); } - else if (Target.Platform == UnrealTargetPlatform.LinuxArm64) + else if (bIsLinuxArm64) { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs index 7ec807cd..f10d17c5 100644 --- a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs +++ b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs @@ -101,9 +101,6 @@ public class SenseGloveCoreImpl : ModuleRules { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android")); 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")); LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64")); @@ -125,7 +122,7 @@ public class SenseGloveCoreImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64")); } - else if (Target.Platform == UnrealTargetPlatform.LinuxArm64) + else if (bIsLinuxArm64) { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName);