GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11

Browse Source 
# Conflicts:
#	Source/Engine/Platform/Windows/WindowsPlatform.cpp
#	Source/Tools/Flax.Build/Build/ProjectTarget.cs
#	Source/Tools/Flax.Build/Configuration.cs
This commit is contained in:
Ari Vuollet
2025-09-07 19:31:16 +03:00
parent d70a003617 42b542d190
commit 1d8f221f1b
470 changed files with 53355 additions and 3350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Platform/Mac/MacPlatform.cpp
View File

@@ -491,6 +491,7 @@ int32 MacPlatform::CreateProcess(CreateProcessSettings& settings)
String line((const char*)data.bytes, data.length);
if (settings.SaveOutput)
settings.Output.Add(line.Get(), line.Length());
#if LOG_ENABLE
if (settings.LogOutput)
{
StringView lineView(line);
@@ -498,6 +499,7 @@ int32 MacPlatform::CreateProcess(CreateProcessSettings& settings)
lineView = StringView(line.Get(), line.Length() - 1);
Log::Logger::Write(LogType::Info, lineView);
}
#endif
[[stdoutPipe fileHandleForReading] waitForDataInBackgroundAndNotify];
}
}
@@ -518,6 +520,7 @@ int32 MacPlatform::CreateProcess(CreateProcessSettings& settings)
String line((const char*)data.bytes, data.length);
if (settings.SaveOutput)
settings.Output.Add(line.Get(), line.Length());
#if LOG_ENABLE
if (settings.LogOutput)
{
StringView lineView(line);
@@ -525,6 +528,7 @@ int32 MacPlatform::CreateProcess(CreateProcessSettings& settings)
lineView = StringView(line.Get(), line.Length() - 1);
Log::Logger::Write(LogType::Error, lineView);
}
#endif
[[stderrPipe fileHandleForReading] waitForDataInBackgroundAndNotify];
}
}