Use PublicDefinitions instead of Definitions

slartibaartfast · slartibaartfast · commit 710b391fbdf0 · 2018-05-08T09:39:09.000-04:00
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs
@@ -11,7 +11,7 @@ public class UnrealEnginePython : ModuleRules
     private string pythonHome = "";
     // otherwise specify the path of your python installation
     //private string pythonHome = "C:/Program Files/Python36";
-    // this is an example for Homebrew on Mac 
+    // this is an example for Homebrew on Mac
     //private string pythonHome = "/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/";
     // on Linux an include;libs syntax is expected:
     //private string pythonHome = "/usr/local/include/python3.6;/usr/local/lib/libpython3.6.so"
@@ -217,7 +217,7 @@ public UnrealEnginePython(TargetInfo Target)
             string libPath = GetMacPythonLibFile(pythonHome);
             PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));
             PublicDelayLoadDLLs.Add(libPath);
-            Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));
+            PublicDefinitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));
         }
         else if (Target.Platform == UnrealTargetPlatform.Linux)
         {
@@ -242,13 +242,13 @@ public UnrealEnginePython(TargetInfo Target)
                 PublicIncludePaths.Add(items[0]);
                 PublicAdditionalLibraries.Add(items[1]);
             }
-            Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));
+            PublicDefinitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));
         }
 
         string enableThreads = System.Environment.GetEnvironmentVariable("UEP_ENABLE_THREADS");
         if (!string.IsNullOrEmpty(enableThreads))
         {
-            Definitions.Add("UEPY_THREADING");
+            PublicDefinitions.Add("UEPY_THREADING");
             System.Console.WriteLine("*** Enabled Python Threads support ***");
         }
 
@@ -257,8 +257,8 @@ public UnrealEnginePython(TargetInfo Target)
     private bool IsPathRelative(string Path)
     {
         bool IsRooted = Path.StartsWith("\\", System.StringComparison.Ordinal) || // Root of the current directory on Windows. Also covers "\\" for UNC or "network" paths.
-                        Path.StartsWith("/", System.StringComparison.Ordinal) ||  // Root of the current directory on Windows, root on UNIX-likes. 
-                                                                                  // Also covers "\\", considering normalization replaces "\\" with "//".	
+                        Path.StartsWith("/", System.StringComparison.Ordinal) ||  // Root of the current directory on Windows, root on UNIX-likes.
+                                                                                  // Also covers "\\", considering normalization replaces "\\" with "//".
                         (Path.Length >= 2 && char.IsLetter(Path[0]) && Path[1] == ':'); // Starts with "<DriveLetter>:"
         return !IsRooted;
     }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class UnrealEnginePython : ModuleRules`
`11`	`11`	`private string pythonHome = "";`
`12`	`12`	`// otherwise specify the path of your python installation`
`13`	`13`	`//private string pythonHome = "C:/Program Files/Python36";`
`14`		`- // this is an example for Homebrew on Mac`
	`14`	`+ // this is an example for Homebrew on Mac`
`15`	`15`	`//private string pythonHome = "/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/";`
`16`	`16`	`// on Linux an include;libs syntax is expected:`
`17`	`17`	`//private string pythonHome = "/usr/local/include/python3.6;/usr/local/lib/libpython3.6.so"`
`@@ -217,7 +217,7 @@ public UnrealEnginePython(TargetInfo Target)`
`217`	`217`	`string libPath = GetMacPythonLibFile(pythonHome);`
`218`	`218`	`PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));`
`219`	`219`	`PublicDelayLoadDLLs.Add(libPath);`
`220`		`- Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));`
	`220`	`+ PublicDefinitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));`
`221`	`221`	`}`
`222`	`222`	`else if (Target.Platform == UnrealTargetPlatform.Linux)`
`223`	`223`	`{`
`@@ -242,13 +242,13 @@ public UnrealEnginePython(TargetInfo Target)`
`242`	`242`	`PublicIncludePaths.Add(items[0]);`
`243`	`243`	`PublicAdditionalLibraries.Add(items[1]);`
`244`	`244`	`}`
`245`		`- Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));`
	`245`	`+ PublicDefinitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`string enableThreads = System.Environment.GetEnvironmentVariable("UEP_ENABLE_THREADS");`
`249`	`249`	`if (!string.IsNullOrEmpty(enableThreads))`
`250`	`250`	`{`
`251`		`- Definitions.Add("UEPY_THREADING");`
	`251`	`+ PublicDefinitions.Add("UEPY_THREADING");`
`252`	`252`	`System.Console.WriteLine("* Enabled Python Threads support *");`
`253`	`253`	`}`
`254`	`254`
`@@ -257,8 +257,8 @@ public UnrealEnginePython(TargetInfo Target)`
`257`	`257`	`private bool IsPathRelative(string Path)`
`258`	`258`	`{`
`259`	`259`	`bool IsRooted = Path.StartsWith("\\", System.StringComparison.Ordinal) \|\| // Root of the current directory on Windows. Also covers "\\" for UNC or "network" paths.`
`260`		`- Path.StartsWith("/", System.StringComparison.Ordinal) \|\| // Root of the current directory on Windows, root on UNIX-likes.`
`261`		`- // Also covers "\\", considering normalization replaces "\\" with "//".`
	`260`	`+ Path.StartsWith("/", System.StringComparison.Ordinal) \|\| // Root of the current directory on Windows, root on UNIX-likes.`
	`261`	`+ // Also covers "\\", considering normalization replaces "\\" with "//".`
`262`	`262`	`(Path.Length >= 2 && char.IsLetter(Path[0]) && Path[1] == ':'); // Starts with "<DriveLetter>:"`
`263`	`263`	`return !IsRooted;`
`264`	`264`	`}`