From 61e5bcef2629e2d68b805a956a96fff264d4f74d Mon Sep 17 00:00:00 2001 From: untodesu Date: Sat, 28 Jun 2025 01:59:49 +0500 Subject: Restructure dependencies and update to C++20 - Nuked static_assert from almost everywhere in the project - Nuked binary dependency support. Might add one later though - Separated dependency headers into a separate include subdirectory - Grafted a thirdpartylegalnotices.txt generator from RITEG - Pushed development snapshot version to 2126 (26th week of 2025) --- deps/src/spdlog/CMakeLists.txt | 22 ------------- deps/src/spdlog/async.cpp | 11 ------- deps/src/spdlog/bundled_fmtlib_format.cpp | 48 --------------------------- deps/src/spdlog/cfg.cpp | 8 ----- deps/src/spdlog/color_sinks.cpp | 55 ------------------------------- deps/src/spdlog/file_sinks.cpp | 20 ----------- deps/src/spdlog/spdlog.cpp | 28 ---------------- deps/src/spdlog/stdout_sinks.cpp | 37 --------------------- 8 files changed, 229 deletions(-) delete mode 100644 deps/src/spdlog/CMakeLists.txt delete mode 100644 deps/src/spdlog/async.cpp delete mode 100644 deps/src/spdlog/bundled_fmtlib_format.cpp delete mode 100644 deps/src/spdlog/cfg.cpp delete mode 100644 deps/src/spdlog/color_sinks.cpp delete mode 100644 deps/src/spdlog/file_sinks.cpp delete mode 100644 deps/src/spdlog/spdlog.cpp delete mode 100644 deps/src/spdlog/stdout_sinks.cpp (limited to 'deps/src/spdlog') diff --git a/deps/src/spdlog/CMakeLists.txt b/deps/src/spdlog/CMakeLists.txt deleted file mode 100644 index 8a10e27..0000000 --- a/deps/src/spdlog/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -add_library(spdlog STATIC - "${CMAKE_CURRENT_LIST_DIR}/async.cpp" - "${CMAKE_CURRENT_LIST_DIR}/bundled_fmtlib_format.cpp" - "${CMAKE_CURRENT_LIST_DIR}/cfg.cpp" - "${CMAKE_CURRENT_LIST_DIR}/color_sinks.cpp" - "${CMAKE_CURRENT_LIST_DIR}/file_sinks.cpp" - "${CMAKE_CURRENT_LIST_DIR}/spdlog.cpp" - "${CMAKE_CURRENT_LIST_DIR}/stdout_sinks.cpp") -target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB) -target_include_directories(spdlog PUBLIC "${DEPS_INCLUDE_DIR}") -set_target_properties(spdlog PROPERTIES FOLDER DEPS) - -find_package(Threads REQUIRED) -target_link_libraries(spdlog PUBLIC Threads::Threads) - -if(MSVC) - # There seems to be a compile-time check merged into the - # master fmtlib branch that has been pulled into spdlog as well - # that seems to fix an MSVC bug (https://github.com/fmtlib/fmt/pull/2297) - # FIXME: should I bundle fmtlib as a separate dependency? - target_compile_options(spdlog PUBLIC /utf-8) -endif() diff --git a/deps/src/spdlog/async.cpp b/deps/src/spdlog/async.cpp deleted file mode 100644 index f99d977..0000000 --- a/deps/src/spdlog/async.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#include -#include -#include -#include diff --git a/deps/src/spdlog/bundled_fmtlib_format.cpp b/deps/src/spdlog/bundled_fmtlib_format.cpp deleted file mode 100644 index 4a5b35d..0000000 --- a/deps/src/spdlog/bundled_fmtlib_format.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// Slightly modified version of fmt lib's format.cc source file. -// Copyright (c) 2012 - 2016, Victor Zverovich -// All rights reserved. - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT) - - #include - -FMT_BEGIN_NAMESPACE -namespace detail { - -template FMT_API auto dragonbox::to_decimal(float x) noexcept - -> dragonbox::decimal_fp; -template FMT_API auto dragonbox::to_decimal(double x) noexcept - -> dragonbox::decimal_fp; - -#ifndef FMT_STATIC_THOUSANDS_SEPARATOR -template FMT_API locale_ref::locale_ref(const std::locale& loc); -template FMT_API auto locale_ref::get() const -> std::locale; -#endif - -// Explicit instantiations for char. - -template FMT_API auto thousands_sep_impl(locale_ref) - -> thousands_sep_result; -template FMT_API auto decimal_point_impl(locale_ref) -> char; - -template FMT_API void buffer::append(const char*, const char*); - -template FMT_API void vformat_to(buffer&, string_view, - typename vformat_args<>::type, locale_ref); - -// Explicit instantiations for wchar_t. - -template FMT_API auto thousands_sep_impl(locale_ref) - -> thousands_sep_result; -template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t; - -template FMT_API void buffer::append(const wchar_t*, const wchar_t*); - -} // namespace detail -FMT_END_NAMESPACE - -#endif // !SPDLOG_FMT_EXTERNAL diff --git a/deps/src/spdlog/cfg.cpp b/deps/src/spdlog/cfg.cpp deleted file mode 100644 index c98fd36..0000000 --- a/deps/src/spdlog/cfg.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#include diff --git a/deps/src/spdlog/color_sinks.cpp b/deps/src/spdlog/color_sinks.cpp deleted file mode 100644 index 2406004..0000000 --- a/deps/src/spdlog/color_sinks.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#include - -#include -#include -// -// color sinks -// -#ifdef _WIN32 - #include -template class SPDLOG_API spdlog::sinks::wincolor_sink; -template class SPDLOG_API spdlog::sinks::wincolor_sink; -template class SPDLOG_API spdlog::sinks::wincolor_stdout_sink; -template class SPDLOG_API spdlog::sinks::wincolor_stdout_sink; -template class SPDLOG_API spdlog::sinks::wincolor_stderr_sink; -template class SPDLOG_API spdlog::sinks::wincolor_stderr_sink; -#else - #include "spdlog/sinks/ansicolor_sink-inl.h" -template class SPDLOG_API spdlog::sinks::ansicolor_sink; -template class SPDLOG_API spdlog::sinks::ansicolor_sink; -template class SPDLOG_API spdlog::sinks::ansicolor_stdout_sink; -template class SPDLOG_API spdlog::sinks::ansicolor_stdout_sink; -template class SPDLOG_API spdlog::sinks::ansicolor_stderr_sink; -template class SPDLOG_API spdlog::sinks::ansicolor_stderr_sink; -#endif - -// factory methods for color loggers -#include "spdlog/sinks/stdout_color_sinks-inl.h" -template SPDLOG_API std::shared_ptr -spdlog::stdout_color_mt(const std::string &logger_name, - color_mode mode); -template SPDLOG_API std::shared_ptr -spdlog::stdout_color_st(const std::string &logger_name, - color_mode mode); -template SPDLOG_API std::shared_ptr -spdlog::stderr_color_mt(const std::string &logger_name, - color_mode mode); -template SPDLOG_API std::shared_ptr -spdlog::stderr_color_st(const std::string &logger_name, - color_mode mode); - -template SPDLOG_API std::shared_ptr spdlog::stdout_color_mt( - const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stdout_color_st( - const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stderr_color_mt( - const std::string &logger_name, color_mode mode); -template SPDLOG_API std::shared_ptr spdlog::stderr_color_st( - const std::string &logger_name, color_mode mode); diff --git a/deps/src/spdlog/file_sinks.cpp b/deps/src/spdlog/file_sinks.cpp deleted file mode 100644 index 7d70127..0000000 --- a/deps/src/spdlog/file_sinks.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#include -#include -#include -#include - -#include - -template class SPDLOG_API spdlog::sinks::basic_file_sink; -template class SPDLOG_API spdlog::sinks::basic_file_sink; - -#include -template class SPDLOG_API spdlog::sinks::rotating_file_sink; -template class SPDLOG_API spdlog::sinks::rotating_file_sink; diff --git a/deps/src/spdlog/spdlog.cpp b/deps/src/spdlog/spdlog.cpp deleted file mode 100644 index 1a2638a..0000000 --- a/deps/src/spdlog/spdlog.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -// template instantiate logger constructor with sinks init list -template SPDLOG_API spdlog::logger::logger(std::string name, - sinks_init_list::iterator begin, - sinks_init_list::iterator end); -template class SPDLOG_API spdlog::sinks::base_sink; -template class SPDLOG_API spdlog::sinks::base_sink; diff --git a/deps/src/spdlog/stdout_sinks.cpp b/deps/src/spdlog/stdout_sinks.cpp deleted file mode 100644 index afd1837..0000000 --- a/deps/src/spdlog/stdout_sinks.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) - -#ifndef SPDLOG_COMPILED_LIB - #error Please define SPDLOG_COMPILED_LIB to compile this file. -#endif - -#include - -#include -#include -#include - -template class SPDLOG_API spdlog::sinks::stdout_sink_base; -template class SPDLOG_API spdlog::sinks::stdout_sink_base; -template class SPDLOG_API spdlog::sinks::stdout_sink; -template class SPDLOG_API spdlog::sinks::stdout_sink; -template class SPDLOG_API spdlog::sinks::stderr_sink; -template class SPDLOG_API spdlog::sinks::stderr_sink; - -template SPDLOG_API std::shared_ptr -spdlog::stdout_logger_mt(const std::string &logger_name); -template SPDLOG_API std::shared_ptr -spdlog::stdout_logger_st(const std::string &logger_name); -template SPDLOG_API std::shared_ptr -spdlog::stderr_logger_mt(const std::string &logger_name); -template SPDLOG_API std::shared_ptr -spdlog::stderr_logger_st(const std::string &logger_name); - -template SPDLOG_API std::shared_ptr spdlog::stdout_logger_mt( - const std::string &logger_name); -template SPDLOG_API std::shared_ptr spdlog::stdout_logger_st( - const std::string &logger_name); -template SPDLOG_API std::shared_ptr spdlog::stderr_logger_mt( - const std::string &logger_name); -template SPDLOG_API std::shared_ptr spdlog::stderr_logger_st( - const std::string &logger_name); -- cgit