bump senseglove libraries to v2.102.0-4a8bd81d and drop support for ue 5.1 and epic native toolchain v20

CHANGELOG.md

@@ -62,6 +62,15 @@ This is a bugfix release addressing mostly RunUAT build issues on Unreal Engine
 
 - Removed support for Android armeabi-v7a and x86 architectures as they are no longer supported by the supported engine versions.
 
+### Changed
+
+- The SenseGlove libraries have been updated to v2.103.0-4a8bd81d.
+- Updated the Directory Structure section of the main README file to reflect the latest toolchain support status.
+
+### Removed
+
+- Dropped support for Unreal Engine 5.1 and Epic Native Toolchain v20 (used to build UE 5.0 and 5.1 Linux dependencies).
+
 ## [2.0.2] - 2024-04-25
 
 This is a patch release with no code changes.

README.md

@@ -8,9 +8,9 @@ This repository relies on Git LFS for storing binary blobs (e.g. third-party lib
 
 |          | **Windows (MSVC 2017)** | **Windows (MSVC 2019)** | **Windows (MSVC 2022)** | **Linux x86-64 (Native Toolchain)** | **Linux AArch64 (Native Toolchain)** | **Android (NDK)** | **UE Marketplace Version** | **Azure DevOps Version** |
 |----------|:-----------------------:|:-----------------------:|:-----------------------:|:-----------------------------------:|:------------------------------------:|:-----------------:|:--------------------------:|:------------------------:|
-| **5.4**  |            ❌            |            ❌            |         ✅ v2.0.x        |               ✅ v2.0.x              |               ✅ v2.0.x               |  ✅ v2.0.x (r25b)  |          ✅ v2.0.8          |         ✅ v2.0.8         |
-| **5.3**  |            ❌            |         ✅ v2.0.x        |         ✅ v2.0.x        |               ✅ v2.0.x              |               ✅ v2.0.x               |  ✅ v2.0.x (r25b)  |          ✅ v2.0.8          |         ✅ v2.0.8         |
-| **5.2**  |            ❌            |         ✅ v2.0.x        |         ✅ v2.0.x        |               ✅ v2.0.x              |               ✅ v2.0.x               |  ✅ v2.0.x (r25b)  |          ✅ v2.0.8          |         ✅ v2.0.8         |
+| **5.4**  |            ❌            |            ❌            |         ✅ v2.0.x        |               ✅ v2.0.x              |               ✅ v2.0.x               |  ✅ v2.0.x (r25b)  |          ✅ v2.0.2          |         ✅ v2.0.2         |
+| **5.3**  |            ❌            |         ✅ v2.0.x        |         ✅ v2.0.x        |               ✅ v2.0.x              |               ✅ v2.0.x               |  ✅ v2.0.x (r25b)  |          ✅ v2.0.2          |         ✅ v2.0.2         |
+| **5.2**  |            ❌            |         ✅ v2.0.x        |         ✅ v2.0.x        |               ✅ v2.0.x              |               ✅ v2.0.x               |  ✅ v2.0.x (r25b)  |          ✅ v2.0.2          |         ✅ v2.0.2         |
 | **5.1**  |            ❌            |         ⚠️ v2.0.x        |         ⚠️ v2.0.x        |               ⚠️ v2.0.x              |               ⚠️ v2.0.x               |  ⚠️ v2.0.x (r25b)  |          ⚠️ v2.0.1          |         ⚠️ v2.0.2         |
 | **5.0**  |            ❌            |         ⚠️ v1.6.x        |         ⚠️ v1.6.x        |               ⚠️ v1.6.x              |               ⚠️ v1.6.x               |  ⚠️ v1.6.x (r21e)  |          ⚠️ v1.6.1          |         ⚠️ v1.6.1         |
 | **4.27** |         ⚠️ v1.4.x        |         ⚠️ v1.4.x        |         ⚠️ v1.4.x        |               ⚠️ v1.4.x              |               ⚠️ v1.4.x               |  ⚠️ v1.4.x (r21e)  |          ⚠️ v1.3.1          |         ⚠️ v1.4.3         |
@@ -170,7 +170,7 @@ Please note that modules postfixed with **Impl** are intended for interal use an
                     │
                     ├── android
                     │     │
-                    │     └── r25b (Android NDK r21b dependencies for UE 5.1)
+                    │     └── r25b (Android NDK r25b dependencies for UE 5.1+)
                     │           │
                     │           ├── arm64 (64-bit ARM variant of Android)
                     │           │     │
@@ -186,20 +186,6 @@ Please note that modules postfixed with **Impl** are intended for interal use an
                     │
                     ├── linux
                     │     │
-                    │     ├── v20 (UE 5.0 and 5.1 Linux dependencies)
-                    │     │     │
-                    │     │     ├── aarch64 (dependencies targeting AArch64 Linux architecture)
-                    │     │     │     │
-                    │     │     │     ├── debug
-                    │     │     │     │
-                    │     │     │     └── release
-                    │     │     │
-                    │     │     └── x86-64 (dependencies targeting x86-64 Linux architecture)
-                    │     │           │
-                    │     │           ├── debug
-                    │     │           │
-                    │     │           └── release
-                    │     │
                     │     ├── v21 (UE 5.2 Linux dependencies)
                     │     │     │
                     │     │     ├── aarch64 (dependencies targeting AArch64 Linux architecture)
@@ -214,7 +200,7 @@ Please note that modules postfixed with **Impl** are intended for interal use an
                     │     │           │
                     │     │           └── release
                     │     │
-                    │     └── v22 (UE 5.3 Linux dependencies)
+                    │     └── v22 (UE 5.3 and 5.4 Linux dependencies)
                     │           │
                     │           ├── aarch64 (dependencies targeting AArch64 Linux architecture)
                     │           │     │

Source/SenseGlove/Private/SenseGlove/Animation/SGVirtualHandAnimInstanceProxy.cpp

@@ -91,13 +91,7 @@ bool FSGVirtualHandAnimInstanceProxy::Evaluate(FPoseContext& Output)
         return FAnimInstanceProxy::Evaluate(Output);
     }
 
