From d402c60a86b6fc7a9f5d3d92a722c8537f768e7e Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Tue, 15 Apr 2025 17:13:14 +0200 Subject: [PATCH] add initial support for epic native toolchain v24 --- Handbook/src/appendix/changelog.md | 4 ++++ .../SenseGloveConnectImpl.Build.cs | 16 ++++++++++++---- .../SenseGloveCoreImpl.Build.cs | 8 ++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Handbook/src/appendix/changelog.md b/Handbook/src/appendix/changelog.md index 38480c63..c246cd74 100644 --- a/Handbook/src/appendix/changelog.md +++ b/Handbook/src/appendix/changelog.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Added support for Epic Native Toolchain `v24` which will be shipped with the upcoming UE `5.6`. + ### Changed - Bumped the SenseGlove libraries to `v2.106.0-d5361a48`. diff --git a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs index e9445047..67b26b15 100644 --- a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs +++ b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs @@ -113,7 +113,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_5_OR_LATER +#if UE_5_6_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v24")); +#elif UE_5_5_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v23")); #elif UE_5_3_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22")); @@ -130,7 +132,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_5_OR_LATER +#if UE_5_6_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v24")); +#elif UE_5_5_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v23")); #elif UE_5_3_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22")); @@ -237,7 +241,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_5_OR_LATER +#if UE_5_6_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v24")); +#elif UE_5_5_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v23")); #elif UE_5_3_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22")); @@ -254,7 +260,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_5_OR_LATER +#if UE_5_6_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v24")); +#elif UE_5_5_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v23")); #elif UE_5_3_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22")); diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs index ae3308c9..ff5b9ff8 100644 --- a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs +++ b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs @@ -112,7 +112,9 @@ public class SenseGloveCoreImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_5_OR_LATER +#if UE_5_6_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v24")); +#elif UE_5_5_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v23")); #elif UE_5_3_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22")); @@ -129,7 +131,9 @@ public class SenseGloveCoreImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_5_OR_LATER +#if UE_5_6_OR_LATER + LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v24")); +#elif UE_5_5_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v23")); #elif UE_5_3_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v22"));