From 005522d05c7562670446ef2f3a5551f4819aae1b Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Thu, 14 Sep 2023 18:35:06 +0200 Subject: [PATCH] move SGCoreImpl/SGPlatform to SGBuildHacks/SGPlatform and introduce SG_CPP20 and SG_CAPTURE_THIS --- CHANGELOG.md | 6 ++++++ .../GameFramework/SGPlayerController.cpp | 7 ++++--- Source/SenseGlove/SenseGlove.Build.cs | 7 +++++++ .../Private/SGBuildHacks}/SGPlatform.cpp | 2 +- .../Public/SGBuildHacks}/SGPlatform.h | 18 +++++++++++++++--- Source/SenseGloveCore/SenseGloveCore.Build.cs | 3 ++- .../Private/SGCoreImpl/SGQuatImpl.h | 2 +- .../Private/SGCoreImpl/SGVect3DImpl.h | 2 +- .../Public/SGCoreImpl/SGBasicHandModelImpl.h | 2 +- .../Public/SGCoreImpl/SGBetaDeviceImpl.h | 2 +- .../Public/SGCoreImpl/SGBuzzCommandImpl.h | 2 +- .../SGCoreImpl/SGCalibrationDataPointImpl.h | 2 +- .../Public/SGCoreImpl/SGDeviceImpl.h | 2 +- .../Public/SGCoreImpl/SGDeviceModelImpl.h | 2 +- .../Public/SGCoreImpl/SGFingerCommandImpl.h | 2 +- .../SGCoreImpl/SGForceFeedbackCommandImpl.h | 2 +- .../Public/SGCoreImpl/SGHandInterpolatorImpl.h | 2 +- .../Public/SGCoreImpl/SGHandPoseImpl.h | 2 +- .../Public/SGCoreImpl/SGHandProfileImpl.h | 2 +- .../SGHapticGloveCalibrationCheckImpl.h | 2 +- .../SGHapticGloveCalibrationSequenceImpl.h | 2 +- .../SGHapticGloveCommandBufferImpl.h | 2 +- .../Public/SGCoreImpl/SGHapticGloveImpl.h | 2 +- .../SGHapticGloveQuickCalibrationImpl.h | 2 +- .../Public/SGCoreImpl/SGInterpolationSetImpl.h | 2 +- .../SGCoreImpl/SGNovaGloveHandProfileImpl.h | 2 +- .../Public/SGCoreImpl/SGNovaGloveImpl.h | 2 +- .../Public/SGCoreImpl/SGNovaGloveInfoImpl.h | 2 +- .../SGCoreImpl/SGNovaGloveSensorDataImpl.h | 2 +- .../SGCoreImpl/SGSenseGloveHandProfileImpl.h | 2 +- .../Public/SGCoreImpl/SGSenseGloveImpl.h | 2 +- .../Public/SGCoreImpl/SGSenseGloveInfoImpl.h | 2 +- .../Public/SGCoreImpl/SGSenseGlovePoseImpl.h | 2 +- .../SGCoreImpl/SGSenseGloveSensorDataImpl.h | 2 +- .../Public/SGCoreImpl/SGSensorRangeImpl.h | 2 +- .../Public/SGCoreImpl/SGThumperCommandImpl.h | 2 +- .../Public/SGCoreImpl/SGTimedBuzzCommandImpl.h | 2 +- .../SGCoreImpl/SGTimedThumpCommandImpl.h | 2 +- .../SenseGloveCoreImpl.Build.cs | 8 +++++++- .../SenseGloveInterop.Build.cs | 3 ++- 40 files changed, 76 insertions(+), 42 deletions(-) rename Source/{SenseGloveCoreImpl/Private/SGCoreImpl => SenseGloveBuildHacks/Private/SGBuildHacks}/SGPlatform.cpp (97%) rename Source/{SenseGloveCoreImpl/Public/SGCoreImpl => SenseGloveBuildHacks/Public/SGBuildHacks}/SGPlatform.h (75%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42443bb8..b1164b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Introduce SGGameInstance, a customized SenseGlove game instance for future use. - Added the new SenseGloveBackend and SenseGloveBackendKismet modules. +- Added SG_CPP20 C++ macro for C++20 detection, which is now default from UE 5.3 onwards. +- Added SG_CAPTURE_THIS C++ macro as a workaround for error C4855: implicit capture of 'this' via '[=]' is deprecated in /std:c++20 in order to build the same lambda captures without extra #ifdefs on all supported engine versions. + +### Changed + +- SGCoreImpl/SGPlatform has been moved to SGBuildHacks/SGPlatform. ### Fixed diff --git a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp index d666a360..41944317 100644 --- a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp +++ b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp @@ -48,6 +48,7 @@ #include "SenseGlove/GameFramework/SGPawn.h" #include "SenseGlove/Haptics/SGGrabState.h" #include "SenseGlove/Haptics/SGTouchState.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCore/SGBuzzCommand.h" #include "SGCore/SGForceFeedbackCommand.h" #include "SGCore/SGHapticGlove.h" @@ -204,7 +205,7 @@ void ASGPlayerController::BeginPlay() } SGPawn->OnGrabStateUpdated().AddWeakLambda( - this, [=](const FSGGrabState& GrabState) -> void + this, [= SG_CAPTURE_THIS](const FSGGrabState& GrabState) -> void { if (!IsValid(SGPawn)) { @@ -235,7 +236,7 @@ void ASGPlayerController::BeginPlay() }); SGPawn->OnTouchStateUpdated().AddWeakLambda( - this, [=](const FSGTouchState& TouchState) -> void + this, [= SG_CAPTURE_THIS](const FSGTouchState& TouchState) -> void { Pimpl->UpdateHapticsFeedback(TouchState); }); @@ -338,7 +339,7 @@ void ASGPlayerController::FImpl::UpdateHapticsFeedback(const FSGTouchState& Touc Owner->GetWorldTimerManager().ClearTimer(TouchBuzzStopTimer); FTimerDelegate TouchBuzzStopHandler; - TouchBuzzStopHandler.BindLambda([=]()-> void + TouchBuzzStopHandler.BindLambda([= SG_CAPTURE_THIS]()-> void { Glove->SendHaptics(USGBuzzCommand::Off(Owner)); }); diff --git a/Source/SenseGlove/SenseGlove.Build.cs b/Source/SenseGlove/SenseGlove.Build.cs index c340b07a..297b3b40 100644 --- a/Source/SenseGlove/SenseGlove.Build.cs +++ b/Source/SenseGlove/SenseGlove.Build.cs @@ -66,5 +66,12 @@ public class SenseGlove : ModuleRules "SenseGloveTypes", } ); + + PrivateIncludePathModuleNames.AddRange( + new string[] + { + "SenseGloveBuildHacks", + } + ); } } diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGPlatform.cpp b/Source/SenseGloveBuildHacks/Private/SGBuildHacks/SGPlatform.cpp similarity index 97% rename from Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGPlatform.cpp rename to Source/SenseGloveBuildHacks/Private/SGBuildHacks/SGPlatform.cpp index 96624756..5b243c3f 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGPlatform.cpp +++ b/Source/SenseGloveBuildHacks/Private/SGBuildHacks/SGPlatform.cpp @@ -33,4 +33,4 @@ */ -#include "SGCoreImpl/SGPlatform.h" \ No newline at end of file +#include "SGBuildHacks/SGPlatform.h" \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h b/Source/SenseGloveBuildHacks/Public/SGBuildHacks/SGPlatform.h similarity index 75% rename from Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h rename to Source/SenseGloveBuildHacks/Public/SGBuildHacks/SGPlatform.h index 7bb42143..42022673 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h +++ b/Source/SenseGloveBuildHacks/Public/SGBuildHacks/SGPlatform.h @@ -41,8 +41,20 @@ #define SG_CPP17 0 #endif /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */ -#if SG_CPP17 +#if ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 202002L ) || __cplusplus >= 202002L ) +#define SG_CPP20 1 +#else /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 202002L ) || __cplusplus >= 202002L ) */ +#define SG_CPP20 0 +#endif /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 202002L ) || __cplusplus >= 202002L ) */ + +#if SG_CPP17 || SG_CPP20 #define SG_NOEXCEPT noexcept -#else /* SG_CPP17 */ +#else /* SG_CPP17 || SG_CPP20 */ #define SG_NOEXCEPT -#endif /* SG_CPP17 */ \ No newline at end of file +#endif /* SG_CPP17 || SG_CPP20 */ + +#if SG_CPP20 +#define SG_CAPTURE_THIS , this +#else /* SG_CPP17 || SG_CPP20 */ +#define SG_CAPTURE_THIS +#endif /* SG_CPP17 || SG_CPP20 */ \ No newline at end of file diff --git a/Source/SenseGloveCore/SenseGloveCore.Build.cs b/Source/SenseGloveCore/SenseGloveCore.Build.cs index 63aad41b..95a307cb 100644 --- a/Source/SenseGloveCore/SenseGloveCore.Build.cs +++ b/Source/SenseGloveCore/SenseGloveCore.Build.cs @@ -63,9 +63,10 @@ public class SenseGloveCore : ModuleRules } ); - PublicIncludePathModuleNames.AddRange( + PrivateIncludePathModuleNames.AddRange( new string[] { + "SenseGloveBuildHacks", "SenseGloveTypes", } ); diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h index 0ef3c7e3..772dfe76 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h @@ -40,7 +40,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" class FSGVect3DImpl; diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h index d9f9f275..cf689ea6 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h index dae3a130..15b67230 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h @@ -40,7 +40,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h index 9aa08659..20bcdc4a 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h @@ -43,8 +43,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGDeviceImpl.h" -#include "SGCoreImpl/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h index e2bda7a6..12c3e30f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h @@ -39,8 +39,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGFingerCommandImpl.h" -#include "SGCoreImpl/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h index a13e4bdd..9cf42f9f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h index 02a0de74..86434f3f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h @@ -41,7 +41,7 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h index 26a17cd8..f4c7d8ef 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h index b64f15c8..64655829 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h @@ -40,7 +40,7 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h index 102f5cc2..2cd72b66 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h @@ -39,8 +39,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGFingerCommandImpl.h" -#include "SGCoreImpl/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h index b8fe8657..92e48fb1 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h @@ -40,7 +40,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" class FSGInterpolationSetImpl; diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h index 7cfe00c2..e483b59e 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" class FSGHandInterpolatorImpl; diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h index 5ca571f2..40d29c85 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" class FSGHandInterpolatorImpl; diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h index b4d809e7..35c3a7e2 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h index 45bb71f6..fc726dd5 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h @@ -41,7 +41,7 @@ #include "Templates/UniquePtr.h" #include "SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h index 72601071..b06e8232 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h @@ -38,7 +38,7 @@ #include "Containers/Array.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h index 8ea2beb4..84d78dfe 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h @@ -44,8 +44,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGDeviceImpl.h" -#include "SGCoreImpl/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h index 08c2c57d..d702ed63 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h @@ -39,8 +39,8 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h" -#include "SGCoreImpl/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h index a4fff74e..7f293667 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h index 5b71a622..195b484f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" class FSGHandInterpolatorImpl; diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h index a23b8e32..39983a98 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h @@ -44,8 +44,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGHapticGloveImpl.h" -#include "SGCoreImpl/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h index a6c453a1..7800a16c 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h index 97016249..5ebaaac4 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h index 12596518..846c67cd 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" class FSGHandInterpolatorImpl; diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h index 2b55dd0c..c28d4dfa 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h @@ -44,8 +44,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGHapticGloveImpl.h" -#include "SGCoreImpl/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h index 5c7922ef..b172f427 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h index 5c606f9e..5b6b8cd2 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h index c3b4ffb6..148ee532 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h @@ -38,7 +38,7 @@ #include "Containers/UnrealString.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h index bfc459de..9b9d4418 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h @@ -39,7 +39,7 @@ #include "Math/Vector.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h index ba6e013e..b211c0d7 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h @@ -38,7 +38,7 @@ #include "HAL/Platform.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h index 252935bf..5a49cba8 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h @@ -40,8 +40,8 @@ #include "Templates/SharedPointer.h" #include "Templates/UniquePtr.h" +#include "SGBuildHacks/SGPlatform.h" #include "SGCoreImpl/SGBuzzCommandImpl.h" -#include "SGCoreImpl/SGPlatform.h" #include "SGTypes/SGCoreTypes.h" namespace SGCore diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h index c8f0d22e..4b3c4113 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h @@ -39,7 +39,7 @@ #include "HAL/Platform.h" #include "Templates/UniquePtr.h" -#include "SGCoreImpl/SGPlatform.h" +#include "SGBuildHacks/SGPlatform.h" namespace SGCore { diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs index 864a41ac..e5704aa9 100644 --- a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs +++ b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs @@ -58,7 +58,6 @@ public class SenseGloveCoreImpl : ModuleRules PrivateDependencyModuleNames.AddRange( new string[] { - "SenseGloveBuildHacks", "SenseGloveInterop", "SenseGloveLog", "SenseGloveTypes", @@ -66,6 +65,13 @@ public class SenseGloveCoreImpl : ModuleRules } ); + PrivateIncludePathModuleNames.AddRange( + new string[] + { + "SenseGloveBuildHacks", + } + ); + AddCoreLibrary(Target); PublicDefinitions.Add("SENSEGLOVE_BUILDING_CORE_IMPL_MODULE"); diff --git a/Source/SenseGloveInterop/SenseGloveInterop.Build.cs b/Source/SenseGloveInterop/SenseGloveInterop.Build.cs index 9742c7ce..fe9a6da7 100644 --- a/Source/SenseGloveInterop/SenseGloveInterop.Build.cs +++ b/Source/SenseGloveInterop/SenseGloveInterop.Build.cs @@ -60,8 +60,9 @@ public class SenseGloveInterop : ModuleRules PrivateIncludePathModuleNames.AddRange( new string[] { + "SenseGloveBuildHacks", "SenseGloveCoreImpl", } ); } -} +} \ No newline at end of file