Merge branch 'CustomPath'

# Conflicts:
#	Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

Author: crazytuzi

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -387,7 +387,7 @@ void FUnrealEnginePythonModule::StartupModule()
 		IniValue.ParseIntoArray(ImportModules, separators, 3);
 	}
 
-	FString ProjectScriptsPath = FPaths::Combine(*PROJECT_CONTENT_DIR, UTF8_TO_TCHAR("Scripts"));
+	FString ProjectScriptsPath = FPaths::Combine(*PROJECT_CONTENT_DIR, UTF8_TO_TCHAR("PythonScripts"));
 	if (!FPaths::DirectoryExists(ProjectScriptsPath))
 	{
 		FPlatformFileManager::Get().GetPlatformFile().CreateDirectory(*ProjectScriptsPath);
@@ -397,7 +397,7 @@ void FUnrealEnginePythonModule::StartupModule()
 #if WITH_EDITOR
 	for (TSharedRef<IPlugin>plugin : IPluginManager::Get().GetEnabledPlugins())
 	{
-		FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("Scripts"));
+		FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("PythonScripts"));
 		if (FPaths::DirectoryExists(PluginScriptsPath))
 		{
 			ScriptsPaths.Add(PluginScriptsPath);
@@ -465,7 +465,7 @@ void FUnrealEnginePythonModule::StartupModule()
 #if PY_MAJOR_VERSION >= 3
 	init_unreal_engine_builtin();
 #if PLATFORM_ANDROID
-	FString InDirectory = FString(TEXT("Scripts"));
+	FString InDirectory = FString(TEXT("PythonScripts"));
 
 	extern FString GExternalFilePath;
 
@@ -479,7 +479,7 @@ void FUnrealEnginePythonModule::StartupModule()
 
 	FileManager->IterateDirectoryRecursively(*DirectoryPath, Visitor);
 
-	FString Prefix = FApp::GetProjectName() / FString(TEXT("Content/Scripts/"));
+	FString Prefix = FApp::GetProjectName() / FString(TEXT("Content/PythonScripts/"));
 
 	for (TMap<FString, FDateTime>::TIterator TimestampIt(Visitor.FileTimes); TimestampIt; ++TimestampIt)
 	{
@@ -513,7 +513,7 @@ void FUnrealEnginePythonModule::StartupModule()
     FString IOSContentPath = IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*IFileManager::Get().GetFilenameOnDisk(*FPaths::ConvertRelativePathToFull(PROJECT_CONTENT_DIR)));
     FString PyScriptsSearchPath = IOSContentPath / FString(TEXT("lib")) + FString(":") +
                                 IOSContentPath / FString(TEXT("lib/stdlib.zip")) + FString(":") +
-                                IOSContentPath / FString(TEXT("scripts")); // the name of directory must be lower-case.
+                                IOSContentPath / FString(TEXT("pythonscripts")); // the name of directory must be lower-case.
 
     Py_SetPath(Py_DecodeLocale(TCHAR_TO_UTF8(*PyScriptsSearchPath), NULL));
 

Source/UnrealEnginePython/Public/UnrealEnginePython.h

@@ -27,8 +27,8 @@
 #include "Runtime/Launch/Resources/Version.h"
 
 #if PLATFORM_MAC
-#include <Headers/Python.h>
-#include <Headers/structmember.h>
+#include <Python.h>
+#include <structmember.h>
 #elif PLATFORM_LINUX
 #include <Python.h>
 #include <structmember.h>

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -219,35 +219,18 @@ public UnrealEnginePython(TargetInfo Target)
 
         if (Target.Platform == UnrealTargetPlatform.Win64)
         {
-            if (pythonHome == "")
-            {
-                pythonHome = DiscoverPythonPath(windowsKnownPaths, "Win64");
-                if (pythonHome == "")
-                {
-                    throw new System.Exception("Unable to find Python installation");
-                }
-            }
-            System.Console.WriteLine("Using Python at: " + pythonHome);
-            PublicIncludePaths.Add(pythonHome);
-            string libPath = GetWindowsPythonLibFile(pythonHome);
-            PublicSystemLibraryPaths.Add(Path.GetDirectoryName(libPath));
-            PublicAdditionalLibraries.Add(libPath);
+            string PythonHome = Path.Combine(Target.UEThirdPartyBinariesDirectory, "Python3/Win64");
+            PublicIncludePaths.Add(PythonHome);
+            string LibPath = Path.Combine(Target.UEThirdPartySourceDirectory, "Python3/Win64/libs/python39.lib");
+            PublicSystemLibraryPaths.Add(Path.GetDirectoryName(LibPath));
+            PublicAdditionalLibraries.Add(LibPath);
         }
         else if (Target.Platform == UnrealTargetPlatform.Mac)
         {
-            if (pythonHome == "")
-            {
-                pythonHome = DiscoverPythonPath(macKnownPaths, "Mac");
-                if (pythonHome == "")
-                {
-                    throw new System.Exception("Unable to find Python installation");
-                }
-            }
-            System.Console.WriteLine("Using Python at: " + pythonHome);
-            PublicIncludePaths.Add(pythonHome);
-            string libPath = GetMacPythonLibFile(pythonHome);
-            PublicAdditionalLibraries.Add(Path.GetDirectoryName(libPath));
-            PublicDelayLoadDLLs.Add(libPath);
+            string PythonHome = Path.Combine(Target.UEThirdPartySourceDirectory, "Python3/Mac/include");
+            PublicIncludePaths.Add(PythonHome);
+            string LibPath = Path.Combine(Target.UEThirdPartyBinariesDirectory, "Python3/Mac/lib/libpython3.9.dylib");
+            PublicDelayLoadDLLs.Add(LibPath);
         }
         else if (Target.Platform == UnrealTargetPlatform.Linux)
         {