Commit 771c18d
Roberto De Ioris
improved 4.17 compatibility
1 parent acc8306 commit 771c18d
4 files changed
Lines changed: 52 additions & 36 deletions
File tree
- Source
- PythonConsole
- PythonEditor
- UnrealEnginePython
- Private/UObject
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,10 +5,12 @@ | |||
| 5 | 5 | ||
| 6 | 6 | public class PythonConsole : ModuleRules | |
| 7 | 7 | { | |
| 8 | - | ||
| 9 | - | ||
| 8 | + #if WITH_FORWARDED_MODULE_RULES_CTOR | ||
| 9 | + public PythonConsole(ReadOnlyTargetRules Target) : base(Target) | ||
| 10 | + #else | ||
| 10 | 11 | public PythonConsole(TargetInfo Target) | |
| 11 | - { | ||
| 12 | + #endif | ||
| 13 | + { | ||
| 12 | 14 | PrivateIncludePaths.AddRange( | |
| 13 | 15 | new string[] { | |
| 14 | 16 | "PythonConsole/Private", | |
@@ -17,19 +19,19 @@ public PythonConsole(TargetInfo Target) | |||
| 17 | 19 | ); | |
| 18 | 20 | ||
| 19 | 21 | PrivateDependencyModuleNames.AddRange( | |
| 20 | - new string[] { | ||
| 21 | - "Core", | ||
| 22 | - "CoreUObject", // @todo Mac: for some reason it's needed to link in debug on Mac | ||
| 22 | + new string[] { | ||
| 23 | + "Core", | ||
| 24 | + "CoreUObject", // @todo Mac: for some reason it's needed to link in debug on Mac | ||
| 23 | 25 | "Engine", | |
| 24 | 26 | "InputCore", | |
| 25 | - "UnrealEd", | ||
| 26 | - "Slate", | ||
| 27 | - "SlateCore", | ||
| 27 | + "UnrealEd", | ||
| 28 | + "Slate", | ||
| 29 | + "SlateCore", | ||
| 28 | 30 | "EditorStyle", | |
| 29 | 31 | "TargetPlatform", | |
| 30 | 32 | "UnrealEnginePython" | |
| 31 | 33 | } | |
| 32 | - ); | ||
| 34 | + ); | ||
| 33 | 35 | ||
| 34 | 36 | } | |
| 35 | 37 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,35 +2,39 @@ | |||
| 2 | 2 | ||
| 3 | 3 | namespace UnrealBuildTool.Rules | |
| 4 | 4 | { | |
| 5 | - public class PythonEditor : ModuleRules | ||
| 6 | - { | ||
| 7 | - public PythonEditor(TargetInfo Target) | ||
| 8 | - { | ||
| 9 | - PrivateIncludePaths.AddRange( | ||
| 10 | - new string[] { | ||
| 11 | - "PythonEditor/Private", | ||
| 12 | - } | ||
| 13 | - ); | ||
| 5 | + public class PythonEditor : ModuleRules | ||
| 6 | + { | ||
| 7 | + #if WITH_FORWARDED_MODULE_RULES_CTOR | ||
| 8 | + public PythonEditor(ReadOnlyTargetRules Target) : base(Target) | ||
| 9 | + #else | ||
| 10 | + public PythonEditor(TargetInfo Target) | ||
| 11 | + #endif | ||
| 12 | + { | ||
| 13 | + PrivateIncludePaths.AddRange( | ||
| 14 | + new string[] { | ||
| 15 | + "PythonEditor/Private", | ||
| 16 | + } | ||
| 17 | + ); | ||
| 14 | 18 | ||
| 15 | - PrivateDependencyModuleNames.AddRange( | ||
| 16 | - new string[] | ||
| 17 | - { | ||
| 18 | - "Core", | ||
| 19 | - "CoreUObject", | ||
| 20 | - "SlateCore", | ||
| 21 | - "Slate", | ||
| 22 | - "AssetTools", | ||
| 23 | - "UnrealEd", | ||
| 24 | - "EditorStyle", | ||
| 25 | - "PropertyEditor", | ||
| 26 | - "Kismet", // for FWorkflowCentricApplication | ||
| 19 | + PrivateDependencyModuleNames.AddRange( | ||
| 20 | + new string[] | ||
| 21 | + { | ||
| 22 | + "Core", | ||
| 23 | + "CoreUObject", | ||
| 24 | + "SlateCore", | ||
| 25 | + "Slate", | ||
| 26 | + "AssetTools", | ||
| 27 | + "UnrealEd", | ||
| 28 | + "EditorStyle", | ||
| 29 | + "PropertyEditor", | ||
| 30 | + "Kismet", // for FWorkflowCentricApplication | ||
| 27 | 31 | "InputCore", | |
| 28 | - "DirectoryWatcher", | ||
| 29 | - "LevelEditor", | ||
| 32 | + "DirectoryWatcher", | ||
| 33 | + "LevelEditor", | ||
| 30 | 34 | "Projects", | |
| 31 | 35 | "UnrealEnginePython" | |
| 32 | 36 | } | |
| 33 | - ); | ||
| 34 | - } | ||
| 35 | - } | ||
| 37 | + ); | ||
| 38 | + } | ||
| 39 | + } | ||
| 36 | 40 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -106,8 +106,14 @@ PyObject *py_ue_actor_destroy_component(ue_PyUObject * self, PyObject * args) { | |||
| 106 | 106 | } | |
| 107 | 107 | ||
| 108 | 108 | UActorComponent *component = ue_py_check_type<UActorComponent>(py_component); | |
| 109 | + if (!component) | ||
| 110 | + return PyErr_Format(PyExc_Exception, "argument is not a UActorComponent"); | ||
| 109 | 111 | ||
| 112 | + #if ENGINE_MINOR_VERSION >= 17 | ||
| 113 | + component->DestroyComponent(); | ||
| 114 | + #else | ||
| 110 | 115 | actor->K2_DestroyComponent(component); | |
| 116 | + #endif | ||
| 111 | 117 | ||
| 112 | 118 | Py_INCREF(Py_None); | |
| 113 | 119 | return Py_None; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -70,7 +70,11 @@ public class UnrealEnginePython : ModuleRules | |||
| 70 | 70 | "/usr/lib/x86_64-linux-gnu/libpython2.7.so", | |
| 71 | 71 | }; | |
| 72 | 72 | ||
| 73 | + #if WITH_FORWARDED_MODULE_RULES_CTOR | ||
| 74 | + public UnrealEnginePython(ReadOnlyTargetRules Target) : base(Target) | ||
| 75 | + #else | ||
| 73 | 76 | public UnrealEnginePython(TargetInfo Target) | |
| 77 | + #endif | ||
| 74 | 78 | { | |
| 75 | 79 | ||
| 76 | 80 | PublicIncludePaths.AddRange( | |
0 commit comments