diff --git a/src/logging/Logger.cpp b/src/logging/Logger.cpp index e685c73..7a667a6 100644 --- a/src/logging/Logger.cpp +++ b/src/logging/Logger.cpp @@ -3,16 +3,9 @@ #include #include -#ifdef _WIN32 - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - -#include -#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 - -#endif +// Instead of defining FMT_HEADER_ONLY or building fmtlib +// we can just include all implementation code in Logger.cpp +#include "fmt/src/format.cc" namespace Feather::Log { @@ -36,30 +29,41 @@ namespace Feather::Log return *s_logger; } +} - namespace - { - class LoggingManager - { - public: - LoggingManager() - { #ifdef _WIN32 - HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE); - if (handle != INVALID_HANDLE_VALUE) - { - DWORD mode = 0; - if (GetConsoleMode(handle, &mode)) - { - // To enable ANSI escape sequences on Windows 10 we need to set this flag - mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; - SetConsoleMode(handle, mode); - } - } -#endif - } - }; - static LoggingManager s_networkManager; - } +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include +#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 + +#endif + +namespace +{ + class LoggingManager + { + public: + LoggingManager() + { +#ifdef _WIN32 + HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE); + if (handle != INVALID_HANDLE_VALUE) + { + DWORD mode = 0; + if (GetConsoleMode(handle, &mode)) + { + // To enable ANSI escape sequences on Windows 10 we need to set this flag + mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; + SetConsoleMode(handle, mode); + } + } +#endif + } + }; + + static LoggingManager s_loggingManager; } \ No newline at end of file diff --git a/src/logging/Logger.h b/src/logging/Logger.h index afbbcbc..6e2aeb0 100644 --- a/src/logging/Logger.h +++ b/src/logging/Logger.h @@ -1,8 +1,5 @@ #pragma once -#include - -#define FMT_HEADER_ONLY #include #include #include