Merge pull request #223 from OpenBrickProtocolFoundation/update_wraps

Update wraps

Author: Totto16

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) {
 

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();
 

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>

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() {

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) {

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 {

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>

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>
 

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;
 };

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 {