From 15cc08aeebf2e902de63a48a7711e540a8741a89 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Fri, 11 Oct 2024 10:42:59 +0200 Subject: [PATCH] add support for epic native toolchain v23 --- 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 3a4a87ce..0bc08923 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 `v23`. + ### Fixed - Fix a bug inside `USGVirtualHandComponent::PostEditChangeProperty()` where the get member name check happens against the wrong class and member names. diff --git a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs index be34b2d8..c4eb0e72 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_3_OR_LATER +#if 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")); #elif UE_5_2_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); @@ -128,7 +130,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_3_OR_LATER +#if 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")); #elif UE_5_2_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); @@ -233,7 +237,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_3_OR_LATER +#if 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")); #elif UE_5_2_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); @@ -248,7 +254,9 @@ public class SenseGloveConnectImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_3_OR_LATER +#if 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")); #elif UE_5_2_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs index f10d17c5..c4d1bd3e 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_3_OR_LATER +#if 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")); #elif UE_5_2_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21")); @@ -127,7 +129,9 @@ public class SenseGloveCoreImpl : ModuleRules LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "linux")); LibraryName = string.Format("lib{0}.a", LibraryName); -#if UE_5_3_OR_LATER +#if 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")); #elif UE_5_2_OR_LATER LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));