From 6a43ea4f250a39f9ad1686dfd90770d9ae4ea8f3 Mon Sep 17 00:00:00 2001 From: Elvis Dowson Date: Tue, 4 Jun 2019 11:58:03 +0400 Subject: [PATCH 1/3] .gitignore: Ignore Intermediate folder. Signed-off-by: Elvis Dowson --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a8f0b03d6..e43464f53 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,7 @@ ENV/ .ropeproject Binaries/ +Intermediate/ python35/ python27/ *.un~ From 02dd03dfd26f72d3d6252febff1d79bdb037cf97 Mon Sep 17 00:00:00 2001 From: Elvis Dowson Date: Tue, 4 Jun 2019 12:02:04 +0400 Subject: [PATCH 2/3] PythonHouseKeeper: Fix compile error: #pragma once in main file This commit fixes the following error: PythonHouseKeeper.cpp:1:9: error: #pragma once in main file [-Werror,-Wpragma-once-outside-header] #pragma once ^ Signed-off-by: Elvis Dowson --- Source/UnrealEnginePython/Private/PythonHouseKeeper.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/UnrealEnginePython/Private/PythonHouseKeeper.cpp b/Source/UnrealEnginePython/Private/PythonHouseKeeper.cpp index ea9d5dda3..dc014e386 100644 --- a/Source/UnrealEnginePython/Private/PythonHouseKeeper.cpp +++ b/Source/UnrealEnginePython/Private/PythonHouseKeeper.cpp @@ -1,4 +1,3 @@ -#pragma once #include "PythonHouseKeeper.h" From e928f718c3f6ba82998f681f58f07ebc101db93f Mon Sep 17 00:00:00 2001 From: Elvis Dowson Date: Tue, 4 Jun 2019 12:03:18 +0400 Subject: [PATCH 3/3] PythonAutomationModule: Update for UE4.22. Signed-off-by: Elvis Dowson --- Source/PythonAutomation/Public/PythonAutomationModule.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/PythonAutomation/Public/PythonAutomationModule.h b/Source/PythonAutomation/Public/PythonAutomationModule.h index c0f9c6d16..bc19a062e 100644 --- a/Source/PythonAutomation/Public/PythonAutomationModule.h +++ b/Source/PythonAutomation/Public/PythonAutomationModule.h @@ -3,7 +3,11 @@ #pragma once #include "CoreMinimal.h" +#if ENGINE_MAJOR_VERSION==4 && ENGINE_MINOR_VERSION>=22 +#include "Modules/ModuleInterface.h" +#else #include "ModuleInterface.h" +#endif class FPythonAutomationModule : public IModuleInterface {