Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit 662bf9e

Browse files
author
Eugene Feinberg
committed
Prefer 2.7 over 3.5 for linux and update deprecated Definiton field
1 parent e1d1ae3 commit 662bf9e

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,25 @@ public class UnrealEnginePython : ModuleRules
2525

2626
private string[] linuxKnownIncludesPaths =
2727
{
28-
"/usr/local/include/python3.6",
28+
"/usr/local/include/python2.7",
29+
"/usr/include/python2.7",
30+
"/usr/local/include/python3.6",
2931
"/usr/local/include/python3.6m",
3032
"/usr/local/include/python3.5",
3133
"/usr/local/include/python3.5m",
32-
"/usr/local/include/python2.7",
3334
"/usr/include/python3.6",
3435
"/usr/include/python3.6m",
3536
"/usr/include/python3.5",
3637
"/usr/include/python3.5m",
37-
"/usr/include/python2.7",
38+
3839
};
3940

4041
private string[] linuxKnownLibsPaths =
4142
{
42-
"/usr/local/lib/libpython3.6.so",
43+
"/usr/lib/libpython2.7.so",
44+
"/usr/lib/x86_64-linux-gnu/libpython2.7.so",
45+
"/usr/local/lib/x86_64-linux-gnu/libpython2.7.so",
46+
"/usr/local/lib/libpython3.6.so",
4347
"/usr/local/lib/libpython3.6m.so",
4448
"/usr/local/lib/x86_64-linux-gnu/libpython3.6.so",
4549
"/usr/local/lib/x86_64-linux-gnu/libpython3.6m.so",
@@ -48,7 +52,6 @@ public class UnrealEnginePython : ModuleRules
4852
"/usr/local/lib/x86_64-linux-gnu/libpython3.5.so",
4953
"/usr/local/lib/x86_64-linux-gnu/libpython3.5m.so",
5054
"/usr/local/lib/libpython2.7.so",
51-
"/usr/local/lib/x86_64-linux-gnu/libpython2.7.so",
5255
"/usr/lib/libpython3.6.so",
5356
"/usr/lib/libpython3.6m.so",
5457
"/usr/lib/x86_64-linux-gnu/libpython3.6.so",
@@ -57,8 +60,6 @@ public class UnrealEnginePython : ModuleRules
5760
"/usr/lib/libpython3.5m.so",
5861
"/usr/lib/x86_64-linux-gnu/libpython3.5.so",
5962
"/usr/lib/x86_64-linux-gnu/libpython3.5m.so",
60-
"/usr/lib/libpython2.7.so",
61-
"/usr/lib/x86_64-linux-gnu/libpython2.7.so",
6263
};
6364

6465
private string[] macKnownPaths =
@@ -213,7 +214,7 @@ public UnrealEnginePython(TargetInfo Target)
213214
string libPath = GetMacPythonLibFile(pythonHome);
214215
PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));
215216
PublicDelayLoadDLLs.Add(libPath);
216-
Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));
217+
PublicDefinitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));
217218
}
218219
else if (Target.Platform == UnrealTargetPlatform.Linux)
219220
{
@@ -238,13 +239,13 @@ public UnrealEnginePython(TargetInfo Target)
238239
PublicIncludePaths.Add(items[0]);
239240
PublicAdditionalLibraries.Add(items[1]);
240241
}
241-
Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));
242+
PublicDefinitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));
242243
}
243244

244245
string enableThreads = System.Environment.GetEnvironmentVariable("UEP_ENABLE_THREADS");
245246
if (!string.IsNullOrEmpty(enableThreads))
246247
{
247-
Definitions.Add("UEPY_THREADING");
248+
PublicDefinitions.Add("UEPY_THREADING");
248249
System.Console.WriteLine("*** Enabled Python Threads support ***");
249250
}
250251

0 commit comments

Comments
 (0)