OpenBrickProtocolFoundation · Totto16 · May 15, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
diff --git a/src/discord/core.cpp b/src/discord/core.cpp
@@ -1,11 +1,10 @@
 
+#include "helper/spdlog_wrapper.hpp"
 #include <core/helper/utils.hpp>
 
 #include "./core.hpp"
 
 #include <fmt/format.h>
-#include <spdlog/spdlog.h>
-
 
 [[nodiscard]] std::string constants::discord ::get_asset_key(constants::discord::ArtAsset asset) {
 

diff --git a/src/discord/core.hpp b/src/discord/core.hpp
@@ -5,7 +5,7 @@
 #include <core/helper/expected.hpp>
 #include <core/helper/types.hpp>
 
-#include "../helper/windows.hpp"
+#include "../helper/export_symbols.hpp"
 
 #include <chrono>
 #ifdef _WIN32
@@ -58,7 +58,7 @@ namespace constants::discord {
     // manually synchronized to https://discord.com/developers/applications/1220147916371394650/rich-presence/assets
     enum class ArtAsset : u8 { Logo };
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::string get_asset_key(ArtAsset asset);
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED std::string get_asset_key(ArtAsset asset);
 
 } // namespace constants::discord
 
@@ -116,7 +116,7 @@ struct DiscordActivityWrapper {
     }
 
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const discordpp::Activity& get_raw() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const discordpp::Activity& get_raw() const;
 };
 
 enum class DiscordStatus : u8 { Starting = 0, Ok, Error };
@@ -131,15 +131,15 @@ struct DiscordInstance {
 public:
     OOPETRIS_GRAPHICS_EXPORTED explicit DiscordInstance();
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] DiscordStatus get_status();
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED DiscordStatus get_status();
 
     OOPETRIS_GRAPHICS_EXPORTED DiscordInstance(DiscordInstance&& old) noexcept;
 
     OOPETRIS_GRAPHICS_EXPORTED DiscordInstance& operator=(DiscordInstance&& other) noexcept;
 
-    OOPETRIS_GRAPHICS_EXPORTED DiscordInstance(DiscordInstance& old) noexcept = delete;
+    DiscordInstance(DiscordInstance& old) noexcept = delete;
 
-    OOPETRIS_GRAPHICS_EXPORTED DiscordInstance& operator=(const DiscordInstance& other) noexcept = delete;
+    DiscordInstance& operator=(const DiscordInstance& other) noexcept = delete;
 
     OOPETRIS_GRAPHICS_EXPORTED ~DiscordInstance();
 

diff --git a/src/executables/game/application.cpp b/src/executables/game/application.cpp
@@ -11,6 +11,7 @@
 #include "ui/layout.hpp"
 
 
+#include "helper/spdlog_wrapper.hpp"
 #include <fmt/chrono.h>
 #include <memory>
 #include <ranges>

diff --git a/src/executables/game/main.cpp b/src/executables/game/main.cpp
@@ -28,10 +28,21 @@
 #include "helper/web_utils.hpp"
 #endif
 
+
+#if defined(_MSC_VER)
+#pragma warning(disable : 4275)
+#pragma warning(disable : 4251)
+#endif
+
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/sinks/stdout_sinks.h>
+#include <spdlog/spdlog.h>
 
