From 944622caf23151fbe4712b9b1b6ab10dbd3c0dba Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Tue, 7 Feb 2023 08:54:39 +0100 Subject: [PATCH] add initial ue5.2 support to the build system along with linux third-party libraries --- .../SenseGloveConnectImpl.Build.cs | 16 ++++++++++++++-- .../SenseGloveCoreImpl.Build.cs | 8 +++++++- .../ThirdParty/lib/linux/v21/debug/libserial.a | 3 +++ .../lib/linux/v21/debug/libsgconnect.a | 3 +++ .../ThirdParty/lib/linux/v21/debug/libsgcore.a | 3 +++ .../ThirdParty/lib/linux/v21/release/libserial.a | 3 +++ .../lib/linux/v21/release/libsgconnect.a | 3 +++ .../ThirdParty/lib/linux/v21/release/libsgcore.a | 3 +++ 8 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 Source/ThirdParty/lib/linux/v21/debug/libserial.a create mode 100644 Source/ThirdParty/lib/linux/v21/debug/libsgconnect.a create mode 100644 Source/ThirdParty/lib/linux/v21/debug/libsgcore.a create mode 100644 Source/ThirdParty/lib/linux/v21/release/libserial.a create mode 100644 Source/ThirdParty/lib/linux/v21/release/libsgconnect.a create mode 100644 Source/ThirdParty/lib/linux/v21/release/libsgcore.a diff --git a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs index a8e50fb2..63cb3577 100644 --- a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs +++ b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs @@ -83,6 +83,7 @@ public class SenseGloveConnectImpl : ModuleRules if (Target.Platform == UnrealTargetPlatform.Android) { +#if ! UE_5_2_OR_LATER IAndroidToolChain ToolChain = AndroidExports.CreateToolChain(Target.ProjectFile); List Architectures = ToolChain.GetAllArchitectures(); foreach (string Arch in Architectures) @@ -95,13 +96,18 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "oculus")); LibraryName = string.Format("lib{0}.a", LibraryName); +#else + Debug.Assert(false, "Developing for Android on UE 5.2 is not yet supported!"); +#endif } else if (Target.Platform == UnrealTargetPlatform.Linux) { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_0_OR_LATER +#if UE_5_2_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); +#elif UE_5_0_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20")); #elif UE_4_27_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19")); @@ -178,6 +184,7 @@ public class SenseGloveConnectImpl : ModuleRules if (Target.Platform == UnrealTargetPlatform.Android) { +#if ! UE_5_2_OR_LATER IAndroidToolChain ToolChain = AndroidExports.CreateToolChain(Target.ProjectFile); List Architectures = ToolChain.GetAllArchitectures(); foreach (string Arch in Architectures) @@ -190,13 +197,18 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "oculus")); LibraryName = string.Format("lib{0}.a", LibraryName); +#else + Debug.Assert(false, "Developing for Android on UE 5.2 is not yet supported!"); +#endif } else if (Target.Platform == UnrealTargetPlatform.Linux) { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_0_OR_LATER +#if UE_5_2_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); +#elif UE_5_0_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20")); #elif UE_4_27_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19")); diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs index 3030d812..5c6efe8f 100644 --- a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs +++ b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs @@ -82,6 +82,7 @@ public class SenseGloveCoreImpl : ModuleRules if (Target.Platform == UnrealTargetPlatform.Android) { +#if ! UE_5_2_OR_LATER IAndroidToolChain ToolChain = AndroidExports.CreateToolChain(Target.ProjectFile); List Architectures = ToolChain.GetAllArchitectures(); foreach (string Arch in Architectures) @@ -94,13 +95,18 @@ public class SenseGloveCoreImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "oculus")); LibraryName = string.Format("lib{0}.a", LibraryName); +#else + Debug.Assert(false, "Developing for Android on UE 5.2 is not yet supported!"); +#endif } else if (Target.Platform == UnrealTargetPlatform.Linux) { LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_0_OR_LATER +#if UE_5_2_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); +#elif UE_5_0_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20")); #elif UE_4_27_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19")); diff --git a/Source/ThirdParty/lib/linux/v21/debug/libserial.a b/Source/ThirdParty/lib/linux/v21/debug/libserial.a new file mode 100644 index 00000000..5a5fd426 --- /dev/null +++ b/Source/ThirdParty/lib/linux/v21/debug/libserial.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ceae83446601cd3a03c07c8bbcdb359c9525c6a1eab36233a2d7b2401e2299b +size 906402 diff --git a/Source/ThirdParty/lib/linux/v21/debug/libsgconnect.a b/Source/ThirdParty/lib/linux/v21/debug/libsgconnect.a new file mode 100644 index 00000000..3e8c4a7b --- /dev/null +++ b/Source/ThirdParty/lib/linux/v21/debug/libsgconnect.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d322ed0d6d1b668f1e28c5c044d586eda2862c522bdb3d3c1a3472a42bb53120 +size 7153452 diff --git a/Source/ThirdParty/lib/linux/v21/debug/libsgcore.a b/Source/ThirdParty/lib/linux/v21/debug/libsgcore.a new file mode 100644 index 00000000..6706b143 --- /dev/null +++ b/Source/ThirdParty/lib/linux/v21/debug/libsgcore.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b308b6e6057f360371587c60ca49061f48daedbcadc0514e8434315b45a08c4 +size 12022554 diff --git a/Source/ThirdParty/lib/linux/v21/release/libserial.a b/Source/ThirdParty/lib/linux/v21/release/libserial.a new file mode 100644 index 00000000..72292449 --- /dev/null +++ b/Source/ThirdParty/lib/linux/v21/release/libserial.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ae80f76c1c094cd218263de0a4e22b8938de5b727e5cf8bc0c60133c15f676a +size 195656 diff --git a/Source/ThirdParty/lib/linux/v21/release/libsgconnect.a b/Source/ThirdParty/lib/linux/v21/release/libsgconnect.a new file mode 100644 index 00000000..edde2494 --- /dev/null +++ b/Source/ThirdParty/lib/linux/v21/release/libsgconnect.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65b2171eb4e9f11696a0fa72067e2a0b0663e8086135ff8b0413bdbce38d5b6b +size 979298 diff --git a/Source/ThirdParty/lib/linux/v21/release/libsgcore.a b/Source/ThirdParty/lib/linux/v21/release/libsgcore.a new file mode 100644 index 00000000..e8ab25bd --- /dev/null +++ b/Source/ThirdParty/lib/linux/v21/release/libsgcore.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:928a77b61c7ec659ff424fa0bf0e56e08727e4409a7d24d750d4449754dfe63a +size 1687022