Update premake and protoc
This commit is contained in:
parent
db40f3b6c2
commit
2a64c578c7
2
deps/mongoose
vendored
2
deps/mongoose
vendored
@ -1 +1 @@
|
||||
Subproject commit dfde5785a62bc4b59f504a5545ce8476ad09f88d
|
||||
Subproject commit 06b6bf6185067506a851a2efadf94599ad1cb880
|
2
deps/protobuf
vendored
2
deps/protobuf
vendored
@ -1 +1 @@
|
||||
Subproject commit 20b532544fde1dff34429b52db95c3a96409b73c
|
||||
Subproject commit dfe0c9ad3836dc3756a908fa0e4aee1c2b3f2ce1
|
@ -23,32 +23,25 @@ namespace Components
|
||||
|
||||
void Logger::MessagePrint(int channel, std::string message)
|
||||
{
|
||||
if (Flags::HasFlag("stdout"))
|
||||
if (Flags::HasFlag("stdout") || Loader::PerformingUnitTests())
|
||||
{
|
||||
printf("%s", message.data());
|
||||
fflush(stdout);
|
||||
return;
|
||||
}
|
||||
else if (Logger::IsConsoleReady())
|
||||
|
||||
if (!Logger::IsConsoleReady())
|
||||
{
|
||||
if (!Game::Sys_IsMainThread())
|
||||
{
|
||||
Logger::EnqueueMessage(message);
|
||||
}
|
||||
else
|
||||
{
|
||||
Game::Com_PrintMessage(0, message.data(), 0);
|
||||
}
|
||||
OutputDebugStringA(message.data());
|
||||
}
|
||||
|
||||
if (!Game::Sys_IsMainThread())
|
||||
{
|
||||
Logger::EnqueueMessage(message);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Only print to stdout, when doing unit tests
|
||||
if (Loader::PerformingUnitTests())
|
||||
{
|
||||
printf("%s", message.data());
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
OutputDebugStringA(message.data());
|
||||
Game::Com_PrintMessage(0, message.data(), 0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -90,11 +83,9 @@ namespace Components
|
||||
|
||||
for (unsigned int i = 0; i < Logger::MessageQueue.size(); ++i)
|
||||
{
|
||||
if (Logger::IsConsoleReady())
|
||||
{
|
||||
Game::Com_PrintMessage(0, Logger::MessageQueue[i].data(), 0);
|
||||
}
|
||||
else
|
||||
Game::Com_PrintMessage(0, Logger::MessageQueue[i].data(), 0);
|
||||
|
||||
if (!Logger::IsConsoleReady())
|
||||
{
|
||||
OutputDebugStringA(Logger::MessageQueue[i].data());
|
||||
}
|
||||
|
Binary file not shown.
BIN
tools/protoc.exe
BIN
tools/protoc.exe
Binary file not shown.
Loading…
Reference in New Issue
Block a user