From b891e71923f147b4ca589482821423f798dfb43f Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 10 Oct 2023 16:45:17 -0400 Subject: [PATCH] armoury: Use new physis logger --- armoury/CMakeLists.txt | 4 +++- armoury/src/main.cpp | 8 +++++++- extern/libphysis | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/armoury/CMakeLists.txt b/armoury/CMakeLists.txt index 316d0c3..0af13f2 100644 --- a/armoury/CMakeLists.txt +++ b/armoury/CMakeLists.txt @@ -25,7 +25,9 @@ target_link_libraries(armoury PUBLIC Qt6::Widgets Qt6::Concurrent magic_enum - physis z + physis + z + physis-logger mdlpart imgui NovusCommon) diff --git a/armoury/src/main.cpp b/armoury/src/main.cpp index 46d0b67..5b2c8b1 100644 --- a/armoury/src/main.cpp +++ b/armoury/src/main.cpp @@ -6,6 +6,7 @@ #include "aboutdata.h" #include "mainwindow.h" +#include "physis_logger.h" #include "settings.h" int main(int argc, char* argv[]) { @@ -14,7 +15,12 @@ int main(int argc, char* argv[]) { customizeAboutData( QStringLiteral("armoury"), QStringLiteral("Armoury"), QStringLiteral("Program to view FFXIV gear.")); - physis_initialize_logging(); + // Default to a sensible message pattern + if (qEnvironmentVariableIsEmpty("QT_MESSAGE_PATTERN")) { + qputenv("QT_MESSAGE_PATTERN", "[%{time yyyy-MM-dd h:mm:ss.zzz}] %{if-category}[%{category}] %{endif}[%{type}] %{message}"); + } + + setup_physis_logging(); const QString gameDir{getGameDirectory()}; const std::string gameDirStd{gameDir.toStdString()}; diff --git a/extern/libphysis b/extern/libphysis index 6992aff..5a5234d 160000 --- a/extern/libphysis +++ b/extern/libphysis @@ -1 +1 @@ -Subproject commit 6992aff3c2898349b9b17b9682364280c90ed8a9 +Subproject commit 5a5234d4c0b288caf80dfdfa07612f1a38d16532