diff --git a/karuku/CMakeLists.txt b/karuku/CMakeLists.txt index d3f1a65..133d570 100644 --- a/karuku/CMakeLists.txt +++ b/karuku/CMakeLists.txt @@ -9,6 +9,6 @@ target_include_directories(novus-karuku PUBLIC include) -target_link_libraries(novus-karuku PRIVATE physis z Qt6::Core Qt6::Widgets exdpart novus-common) +target_link_libraries(novus-karuku PRIVATE physis physis-logger z Qt6::Core Qt6::Widgets exdpart novus-common) install(TARGETS novus-karuku ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/karuku/src/main.cpp b/karuku/src/main.cpp index a69333f..6d93146 100644 --- a/karuku/src/main.cpp +++ b/karuku/src/main.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "aboutdata.h" #include "mainwindow.h" @@ -14,6 +15,13 @@ int main(int argc, char *argv[]) customizeAboutData(QStringLiteral("karuku"), QStringLiteral("Karuku"), QStringLiteral("Program to view FFXIV Excel files.")); + // 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()}; MainWindow w(physis_gamedata_initialize(gameDirStd.c_str())); diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp index 59b0f8d..79dc43f 100644 --- a/launcher/src/main.cpp +++ b/launcher/src/main.cpp @@ -19,6 +19,11 @@ int main(int argc, char *argv[]) QStringLiteral("SDK Launcher"), QStringLiteral("Handles setting up and launching various Novus SDK components.")); + // 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}"); + } + KConfig config(QStringLiteral("novusrc")); KConfigGroup game = config.group(QStringLiteral("Game")); diff --git a/mdlviewer/CMakeLists.txt b/mdlviewer/CMakeLists.txt index 1de5a4c..ba4ec89 100644 --- a/mdlviewer/CMakeLists.txt +++ b/mdlviewer/CMakeLists.txt @@ -8,6 +8,6 @@ target_sources(novus-mdlviewer PRIVATE target_include_directories(novus-mdlviewer PUBLIC include) -target_link_libraries(novus-mdlviewer PRIVATE physis z Qt6::Core Qt6::Widgets KF6::XmlGui mdlpart novus-common) +target_link_libraries(novus-mdlviewer PRIVATE physis physis-logger z Qt6::Core Qt6::Widgets KF6::XmlGui mdlpart novus-common) install(TARGETS novus-mdlviewer ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/mdlviewer/src/main.cpp b/mdlviewer/src/main.cpp index d0c1130..85c8f71 100644 --- a/mdlviewer/src/main.cpp +++ b/mdlviewer/src/main.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "aboutdata.h" #include "mainwindow.h" @@ -14,6 +15,13 @@ int main(int argc, char *argv[]) customizeAboutData(QStringLiteral("mdlviewer"), QStringLiteral("MDLViewer"), QStringLiteral("Program to view FFXIV MDL files.")); + // 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()}; MainWindow w(physis_gamedata_initialize(gameDirStd.c_str())); diff --git a/sagasu/CMakeLists.txt b/sagasu/CMakeLists.txt index a4c1196..91e33eb 100644 --- a/sagasu/CMakeLists.txt +++ b/sagasu/CMakeLists.txt @@ -22,6 +22,6 @@ target_sources(novus-sagasu PRIVATE src/filepropertieswindow.cpp src/filetreemodel.cpp) target_include_directories(novus-sagasu PRIVATE include) -target_link_libraries(novus-sagasu PRIVATE Qt6::Concurrent sklbpart cmppart shpkpart hexpart exlpart mdlpart exdpart texpart novus-sagasu-static) +target_link_libraries(novus-sagasu PRIVATE Qt6::Concurrent physis-logger sklbpart cmppart shpkpart hexpart exlpart mdlpart exdpart texpart novus-sagasu-static) install(TARGETS novus-sagasu ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/sagasu/src/main.cpp b/sagasu/src/main.cpp index 35630c4..086c361 100644 --- a/sagasu/src/main.cpp +++ b/sagasu/src/main.cpp @@ -4,6 +4,7 @@ #include #include +#include #include "aboutdata.h" #include "mainwindow.h" @@ -15,7 +16,12 @@ int main(int argc, char *argv[]) customizeAboutData(QStringLiteral("sagasu"), QStringLiteral("Sagasu"), QStringLiteral("Program to explore FFXIV data archives.")); - 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()};