Fixed compilation with MSVC.

This commit is contained in:
Patrick 2024-09-12 15:06:03 +02:00
parent 2f77ed5ef5
commit 7b19170112
5 changed files with 21 additions and 4 deletions

16
.idea/editor.xml generated Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BackendCodeEditorSettings">
<option name="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue" value="true" type="bool" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Astring_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Futil_003Fstring_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Astream_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Fio_003Fstream_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Aassert_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Fdebug_003Fassert_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Awinundef_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Futil_003Fwinundef_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Asocket_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Fnet_003Fsocket_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWinSock2_002Eh_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_0020_0028x86_0029_003FWindows_0020Kits_003F10_003Finclude_003F10_002E0_002E22621_002E0_003Fum_003FWinSock2_002Eh/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Aws2tcpip_002Eh_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_0020_0028x86_0029_003FWindows_0020Kits_003F10_003Finclude_003F10_002E0_002E22621_002E0_003Fum_003Fws2tcpip_002Eh/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Aip_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Fnet_003Fip_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=8BC9CEB8_002D8B4A_002D11D0_002D8D11_002D00A0C91BC942_002Ff_003Aip_002Ecpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Fnet_003Fip_002Ecpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
<option name="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003Anet_005Fcommon_002Ehpp_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FLocal_003Fspp_005Fcache_003Fcloned_003Fgit_003Fmijin_003F4249f9388d95_003Fsource_003Fmijin_003Fnet_003Fdetail_003Fnet_005Fcommon_002Ehpp/@EntryIndexedValue" value="ExplicitlyExcluded" type="string" />
</component>
</project>

View File

@ -2,7 +2,7 @@
#include <mijin/util/scope_guard.hpp> #include <mijin/util/scope_guard.hpp>
#include <mijin/util/variant.hpp> #include <mijin/util/variant.hpp>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <SDL3/SDL.h> #include <mijin/util/winundef.hpp>
#include "./sdlpp/event.hpp" #include "./sdlpp/event.hpp"
#include "./sdlpp/gpu.hpp" #include "./sdlpp/gpu.hpp"

View File

@ -11,6 +11,7 @@
#include <mijin/debug/assert.hpp> #include <mijin/debug/assert.hpp>
#include <mijin/util/bitflags.hpp> #include <mijin/util/bitflags.hpp>
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#include <mijin/util/winundef.hpp>
namespace sdlpp namespace sdlpp
{ {
@ -45,7 +46,7 @@ public:
operator THandle*() const noexcept { return mHandle; } operator THandle*() const noexcept { return mHandle; }
}; };
class SDLError : std::runtime_error class SDLError : public std::runtime_error
{ {
public: public:
SDLError() : std::runtime_error(SDL_GetError()) {} SDLError() : std::runtime_error(SDL_GetError()) {}

View File

@ -7,6 +7,8 @@
#include <optional> #include <optional>
#include <variant> #include <variant>
#include "./common.hpp"
namespace sdlpp namespace sdlpp
{ {
struct Event struct Event

View File

@ -4,8 +4,6 @@
#if !defined(SDL_GPU_TEST_PRIVATE_SDL_GPU_TEST_SDLPP_GPU_HPP_INCLUDED) #if !defined(SDL_GPU_TEST_PRIVATE_SDL_GPU_TEST_SDLPP_GPU_HPP_INCLUDED)
#define SDL_GPU_TEST_PRIVATE_SDL_GPU_TEST_SDLPP_GPU_HPP_INCLUDED 1 #define SDL_GPU_TEST_PRIVATE_SDL_GPU_TEST_SDLPP_GPU_HPP_INCLUDED 1
#include <SDL3/SDL_gpu.h>
#include "./common.hpp" #include "./common.hpp"
namespace sdlpp namespace sdlpp