spdlog from package managers #4088
Conversation
| @@ -417,6 +416,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") | |||
| "_UNICODE" | |||
| STORMLIB_NO_AUTO_LINK | |||
| "_CRT_SECURE_NO_WARNINGS;" | |||
| NOMINMAX | |||
There was a problem hiding this comment.
we use std::min and std::max which doesn't work if we include windef.h (which is included by windows.h)
this ensures we can continue to use them regardless of where we include windows.h from
i have no idea why the way we were including SPDLOG was making this not a problem for us before, probably just luck of the include order
| @@ -179,7 +179,7 @@ CrowdControl::EffectResult CrowdControl::TranslateGiEnum(GameInteractionEffectQu | |||
|
|
|||
| CrowdControl::Effect* CrowdControl::ParseMessage(nlohmann::json dataReceived) { | |||
| if (!dataReceived.contains("id") || !dataReceived.contains("type")) { | |||
| SPDLOG_ERROR("[CrowdControl] Invalid payload received:\n{}", dataReceived); | |||
| SPDLOG_ERROR("[CrowdControl] Invalid payload received:\n{}", dataReceived.dump()); | |||
There was a problem hiding this comment.
no idea how this wasn't a problem before, but we use .dump() in the other places we SPDLOG out json in this file and it fixed the error i was seeing
| @@ -324,7 +324,7 @@ OTRGlobals::OTRGlobals() { | |||
| auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); | |||
| overlay->LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f); | |||
| overlay->LoadFont("Fipps", "fonts/Fipps-Regular.otf", 32.0f); | |||
| overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P")); | |||
| overlay->SetCurrentFont(CVarGetString("gOverlayFont", "Press Start 2P")); | |||
There was a problem hiding this comment.
Kenix3/libultraship#527 moved this from a #define in code (my temporary solution) to a cmake cache define on the LUS side. this just gets things building until malk PRs the soh side of that change
Build Artifacts