Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
# 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:
@@ -1854,6 +1854,11 @@ void LinuxPlatform::Sleep(int32 milliseconds)
|
||||
usleep(milliseconds * 1000);
|
||||
}
|
||||
|
||||
void LinuxPlatform::Yield()
|
||||
{
|
||||
sched_yield();
|
||||
}
|
||||
|
||||
double LinuxPlatform::GetTimeSeconds()
|
||||
{
|
||||
struct timespec ts;
|
||||
@@ -3061,8 +3066,10 @@ int32 LinuxPlatform::CreateProcess(CreateProcessSettings& settings)
|
||||
String line(lineBuffer);
|
||||
if (settings.SaveOutput)
|
||||
settings.Output.Add(line.Get(), line.Length());
|
||||
#if LOG_ENABLE
|
||||
if (settings.LogOutput)
|
||||
Log::Logger::Write(LogType::Info, line);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
int stat_loc;
|
||||
|
||||
Reference in New Issue
Block a user