diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index a3762ba9..4741b64f 100644 --- a/include/spdlog/fmt/fmt.h +++ b/include/spdlog/fmt/fmt.h @@ -26,8 +26,9 @@ #ifndef FMT_USE_WINDOWS_H #define FMT_USE_WINDOWS_H 0 #endif -#include "bundled/core.h" -#include "bundled/format.h" + +#include +#include #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib #include #include diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h index 9902898f..f82eb679 100644 --- a/include/spdlog/fmt/ostr.h +++ b/include/spdlog/fmt/ostr.h @@ -7,12 +7,14 @@ // // include bundled or external copy of fmtlib's ostream support // + #if !defined(SPDLOG_FMT_EXTERNAL) +#ifdef SPDLOG_HEADER_ONLY #ifndef FMT_HEADER_ONLY #define FMT_HEADER_ONLY #endif -#include "bundled/ostream.h" -#include "fmt.h" +#endif +#include #else #include #endif