fix sdl includes

KaleiAlma · Jan 24, 2025 · cc3724e · cc3724e
1 parent b3a1010
commit cc3724e
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 30 deletions.
diff --git a/LuaSTG/Core/Audio/Device_SDL.cpp b/LuaSTG/Core/Audio/Device_SDL.cpp
@@ -6,8 +6,7 @@
 #include <algorithm>
 #include <string>
 
-#include "SDL_audio.h"
-#include "SDL_error.h"
+#include "SDL.h"
 #include "spdlog/spdlog.h"
 
 // because windows headers get included in miniaudio implementation

diff --git a/LuaSTG/Core/Audio/Device_SDL.hpp b/LuaSTG/Core/Audio/Device_SDL.hpp
@@ -2,7 +2,7 @@
 #include "Core/Audio/Decoder.hpp"
 #include "Core/Object.hpp"
 #include "Core/Audio/Device.hpp"
-#include "SDL_audio.h"
+#include "SDL.h"
 #include "miniaudio.h"
 #include <cstdint>
 #include <vector>

diff --git a/LuaSTG/Core/Graphics/Device_OpenGL.hpp b/LuaSTG/Core/Graphics/Device_OpenGL.hpp
@@ -3,7 +3,7 @@
 #include "Core/Graphics/Device.hpp"
 #include "Core/Type.hpp"
 #include "glad/gl.h"
-#include <SDL_video.h>
+#include "SDL.h"
 #include <cstddef>
 #include <cstdint>
 #include <optional>

diff --git a/LuaSTG/Core/Graphics/SwapChain_OpenGL.cpp b/LuaSTG/Core/Graphics/SwapChain_OpenGL.cpp
@@ -5,7 +5,7 @@
 #include "Core/Type.hpp"
 #include "Core/i18n.hpp"
 #include "glad/gl.h"
-#include "SDL_video.h"
+#include "SDL.h"
 #include "spdlog/spdlog.h"
 #include "stb_image_write.h"
 

diff --git a/LuaSTG/Core/Graphics/Window_SDL.cpp b/LuaSTG/Core/Graphics/Window_SDL.cpp
@@ -3,14 +3,6 @@
 #include "Core/InitializeConfigure.hpp"
 #include "Core/Type.hpp"
 #include "Core/i18n.hpp"
-#include "SDL_clipboard.h"
-#include "SDL_events.h"
-#include "SDL_hints.h"
-#include "SDL_keyboard.h"
-#include "SDL_keycode.h"
-#include "SDL_rect.h"
-#include "SDL_stdinc.h"
-#include "SDL_video.h"
 #include "glad/gl.h"
 #include "uni_algo/ranges_grapheme.h"
 #include "uni_algo/ranges_word.h"

diff --git a/LuaSTG/Core/Graphics/Window_SDL.hpp b/LuaSTG/Core/Graphics/Window_SDL.hpp
@@ -3,13 +3,10 @@
 #include "Core/ApplicationModel.hpp"
 #include "Core/Graphics/Window.hpp"
 #include "Core/Type.hpp"
-#include "SDL_events.h"
+#include "SDL.h"
 // #include "Platform/Monitor.hpp"
 // #include "Platform/WindowSizeMoveController.hpp"
 // #include "Platform/RuntimeLoader/DesktopWindowManager.hpp"
-#include <SDL_rect.h>
-#include <SDL_surface.h>
-#include <SDL_video.h>
 #include <cstdint>
 #include <string>
 

diff --git a/LuaSTG/LuaSTG/AppFrameInput.cpp b/LuaSTG/LuaSTG/AppFrameInput.cpp
@@ -1,10 +1,6 @@
 #include "AppFrame.h"
 #include "Core/Type.hpp"
-#include "SDL_keyboard.h"
-#include "SDL_events.h"
-#include "SDL_keycode.h"
-#include "SDL_mouse.h"
-#include "SDL_video.h"
+#include "SDL.h"
 #include <cstddef>
 
 // #include "Platform/Keyboard.hpp"

diff --git a/LuaSTG/LuaSTG/Debugger/ImGuiExtension.cpp b/LuaSTG/LuaSTG/Debugger/ImGuiExtension.cpp
@@ -1,15 +1,13 @@
 #include "ImGuiExtension.h"
 #include "Core/Graphics/SwapChain_OpenGL.hpp"
 #include "Core/Type.hpp"
-#include "SDL_events.h"
+#include "SDL.h"
 // #include "backends/imgui_impl_sdl2.h"
 // #include "imgui_impl_opengl3_loader.h"
-#include <SDL_video.h>
 
 // #define WIN32_LEAN_AND_MEAN
 // #define NOMINMAX
 // #include <d3d11.h>
-#include "SDL_video.h"
 #include "glad/gl.h"
 // #include <Xinput.h>
 

diff --git a/LuaSTG/LuaSTG/GameObject/GameObjectPool.cpp b/LuaSTG/LuaSTG/GameObject/GameObjectPool.cpp
@@ -3,7 +3,7 @@
 #include "LuaBinding/lua_luastg_hash.hpp"
 #include "AppFrame.h"
 
-#include "SDL_keycode.h"
+#include "SDL.h"
 
 #define LOBJPOOL_SIZE_INTERNAL (LOBJPOOL_SIZE + 1)
 #define LOBJPOOL_METATABLE_IDX (LOBJPOOL_SIZE_INTERNAL)

diff --git a/LuaSTG/LuaSTG/LuaBinding/LW_Input.cpp b/LuaSTG/LuaSTG/LuaBinding/LW_Input.cpp
@@ -1,7 +1,6 @@
 #include "LuaBinding/LuaWrapper.hpp"
 #include "AppFrame.h"
-#include "SDL_keycode.h"
-#include "SDL_mouse.h"
+#include "SDL.h"
 // #include "Platform/Keyboard.hpp"
 // #include "Platform/Mouse.hpp"
 

diff --git a/LuaSTG/Platform/MessageBox.cpp b/LuaSTG/Platform/MessageBox.cpp
@@ -2,7 +2,7 @@
 #include <cstdint>
 #include <sys/types.h>
 #include "spdlog/spdlog.h"
-#include "SDL_messagebox.h"
+#include "SDL.h"
 
 namespace Platform
 {

diff --git a/LuaSTG/Platform/MessageBox.hpp b/LuaSTG/Platform/MessageBox.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <string_view>
-#include "SDL_video.h"
+#include "SDL.h"
 
 // FUCK MICROSOFT