From 6836cab5374d22220bcf2e3bd65ee8494a4609d5 Mon Sep 17 00:00:00 2001 From: josh Date: Wed, 4 Jun 2025 13:54:50 -0500 Subject: [PATCH] Re-enable color output on Windows. --- CMakeLists.txt | 2 +- include/jlog/Logger.hpp | 5 +---- main.cpp | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c27651..51bc125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ CPMAddPackage( CPMAddPackage( NAME mcolor - URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-7.2.zip + URL https://git.redacted.cc/maxine/mcolor/archive/Release-1.zip ) if (UNIX) diff --git a/include/jlog/Logger.hpp b/include/jlog/Logger.hpp index edbd762..9e0b4d9 100644 --- a/include/jlog/Logger.hpp +++ b/include/jlog/Logger.hpp @@ -47,10 +47,7 @@ namespace jlog { const Timestamp &ts = Timestamp()) { if (!Enable) return; - // Disable color on Windows. I've been trying my best to keep this macro hidden from the user. - maxine -#ifdef WIN32 - IncludeColor = false; -#endif + if (IncludeTimestamp) { Timestamp ts; os << token{std::format( diff --git a/main.cpp b/main.cpp index a7d483a..3843a9c 100644 --- a/main.cpp +++ b/main.cpp @@ -8,6 +8,7 @@ int main() { + mcolor::windowsSaneify(); jlog::GenericLogger Demo("demo", jlog::GlobalLogFile); Demo("No new demo yet"); jlog::Info("dsadsd");