Merge pull request #2669 from saihv/PR/UE_4.25

Add support for Unreal Engine 4.25
microsoft · May 7, 2020 · ac3144b · ac3144b
2 parents 1cef6f2 + e90502f
commit ac3144b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 67 deletions.
diff --git a/Unreal/Environments/Blocks/Blocks.uproject b/Unreal/Environments/Blocks/Blocks.uproject
@@ -17,6 +17,14 @@
 		{
 			"Name": "AirSim",
 			"Enabled": true
-		}
+		},
+		{
+            		"Name": "SteamVR",
+		        "Enabled": false
+	        },
+        	{
+		        "Name": "OculusVR",
+		        "Enabled": false
+	        },
 	]
 }
diff --git a/Unreal/Environments/Blocks/Source/Blocks.Target.4.15.cs b/Unreal/Environments/Blocks/Source/Blocks.Target.4.15.cs
diff --git a/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.4.15.cs b/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.4.15.cs
diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.4.15.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.4.15.cs
diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
@@ -9,7 +9,7 @@ public BlocksEditorTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Editor;
 		ExtraModuleNames.AddRange(new string[] { "Blocks" });
-
+        DefaultBuildSettings = BuildSettingsVersion.V2;
         //bUseUnityBuild = false;
         //bUsePCHFiles = false;
     }

diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
@@ -21,6 +21,7 @@
 #include "Engine/Engine.h"
 #include <exception>
 #include "common/common_utils/Utils.hpp"
+#include "Modules/ModuleManager.h"
 
 /*
 //TODO: change naming conventions to same as other files?

diff --git a/cmake/cmake-modules/CommonSetup.cmake b/cmake/cmake-modules/CommonSetup.cmake
@@ -53,10 +53,8 @@ macro(CommonSetup)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wstrict-aliasing -D__CLANG__")
         else ()
             set(CMAKE_CXX_FLAGS "\
-                -std=c++17 -ggdb -Wall -Wextra -Wstrict-aliasing -Wunreachable-code -Wcast-qual -Wctor-dtor-privacy \
-                -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default \
-                -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wstrict-overflow=5 -Wswitch-default -Wundef \
-                -Wno-variadic-macros -Wno-parentheses -Wno-unused-function -Wno-unused -fdiagnostics-show-option \
+                -std=c++17 -ggdb -Wall -Wextra \
+                -Wno-variadic-macros -Wno-parentheses -Wno-unused-function -Wno-unused \
                 -pthread \
                 ${RPC_LIB_DEFINES} ${CMAKE_CXX_FLAGS}")