fix: move spdlog_wrapper into graphics library, since spldog is not required for the core library

Totto16 · Totto16 · commit 5d7a0726745e · 2025-05-15T17:55:05.000+02:00
diff --git a/src/discord/core.cpp b/src/discord/core.cpp
@@ -1,9 +1,9 @@
 
+#include "helper/spdlog_wrapper.hpp"
 #include <core/helper/utils.hpp>
 
 #include "./core.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
 #include <fmt/format.h>
 
 [[nodiscard]] std::string constants::discord ::get_asset_key(constants::discord::ArtAsset asset) {
diff --git a/src/executables/game/application.cpp b/src/executables/game/application.cpp
@@ -11,7 +11,7 @@
 #include "ui/layout.hpp"
 
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <fmt/chrono.h>
 #include <memory>
 #include <ranges>
diff --git a/src/executables/game/parser.cpp b/src/executables/game/parser.cpp
@@ -9,8 +9,8 @@
 #include "helper/graphic_utils.hpp"
 
 
+#include "helper/spdlog_wrapper.hpp"
 #include <argparse/argparse.hpp>
-#include <core/helper/spdlog_wrapper.hpp>
 
 
 helper::expected<CommandLineArguments, std::string> helper::parse_args(const std::vector<std::string>& arguments) {
diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -1,6 +1,6 @@
 
+#include "helper/spdlog_wrapper.hpp"
 #include <core/helper/magic_enum_wrapper.hpp>
-#include <core/helper/spdlog_wrapper.hpp>
 #include <core/helper/utils.hpp>
 
 #include "game.hpp"
diff --git a/src/game/grid.cpp b/src/game/grid.cpp
@@ -1,7 +1,7 @@
 #include "grid.hpp"
 #include "graphics/renderer.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 Grid::Grid(const ui::Layout& layout, bool is_top_level)
     : ui::Widget{ layout, ui::WidgetType::Component, is_top_level } {
diff --git a/src/game/simulated_tetrion.cpp b/src/game/simulated_tetrion.cpp
@@ -8,8 +8,8 @@
 #include "manager/music_manager.hpp"
 #include "simulated_tetrion.hpp"
 
+#include "helper/spdlog_wrapper.hpp"
 #include <cassert>
-#include <core/helper/spdlog_wrapper.hpp>
 
 
 SimulatedTetrion::SimulatedTetrion(
diff --git a/src/game/simulation.cpp b/src/game/simulation.cpp
@@ -6,7 +6,7 @@
 #include "input/replay_input.hpp"
 #include "simulation.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 
 Simulation::Simulation(
diff --git a/src/game/tetrion.cpp b/src/game/tetrion.cpp
@@ -8,7 +8,7 @@
 #include "tetrion.hpp"
 #include "ui/components/label.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <sstream>
 
 
diff --git a/src/graphics/texture.cpp b/src/graphics/texture.cpp
@@ -1,8 +1,8 @@
 #include <core/helper/point.hpp>
 
 #include "helper/graphic_utils.hpp"
+#include "helper/spdlog_wrapper.hpp"
 #include "texture.hpp"
-#include <core/helper/spdlog_wrapper.hpp>
 
 Texture::Texture(SDL_Texture* raw_texture) : m_raw_texture{ raw_texture } { }
 
diff --git a/src/helper/clock_source.cpp b/src/helper/clock_source.cpp
@@ -1,8 +1,8 @@
 #include "helper/clock_source.hpp"
 
+#include "helper/spdlog_wrapper.hpp"
 #include <SDL.h>
 #include <cassert>
-#include <core/helper/spdlog_wrapper.hpp>
 
 namespace {
     [[nodiscard]] double elapsed_time() {
diff --git a/src/helper/graphic_utils.cpp b/src/helper/graphic_utils.cpp
@@ -1,6 +1,6 @@
 
 #include "graphic_utils.hpp"
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <exception>
 
 #if defined(__EMSCRIPTEN__)
diff --git a/src/helper/meson.build b/src/helper/meson.build
@@ -13,6 +13,7 @@ graphics_src_files += files(
     'music_utils.hpp',
     'platform.cpp',
     'platform.hpp',
+    'spdlog_wrapper.hpp',
     'web_utils.cpp',
     'web_utils.hpp',
 )
diff --git a/src/helper/platform.cpp b/src/helper/platform.cpp
@@ -8,9 +8,9 @@
 #include "input/console_buttons.hpp"
 #endif
 
+#include "helper/spdlog_wrapper.hpp"
 #include <SDL.h>
 #include <cerrno>
-#include <core/helper/spdlog_wrapper.hpp>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/helper/spdlog_wrapper.hpp b/src/helper/spdlog_wrapper.hpp
@@ -7,7 +7,6 @@
 
 #include <spdlog/spdlog.h>
 
-
 #if defined(_MSC_VER)
 #pragma warning(default : 4275)
 #pragma warning(default : 4251)
diff --git a/src/helper/web_utils.hpp b/src/helper/web_utils.hpp
@@ -13,7 +13,7 @@
 
 #include "manager/service_provider.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <optional>
 #include <spdlog/sinks/callback_sink.h>
 #include <string>
diff --git a/src/input/controller_input.cpp b/src/input/controller_input.cpp
@@ -7,7 +7,7 @@
 #include "manager/sdl_controller_key.hpp"
 
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 input::ControllerInput::ControllerInput(
         SDL_GameController* controller,
diff --git a/src/input/game_input.cpp b/src/input/game_input.cpp
@@ -2,7 +2,7 @@
 #include "input.hpp"
 #include "manager/event_dispatcher.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 
 void input::GameInput::handle_event(const InputEvent event, const SimulationStep simulation_step_index) {
diff --git a/src/input/input.cpp b/src/input/input.cpp
@@ -9,8 +9,8 @@
 #include "mouse_input.hpp"
 #include "touch_input.hpp"
 
+#include "helper/spdlog_wrapper.hpp"
 #include <cassert>
-#include <core/helper/spdlog_wrapper.hpp>
 #include <limits>
 #include <memory>
 #include <stdexcept>
diff --git a/src/input/input_creator.cpp b/src/input/input_creator.cpp
@@ -12,7 +12,7 @@
 #include "input/replay_input.hpp"
 #include "input_creator.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <fmt/format.h>
 #include <stdexcept>
 
diff --git a/src/input/joystick_input.cpp b/src/input/joystick_input.cpp
@@ -9,8 +9,8 @@
 #include "input/input.hpp"
 #include "joystick_input.hpp"
 
+#include "helper/spdlog_wrapper.hpp"
 #include <algorithm>
-#include <core/helper/spdlog_wrapper.hpp>
 #include <exception>
 #include <filesystem>
 
diff --git a/src/input/replay_input.cpp b/src/input/replay_input.cpp
@@ -1,7 +1,7 @@
 #include "replay_input.hpp"
 #include "game/tetrion.hpp"
+#include "helper/spdlog_wrapper.hpp"
 #include <core/helper/magic_enum_wrapper.hpp>
-#include <core/helper/spdlog_wrapper.hpp>
 
 input::ReplayGameInput::ReplayGameInput(
         std::shared_ptr<recorder::RecordingReader> recording_reader,
diff --git a/src/input/touch_input.cpp b/src/input/touch_input.cpp
@@ -5,8 +5,8 @@
 #include "input/input.hpp"
 #include "touch_input.hpp"
 
+#include "helper/spdlog_wrapper.hpp"
 #include <cmath>
-#include <core/helper/spdlog_wrapper.hpp>
 #include <memory>
 #include <stdexcept>
 
diff --git a/src/libs/core/helper/meson.build b/src/libs/core/helper/meson.build
@@ -25,7 +25,6 @@ _header_files = files(
     'point.hpp',
     'random.hpp',
     'sleep.hpp',
-    'spdlog_wrapper.hpp',
     'static_string.hpp',
     'string_manipulation.hpp',
     'timer.hpp',
diff --git a/src/lobby/api.cpp b/src/lobby/api.cpp
@@ -2,7 +2,7 @@
 
 #include "api.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <future>
 
 #if !defined(_OOPETRIS_ONLINE_SYSTEM)
diff --git a/src/lobby/credentials/secret.cpp b/src/lobby/credentials/secret.cpp
@@ -150,7 +150,7 @@ secret::SecretStorage::store(const std::string& key, const Buffer& value, bool u
 
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <fmt/format.h>
 
 #ifndef NOMINMAX
diff --git a/src/manager/music_manager.cpp b/src/manager/music_manager.cpp
@@ -6,9 +6,9 @@
 #include "manager/music_manager.hpp"
 #include "manager/sdl_key.hpp"
 
+#include "helper/spdlog_wrapper.hpp"
 #include <SDL.h>
 #include <SDL_mixer.h>
-#include <core/helper/spdlog_wrapper.hpp>
 #include <filesystem>
 #include <fmt/format.h>
 #include <stdexcept>
diff --git a/src/manager/settings.cpp b/src/manager/settings.cpp
@@ -4,7 +4,7 @@
 #include "input/touch_input.hpp"
 
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 
 void settings::to_json(nlohmann::json& obj, const settings::Settings& settings) {
diff --git a/src/manager/settings_manager.cpp b/src/manager/settings_manager.cpp
@@ -1,8 +1,8 @@
 #include "settings_manager.hpp"
 #include "helper/graphic_utils.hpp"
+#include "helper/spdlog_wrapper.hpp"
 #include "input/keyboard_input.hpp"
 #include "input/touch_input.hpp"
-#include <core/helper/spdlog_wrapper.hpp>
 
 #if defined(__EMSCRIPTEN__)
 #include "helper/web_utils.hpp"
diff --git a/src/scenes/settings_menu/settings_menu.cpp b/src/scenes/settings_menu/settings_menu.cpp
@@ -13,7 +13,7 @@
 #include "ui/components/text_button.hpp"
 #include "ui/layouts/scroll_layout.hpp"
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 namespace scenes {
 
diff --git a/src/ui/components/button.hpp b/src/ui/components/button.hpp
@@ -2,7 +2,7 @@
 
 #include <core/helper/color_literals.hpp>
 
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 #include <functional>
 #include <utility>
 
diff --git a/src/ui/components/link_label.cpp b/src/ui/components/link_label.cpp
@@ -1,7 +1,7 @@
 
 #include "link_label.hpp"
 #include "helper/platform.hpp"
-#include <core/helper/spdlog_wrapper.hpp>
+#include "helper/spdlog_wrapper.hpp"
 
 ui::LinkLabel::LinkLabel(
         ServiceProvider* service_provider,