-    const USkeletalMesh* HandMesh{VirtualHand->
-#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1
-        GetSkeletalMeshAsset()
-#else   /* ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1 */
-        SkeletalMesh
-#endif  /* ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 1 */
-    };
+    const USkeletalMesh* HandMesh{VirtualHand->GetSkeletalMeshAsset()};
     if (!IsValid(HandMesh))
     {
         return FAnimInstanceProxy::Evaluate(Output);

Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs

@@ -96,6 +96,9 @@ 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"));
@@ -111,15 +114,13 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));
 #elif 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"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
 
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64"));
         }
-        else if (bIsLinuxArm64)
+        else if (Target.Platform == UnrealTargetPlatform.LinuxArm64)
         {
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux"));
             LibraryName = string.Format("lib{0}.a", LibraryName);
@@ -128,8 +129,6 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));
 #elif 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"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -141,12 +140,10 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "win64"));
             switch (Target.WindowsPlatform.Compiler)
             {
-#if UE_5_0_OR_LATER
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
-#endif
-#if ! UE_5_4_OR_LATER && UE_5_0_OR_LATER
+#if ! UE_5_4_OR_LATER
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
@@ -222,6 +219,26 @@ 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<string> Architectures = ToolChain.GetAllArchitectures();
 
             LibraryPathAnroidArm64 = Path.GetFullPath(Path.Combine(LibraryPath, "arm64"));
             LibraryPathAnroidx64 = Path.GetFullPath(Path.Combine(LibraryPath, "x64"));
@@ -237,15 +254,13 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));
 #elif 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"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
 
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64"));
         }
-        else if (bIsLinuxArm64)
+        else if (Target.Platform == UnrealTargetPlatform.LinuxArm64)
         {
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux"));
             LibraryName = string.Format("lib{0}.a", LibraryName);
@@ -254,8 +269,6 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));
 #elif 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"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -267,12 +280,10 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "win64"));
             switch (Target.WindowsPlatform.Compiler)
             {
-#if UE_5_0_OR_LATER
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
-#endif
-#if ! UE_5_4_OR_LATER && UE_5_0_OR_LATER
+#if ! UE_5_4_OR_LATER
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;

Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs

@@ -95,6 +95,9 @@ 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"));
@@ -110,15 +113,13 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));
 #elif 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"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
 
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "x86-64"));
         }
-        else if (bIsLinuxArm64)
+        else if (Target.Platform == UnrealTargetPlatform.LinuxArm64)
         {
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux"));
             LibraryName = string.Format("lib{0}.a", LibraryName);
@@ -127,8 +128,6 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));
 #elif 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"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -140,12 +139,10 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "win64"));
             switch (Target.WindowsPlatform.Compiler)
             {
-#if UE_5_0_OR_LATER
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
-#endif
-#if ! UE_5_4_OR_LATER && UE_5_0_OR_LATER
+#if ! UE_5_4_OR_LATER
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;