Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Use bundled python from Emscripten SDK on Windows too

Browse Source
This commit is contained in:
Wojciech Figat
2026-04-18 22:31:57 +02:00
parent 925b83e095
commit b6dfd1351d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/Cooker/Platform/Web/WebPlatformTools.cpp
+11 -4
View File
@@ -183,20 +183,27 @@ bool WebPlatformTools::OnPostProcess(CookingData& data)
String emscriptenSdk = TEXT("EMSDK"); String emscriptenSdk = TEXT("EMSDK");
Platform::GetEnvironmentVariable(emscriptenSdk, emscriptenSdk); Platform::GetEnvironmentVariable(emscriptenSdk, emscriptenSdk);
procSettings.FileName = emscriptenSdk / TEXT("upstream/emscripten/tools/file_packager"); procSettings.FileName = emscriptenSdk / TEXT("upstream/emscripten/tools/file_packager");
#if PLATFORM_WIN32
procSettings.FileName += TEXT(".bat");
#endif
procSettings.Arguments = String::Format(TEXT("files.data --preload \"{}@/\" --lz4 --js-output=files.js"), data.DataOutputPath); procSettings.Arguments = String::Format(TEXT("files.data --preload \"{}@/\" --lz4 --js-output=files.js"), data.DataOutputPath);
procSettings.WorkingDirectory = data.OriginalOutputPath; procSettings.WorkingDirectory = data.OriginalOutputPath;
#if PLATFORM_MAC #if PLATFORM_MAC || PLATFORM_WINDOWS
// Use python bundled with SDK (python from min-spec XCode 16.4 is 3.9.6 which is < 3.10 needed by SDK 5.0) // Use python bundled with SDK (python from min-spec XCode 16.4 is 3.9.6 which is < 3.10 needed by SDK 5.0)
Array<String> pythons; Array<String> pythons;
FileSystem::GetChildDirectories(pythons, emscriptenSdk / TEXT("/python")); FileSystem::GetChildDirectories(pythons, emscriptenSdk / TEXT("/python"));
if (pythons.HasItems()) if (pythons.HasItems())
{ {
procSettings.Arguments = procSettings.FileName + TEXT(".py ") + procSettings.Arguments; procSettings.Arguments = procSettings.FileName + TEXT(".py ") + procSettings.Arguments;
#if PLATFORM_WINDOWS
procSettings.FileName = pythons[0] / TEXT("/python.exe");
#else
procSettings.FileName = pythons[0] / TEXT("/bin/python3"); procSettings.FileName = pythons[0] / TEXT("/bin/python3");
#endif
} }
#if PLATFORM_WINDOWS
else
{
procSettings.FileName += TEXT(".bat");
}
#endif
#endif #endif
const int32 result = Platform::CreateProcess(procSettings); const int32 result = Platform::CreateProcess(procSettings);
if (result != 0) if (result != 0)