From f8bec03580f337df67654b8dd1d247129d76481f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=B3r=C3=A1sz?= Date: Tue, 22 Aug 2023 22:10:16 +0200 Subject: [PATCH] fix compiling proper editor binaries --- Source/HIDUE | 2 +- .../SpaceMouseEditor.Build.cs | 3 +-- .../SpaceMouseReader.Build.cs | 23 +++++++++---------- .../SpaceMouseRuntime.Build.cs | 3 +-- SpaceMouse.uplugin | 13 ----------- 5 files changed, 14 insertions(+), 30 deletions(-) diff --git a/Source/HIDUE b/Source/HIDUE index 0f955dd..bf43f17 160000 --- a/Source/HIDUE +++ b/Source/HIDUE @@ -1 +1 @@ -Subproject commit 0f955dd96612d3bf9f2102572d6b6e4f21c01a76 +Subproject commit bf43f172c0c22665558f39f042fd8c8efc3cc429 diff --git a/Source/SpaceMouseEditor/SpaceMouseEditor.Build.cs b/Source/SpaceMouseEditor/SpaceMouseEditor.Build.cs index 0c5e879..b382dfb 100644 --- a/Source/SpaceMouseEditor/SpaceMouseEditor.Build.cs +++ b/Source/SpaceMouseEditor/SpaceMouseEditor.Build.cs @@ -11,10 +11,9 @@ public SpaceMouseEditor(ReadOnlyTargetRules Target) : base(Target) bEnableUndefinedIdentifierWarnings = false; CppStandard = CppStandardVersion.Cpp17; - IsRedistributableOverride = true; + IsRedistributableOverride = true;; bLegalToDistributeObjectCode = true; bPrecompile = true; - bUsePrecompiled = true; PrecompileForTargets = PrecompileTargetsType.Any; PublicDependencyModuleNames.AddRange(new [] diff --git a/Source/SpaceMouseReader/SpaceMouseReader.Build.cs b/Source/SpaceMouseReader/SpaceMouseReader.Build.cs index 251d24f..3ddcea5 100644 --- a/Source/SpaceMouseReader/SpaceMouseReader.Build.cs +++ b/Source/SpaceMouseReader/SpaceMouseReader.Build.cs @@ -6,27 +6,26 @@ public class SpaceMouseReader : ModuleRules { - public SpaceMouseReader(ReadOnlyTargetRules Target) : base(Target) - { + public SpaceMouseReader(ReadOnlyTargetRules Target) : base(Target) + { PCHUsage = PCHUsageMode.NoPCHs; bEnableUndefinedIdentifierWarnings = false; - CppStandard = CppStandardVersion.Cpp17; + CppStandard = CppStandardVersion.Cpp17; IsRedistributableOverride = true; bLegalToDistributeObjectCode = true; bPrecompile = true; - bUsePrecompiled = true; PrecompileForTargets = PrecompileTargetsType.Any; - - PublicDependencyModuleNames.AddRange(new [] - { + + PublicDependencyModuleNames.AddRange(new [] + { "Core", "CoreUObject", "Engine", - "HIDUE" - // ... add other public dependencies that you statically link with here ... - }); - } + "HIDUE" + // ... add other public dependencies that you statically link with here ... + }); + } } - + diff --git a/Source/SpaceMouseRuntime/SpaceMouseRuntime.Build.cs b/Source/SpaceMouseRuntime/SpaceMouseRuntime.Build.cs index 9ac7319..ab21c2d 100644 --- a/Source/SpaceMouseRuntime/SpaceMouseRuntime.Build.cs +++ b/Source/SpaceMouseRuntime/SpaceMouseRuntime.Build.cs @@ -9,12 +9,11 @@ public SpaceMouseRuntime(ReadOnlyTargetRules Target) : base(Target) { PCHUsage = PCHUsageMode.NoPCHs; bEnableUndefinedIdentifierWarnings = false; - CppStandard = CppStandardVersion.Cpp17; + CppStandard = CppStandardVersion.Cpp17; IsRedistributableOverride = true; bLegalToDistributeObjectCode = true; bPrecompile = true; - bUsePrecompiled = true; PrecompileForTargets = PrecompileTargetsType.Any; if (Target.Version.MajorVersion >= 5) diff --git a/SpaceMouse.uplugin b/SpaceMouse.uplugin index 8d1eed8..a946779 100644 --- a/SpaceMouse.uplugin +++ b/SpaceMouse.uplugin @@ -2,7 +2,6 @@ "FileVersion": 3, "Version": 1, "VersionName": "1.2.7", - "EngineVersion": "5.2", "FriendlyName": "SpaceMouse for Unreal Engine", "Description": "Control the active editor viewport camera with 3DConnexion SpaceMice", "Category": "Input Devices", @@ -30,10 +29,6 @@ "Name": "SpaceMouseReader", "Type": "Runtime", "LoadingPhase": "PreDefault", - "AdditionalDependencies": [ - "Core", - "HIDUE" - ], "WhitelistPlatforms": [ "Linux", "Win64" @@ -43,10 +38,6 @@ "Name": "SpaceMouseRuntime", "Type": "Runtime", "LoadingPhase": "Default", - "AdditionalDependencies": [ - "Core", - "SpaceMouseReader" - ], "WhitelistPlatforms": [ "Linux", "Win64" @@ -56,10 +47,6 @@ "Name": "SpaceMouseEditor", "Type": "Editor", "LoadingPhase": "PostEngineInit", - "AdditionalDependencies": [ - "Core", - "SpaceMouseReader" - ], "WhitelistPlatforms": [ "Linux", "Win64"