+#if defined(_MSC_VER)
+#pragma warning(default : 4275)
+#pragma warning(default : 4251)
+#endif
 
 namespace {
     void initialize_spdlog() {

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 <spdlog/spdlog.h>
 
 
 helper::expected<CommandLineArguments, std::string> helper::parse_args(const std::vector<std::string>& arguments) {

diff --git a/src/game/bag.hpp b/src/game/bag.hpp
@@ -3,7 +3,7 @@
 #include <core/game/tetromino_type.hpp>
 #include <core/helper/random.hpp>
 
-#include "../helper/windows.hpp"
+#include "../helper/export_symbols.hpp"
 #include <array>
 
 struct Bag final {

diff --git a/src/game/command_line_arguments.hpp b/src/game/command_line_arguments.hpp
@@ -6,7 +6,7 @@
 #include <core/helper/types.hpp>
 #include <core/helper/utils.hpp>
 
-#include "../helper/windows.hpp"
+#include "../helper/export_symbols.hpp"
 
 #include <filesystem>
 #include <optional>

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -1,4 +1,5 @@
 
+#include "helper/spdlog_wrapper.hpp"
 #include <core/helper/magic_enum_wrapper.hpp>
 #include <core/helper/utils.hpp>
 

diff --git a/src/game/game.hpp b/src/game/game.hpp
@@ -3,7 +3,7 @@
 #include <recordings/utility/recording.hpp>
 
 #include "helper/clock_source.hpp"
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "input/input_creator.hpp"
 #include "tetrion.hpp"
 #include "ui/widget.hpp"
@@ -32,14 +32,14 @@ struct Game : public ui::Widget {
 
     OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Widget::EventHandleResult
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Widget::EventHandleResult
     handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
 
     OOPETRIS_GRAPHICS_EXPORTED void set_paused(bool paused);
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_paused() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED bool is_paused() const;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_game_finished() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED bool is_game_finished() const;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const std::shared_ptr<input::GameInput>& game_input() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const std::shared_ptr<input::GameInput>& game_input() const;
 };
diff --git a/src/game/graphic_helpers.hpp b/src/game/graphic_helpers.hpp
@@ -2,7 +2,7 @@
 
 #include <core/core.hpp>
 
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "manager/service_provider.hpp"
 
 enum class MinoTransparency : u8 {

diff --git a/src/game/grid.cpp b/src/game/grid.cpp
@@ -1,7 +1,7 @@
 #include "grid.hpp"
 #include "graphics/renderer.hpp"
 
-#include <spdlog/spdlog.h>
+#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/grid.hpp b/src/game/grid.hpp
@@ -4,7 +4,7 @@
 #include <core/helper/color.hpp>
 
 #include "graphics/rect.hpp"
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "manager/service_provider.hpp"
 #include "ui/layout.hpp"
 #include "ui/widget.hpp"
@@ -26,13 +26,13 @@ struct Grid final : public ui::Widget {
 
     [[nodiscard]] shapes::UPoint tile_size() const;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] double scale_to_original() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED double scale_to_original() const;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] shapes::UPoint to_screen_coords(grid::GridPoint grid_coords) const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED shapes::UPoint to_screen_coords(grid::GridPoint grid_coords) const;
 
     OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] helper::BoolWrapper<std::pair<ui::EventHandleType, ui::Widget*>>
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED helper::BoolWrapper<std::pair<ui::EventHandleType, ui::Widget*>>
     handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
 
 private:

diff --git a/src/game/rotation.hpp b/src/game/rotation.hpp
@@ -2,7 +2,7 @@
 
 #include <core/helper/types.hpp>
 
-#include "../helper/windows.hpp"
+#include "../helper/export_symbols.hpp"
 
 enum class Rotation : u8 {
     North = 0,

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 <spdlog/spdlog.h>
 
 
 SimulatedTetrion::SimulatedTetrion(

diff --git a/src/game/simulated_tetrion.hpp b/src/game/simulated_tetrion.hpp
@@ -8,7 +8,7 @@
 
 #include "bag.hpp"
 #include "grid.hpp"
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "input/game_input.hpp"
 #include "manager/service_provider.hpp"
 #include "tetromino.hpp"
@@ -123,14 +123,14 @@ struct SimulatedTetrion {
     OOPETRIS_GRAPHICS_EXPORTED bool drop_tetromino(SimulationStep simulation_step_index);
     OOPETRIS_GRAPHICS_EXPORTED void hold_tetromino(SimulationStep simulation_step_index);
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u8 tetrion_index() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u32 level() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u64 score() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] u32 lines_cleared() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const MinoStack& mino_stack() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] std::unique_ptr<TetrionCoreInformation> core_information() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED u8 tetrion_index() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED u32 level() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED u64 score() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED u32 lines_cleared() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const MinoStack& mino_stack() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED std::unique_ptr<TetrionCoreInformation> core_information() const;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_game_over() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED bool is_game_over() const;
 
 private:
     template<typename Callable>

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 <spdlog/spdlog.h>
+#include "helper/spdlog_wrapper.hpp"
 
 
 Simulation::Simulation(

diff --git a/src/game/simulation.hpp b/src/game/simulation.hpp
@@ -3,7 +3,7 @@
 #include <core/helper/expected.hpp>
 #include <recordings/utility/recording.hpp>
 
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "input/input_creator.hpp"
 #include "input/replay_input.hpp"
 #include "simulated_tetrion.hpp"
@@ -28,5 +28,5 @@ struct Simulation {
 
     OOPETRIS_GRAPHICS_EXPORTED void update();
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] bool is_game_finished() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED bool is_game_finished() const;
 };
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 <spdlog/spdlog.h>
+#include "helper/spdlog_wrapper.hpp"
 #include <sstream>
 
 

diff --git a/src/game/tetrion.hpp b/src/game/tetrion.hpp
@@ -5,7 +5,7 @@
 #include <core/helper/types.hpp>
 #include <recordings/utility/tetrion_core_information.hpp>
 
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "input/game_input.hpp"
 #include "manager/service_provider.hpp"
 #include "simulated_tetrion.hpp"
@@ -44,13 +44,13 @@ struct Tetrion final : public ui::Widget, SimulatedTetrion {
     OOPETRIS_GRAPHICS_EXPORTED Tetrion& operator=(Tetrion&& other) noexcept = delete;
 
     OOPETRIS_GRAPHICS_EXPORTED void render(const ServiceProvider& service_provider) const override;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Widget::EventHandleResult
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Widget::EventHandleResult
     handle_event(const std::shared_ptr<input::InputManager>& input_manager, const SDL_Event& event) override;
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Grid* get_grid();
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const Grid* get_grid() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] ui::GridLayout* get_text_layout();
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const ui::GridLayout* get_text_layout() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Grid* get_grid();
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const Grid* get_grid() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED ui::GridLayout* get_text_layout();
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const ui::GridLayout* get_text_layout() const;
 
 private:
     void refresh_texts() override;

diff --git a/src/game/tetromino.hpp b/src/game/tetromino.hpp
@@ -3,7 +3,7 @@
 #include <core/core.hpp>
 
 #include "graphic_helpers.hpp"
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "rotation.hpp"
 
 #include <array>
@@ -27,8 +27,8 @@ struct Tetromino final {
           m_type{ type },
           m_minos{ create_minos(position, m_rotation, type) } { }
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] helper::TetrominoType type() const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Rotation rotation() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED helper::TetrominoType type() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Rotation rotation() const;
 
     OOPETRIS_GRAPHICS_EXPORTED void render(
             const ServiceProvider& service_provider,
@@ -47,7 +47,7 @@ struct Tetromino final {
     OOPETRIS_GRAPHICS_EXPORTED void move_right();
     OOPETRIS_GRAPHICS_EXPORTED void move(shapes::AbstractPoint<i8> offset);
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] const std::array<Mino, 4>& minos() const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED const std::array<Mino, 4>& minos() const;
 
 
 private:

diff --git a/src/graphics/renderer.hpp b/src/graphics/renderer.hpp
@@ -2,7 +2,7 @@
 
 #include <core/helper/color.hpp>
 
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 #include "manager/font.hpp"
 #include "rect.hpp"
 #include "texture.hpp"
@@ -24,8 +24,8 @@ struct Renderer final {
 
 public:
     OOPETRIS_GRAPHICS_EXPORTED explicit Renderer(const Window& window, VSync v_sync);
-    OOPETRIS_GRAPHICS_EXPORTED Renderer(const Renderer&) = delete;
-    OOPETRIS_GRAPHICS_EXPORTED Renderer& operator=(const Renderer&) = delete;
+    Renderer(const Renderer&) = delete;
+    Renderer& operator=(const Renderer&) = delete;
     OOPETRIS_GRAPHICS_EXPORTED ~Renderer();
 
     OOPETRIS_GRAPHICS_EXPORTED void set_draw_color(const Color& color) const;
@@ -78,15 +78,15 @@ struct Renderer final {
         texture.render(m_renderer, from, dest);
     }
 
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Texture load_image(const std::filesystem::path& image_path) const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Texture prerender_text(
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Texture load_image(const std::filesystem::path& image_path) const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Texture prerender_text(
             const std::string& text,
             const Font& font,
             const Color& color,
             RenderType render_type = RenderType::Blended,
             const Color& background_color = Color::black()
     ) const;
-    OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] Texture get_texture_for_render_target(const shapes::UPoint& size) const;
+    [[nodiscard]] OOPETRIS_GRAPHICS_EXPORTED Texture get_texture_for_render_target(const shapes::UPoint& size) const;
 
     OOPETRIS_GRAPHICS_EXPORTED void set_render_target(const Texture& texture) const;
     OOPETRIS_GRAPHICS_EXPORTED void reset_render_target() const;

diff --git a/src/graphics/sdl_context.hpp b/src/graphics/sdl_context.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "helper/windows.hpp"
+#include "helper/export_symbols.hpp"
 
 struct SdlContext final {
     OOPETRIS_GRAPHICS_EXPORTED SdlContext();
-    OOPETRIS_GRAPHICS_EXPORTED SdlContext(const SdlContext&) = delete;
-    OOPETRIS_GRAPHICS_EXPORTED SdlContext(SdlContext&&) = delete;
-    OOPETRIS_GRAPHICS_EXPORTED SdlContext& operator=(const SdlContext&) = delete;
-    OOPETRIS_GRAPHICS_EXPORTED SdlContext& operator=(SdlContext&&) = delete;
+    SdlContext(const SdlContext&) = delete;
+    SdlContext(SdlContext&&) = delete;
+    SdlContext& operator=(const SdlContext&) = delete;
+    SdlContext& operator=(SdlContext&&) = delete;
     OOPETRIS_GRAPHICS_EXPORTED ~SdlContext();
 };