izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Get a DLLHandle for Linux as well when loadind in the python module

Browse Source 
#jira UE-76551
#rb Jamie.Dale

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 7094112 in //UE4/Release-4.23/... via CL 7094113
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v367-6836689)

[CL 7153507 by brandon schaefer in Dev-VR branch]
This commit is contained in:
brandon schaefer
2019-06-21 14:47:57 -04:00
parent f4448302e0
commit 0fed9fa765
1 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Engine/Plugins/Experimental/PythonScriptPlugin/Source/PythonScriptPluginPreload/Private/PythonScriptPluginPreload.cpp
View File

@@ -35,10 +35,45 @@ public:
private:
#if WITH_PYTHON
void LoadSharedDSO(const FString& PythonDSOWildcard, const FString& PythonDir)
{
auto FindPythonDSOs = [&PythonDSOWildcard](const FString& InPath)
{
TArray<FString> PythonDSONames;
IFileManager::Get().FindFiles(PythonDSONames, *(InPath / PythonDSOWildcard), true, false);
for (FString& PythonDSOName : PythonDSONames)
{
PythonDSOName = InPath / PythonDSOName;
FPaths::NormalizeFilename(PythonDSOName);
}
return PythonDSONames;
};
TArray<FString> PythonDSOPaths = FindPythonDSOs(PythonDir);
#if PLATFORM_WINDOWS
if (PythonDSOPaths.Num() == 0)
{
// If we didn't find anything, check the Windows directory as the DLLs can sometimes be installed there
FString WinDir = FPlatformMisc::GetEnvironmentVariable(TEXT("WINDIR"));
if (!WinDir.IsEmpty())
{
PythonDSOPaths = FindPythonDSOs(WinDir / TEXT("System32"));
}
}
#endif
for (const FString& PythonDSOPath : PythonDSOPaths)
{
void* DLLHandle = FPlatformProcess::GetDllHandle(*PythonDSOPath);
check(DLLHandle != nullptr);
DLLHandles.Add(DLLHandle);
}
}
void LoadPythonLibraries()
{
#if PLATFORM_WINDOWS
// Load the DLLs
#if PLATFORM_WINDOWS || PLATFORM_LINUX
// Load the DSOs
{
// Build the full Python directory (UE_PYTHON_DIR may be relative to UE4 engine directory for portability)
FString PythonDir = UTF8_TO_TCHAR(UE_PYTHON_DIR);
@@ -46,38 +81,15 @@ private:
FPaths::NormalizeDirectoryName(PythonDir);
FPaths::RemoveDuplicateSlashes(PythonDir);
const FString PythonDllWildcard = FString::Printf(TEXT("python%d*.dll"), PY_MAJOR_VERSION);
auto FindPythonDLLs = [&PythonDllWildcard](const FString& InPath)
{
TArray<FString> PythonDLLNames;
IFileManager::Get().FindFiles(PythonDLLNames, *(InPath / PythonDllWildcard), true, false);
for (FString& PythonDLLName : PythonDLLNames)
{
PythonDLLName = InPath / PythonDLLName;
FPaths::NormalizeFilename(PythonDLLName);
}
return PythonDLLNames;
};
TArray<FString> PythonDLLPaths = FindPythonDLLs(PythonDir);
if (PythonDLLPaths.Num() == 0)
{
// If we didn't find anything, check the Windows directory as the DLLs can sometimes be installed there
FString WinDir = FPlatformMisc::GetEnvironmentVariable(TEXT("WINDIR"));
if (!WinDir.IsEmpty())
{
PythonDLLPaths = FindPythonDLLs(WinDir / TEXT("System32"));
}
}
for (const FString& PythonDLLPath : PythonDLLPaths)
{
void* DLLHandle = FPlatformProcess::GetDllHandle(*PythonDLLPath);
check(DLLHandle != nullptr);
DLLHandles.Add(DLLHandle);
}
#if PLATFORM_WINDOWS
const FString PythonDSOWildcard = FString::Printf(TEXT("python%d*.dll"), PY_MAJOR_VERSION);
#elif PLATFORM_LINUX
const FString PythonDSOWildcard = FString::Printf(TEXT("libpython%d*.so*"), PY_MAJOR_VERSION);
PythonDir /= "lib";
#endif
LoadSharedDSO(PythonDSOWildcard, PythonDir);
}
#endif // PLATFORM_WINDOWS
#endif // PLATFORM_WINDOWS || PLATFORM_LINUX
}
void UnloadPythonLibraries()