move SGCoreImpl/SGPlatform to SGBuildHacks/SGPlatform and introduce SG_CPP20 and SG_CAPTURE_THIS

2023-09-14 18:50:04 +02:00
parent 25e0d49eea
commit da3449b7df
40 changed files with 76 additions and 42 deletions
@@ -1,36 +0,0 @@
-/**
- * @file
- *
- * @author  Mamadou Babaei <mamadou@senseglove.com>
- *
- * @section LICENSE
- *
- * (The MIT License)
- *
- * Copyright (c) 2020 - 2023 SenseGlove
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @section DESCRIPTION
- *
- *
- */
-
-
-#include "SGCoreImpl/SGPlatform.h"
@@ -40,7 +40,7 @@
 #include "Math/Vector.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 class FSGVect3DImpl;

@@ -39,7 +39,7 @@
 #include "Math/Vector.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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
@@ -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
@@ -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
@@ -38,7 +38,7 @@
 #include "Containers/UnrealString.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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
@@ -38,7 +38,7 @@
 #include "Containers/UnrealString.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -40,7 +40,7 @@
 #include "Templates/SharedPointer.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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
@@ -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;
@@ -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;
@@ -38,7 +38,7 @@
 #include "Containers/UnrealString.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 class FSGHandInterpolatorImpl;

@@ -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
@@ -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
@@ -38,7 +38,7 @@
 #include "Containers/Array.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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
@@ -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
 {
@@ -38,7 +38,7 @@
 #include "Containers/UnrealString.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -38,7 +38,7 @@
 #include "Containers/UnrealString.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 class FSGHandInterpolatorImpl;

@@ -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
 {
@@ -38,7 +38,7 @@
 #include "Containers/UnrealString.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -39,7 +39,7 @@
 #include "Math/Vector.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -1,48 +0,0 @@
-/**
- * @file
- *
- * @author  Mamadou Babaei <mamadou@senseglove.com>
- *
- * @section LICENSE
- *
- * (The MIT License)
- *
- * Copyright (c) 2020 - 2023 SenseGlove
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @section DESCRIPTION
- *
- *
- */
-
-
-#pragma once
-
-#if ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L )
-#define SG_CPP17 1
-#else   /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */
-#define SG_CPP17 0
-#endif  /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */
-
-#if SG_CPP17
-#define SG_NOEXCEPT noexcept
-#else   /* SG_CPP17 */
-#define SG_NOEXCEPT
-#endif  /* SG_CPP17 */
@@ -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;
@@ -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
@@ -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
@@ -39,7 +39,7 @@
 #include "Math/Vector.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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
@@ -39,7 +39,7 @@
 #include "Math/Vector.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -38,7 +38,7 @@
 #include "HAL/Platform.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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
@@ -39,7 +39,7 @@
 #include "HAL/Platform.h"
 #include "Templates/UniquePtr.h"

-#include "SGCoreImpl/SGPlatform.h"
+#include "SGBuildHacks/SGPlatform.h"

 namespace SGCore
 {
@@ -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");