From 32c8795ead02ad4b921f6596cf8f599fd6084fc3 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 1 Jul 2020 18:26:22 +0200 Subject: [PATCH 1/7] src: Cleaned up includes to only (and always) include what we use Signed-off-by: Gabriel Ravier --- src/Backends/Audio/SDL2.cpp | 4 +++- src/Backends/Audio/SoftwareMixer.cpp | 2 -- src/Backends/Audio/miniaudio.cpp | 1 + src/Backends/Controller/SDL2.cpp | 4 ++++ src/Backends/Platform/GLFW3.cpp | 1 - src/Backends/Platform/Null.cpp | 2 ++ src/Backends/Platform/SDL2.cpp | 16 +++++++++++++++- src/Backends/Rendering/OpenGL3.cpp | 3 --- src/Backends/Rendering/SDLSurface.cpp | 8 ++++++-- src/Backends/Rendering/SDLTexture.cpp | 15 +++++++++------ src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp | 6 +----- src/Backends/Rendering/Window/OpenGL3/SDL2.cpp | 8 +++----- src/Backends/Rendering/Window/Software/GLFW3.cpp | 1 - src/Backends/Rendering/Window/Software/SDL2.cpp | 7 ++++--- src/BossFrog.cpp | 2 ++ src/BossIronH.cpp | 2 ++ src/BossPress.cpp | 2 ++ src/BossTwinD.cpp | 2 ++ src/BulHit.cpp | 4 ++++ src/Draw.cpp | 1 - src/Font.cpp | 4 ---- src/Game.cpp | 2 -- src/GenericLoad.cpp | 2 -- src/Main.cpp | 5 ----- src/NpcAct240.cpp | 2 ++ src/PixTone.cpp | 1 - src/Sound.cpp | 1 - src/Stage.cpp | 2 -- 28 files changed, 62 insertions(+), 48 deletions(-) diff --git a/src/Backends/Audio/SDL2.cpp b/src/Backends/Audio/SDL2.cpp index 724958f4..e8260dd8 100644 --- a/src/Backends/Audio/SDL2.cpp +++ b/src/Backends/Audio/SDL2.cpp @@ -1,11 +1,13 @@ #include "../Audio.h" #include -#include #include #include #include "SDL.h" +#include "SDL_audio.h" +#include "SDL_error.h" +#include "SDL_stdinc.h" #include "../Misc.h" diff --git a/src/Backends/Audio/SoftwareMixer.cpp b/src/Backends/Audio/SoftwareMixer.cpp index 0c19e46e..7a993eb8 100644 --- a/src/Backends/Audio/SoftwareMixer.cpp +++ b/src/Backends/Audio/SoftwareMixer.cpp @@ -2,9 +2,7 @@ #include #include -#include #include -#include #include "../../Attributes.h" diff --git a/src/Backends/Audio/miniaudio.cpp b/src/Backends/Audio/miniaudio.cpp index b06b34aa..ced9e055 100644 --- a/src/Backends/Audio/miniaudio.cpp +++ b/src/Backends/Audio/miniaudio.cpp @@ -1,6 +1,7 @@ #include "../Audio.h" #include +#include #define MINIAUDIO_IMPLEMENTATION #define MA_NO_DECODING diff --git a/src/Backends/Controller/SDL2.cpp b/src/Backends/Controller/SDL2.cpp index 9e8ced2b..c127893d 100644 --- a/src/Backends/Controller/SDL2.cpp +++ b/src/Backends/Controller/SDL2.cpp @@ -1,8 +1,12 @@ #include "../Controller.h" #include +#include #include "SDL.h" +#include "SDL_error.h" +#include "SDL_joystick.h" +#include "SDL_stdinc.h" #include "../Misc.h" #include "../Shared/SDL2.h" diff --git a/src/Backends/Platform/GLFW3.cpp b/src/Backends/Platform/GLFW3.cpp index 9c84e8e0..af0406dd 100644 --- a/src/Backends/Platform/GLFW3.cpp +++ b/src/Backends/Platform/GLFW3.cpp @@ -17,7 +17,6 @@ #include "../../Main.h" #include "../../Organya.h" #include "../../Profile.h" -#include "../../Resource.h" #define DO_KEY(GLFW_KEY, BACKEND_KEY) \ case GLFW_KEY: \ diff --git a/src/Backends/Platform/Null.cpp b/src/Backends/Platform/Null.cpp index 19f3f2a2..b64360f8 100644 --- a/src/Backends/Platform/Null.cpp +++ b/src/Backends/Platform/Null.cpp @@ -2,6 +2,8 @@ #include +#include "../../Attributes.h" + bool Backend_Init(void) { return true; diff --git a/src/Backends/Platform/SDL2.cpp b/src/Backends/Platform/SDL2.cpp index 1d9e2484..7aa2ae0f 100644 --- a/src/Backends/Platform/SDL2.cpp +++ b/src/Backends/Platform/SDL2.cpp @@ -1,18 +1,32 @@ #include "../Misc.h" +#include #include +#include #include #include #include #include "SDL.h" +#include "SDL_error.h" +#include "SDL_events.h" +#include "SDL_filesystem.h" +#include "SDL_keyboard.h" +#include "SDL_keycode.h" +#include "SDL_messagebox.h" +#include "SDL_mouse.h" +#include "SDL_pixels.h" +#include "SDL_stdinc.h" +#include "SDL_surface.h" +#include "SDL_timer.h" +#include "SDL_video.h" #include "../Rendering.h" #include "../Shared/SDL2.h" +#include "../../Attributes.h" #include "../../Main.h" #include "../../Organya.h" #include "../../Profile.h" -#include "../../Resource.h" #define DO_KEY(SDL_KEY, BACKEND_KEY) \ case SDL_KEY: \ diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp index 105221ab..c0af2db3 100644 --- a/src/Backends/Rendering/OpenGL3.cpp +++ b/src/Backends/Rendering/OpenGL3.cpp @@ -15,11 +15,8 @@ #define SPRITEBATCH_IMPLEMENTATION #include "../../../external/cute_spritebatch.h" -#include "../../WindowsWrapper.h" - #include "../Misc.h" #include "Window/OpenGL.h" -#include "../../Resource.h" #define TOTAL_VBOS 8 diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index 21d46091..3b9c44dd 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -5,10 +5,14 @@ #include #include -#include "SDL.h" +#include "SDL_error.h" +#include "SDL_pixels.h" +#include "SDL_rect.h" +#include "SDL_stdinc.h" +#include "SDL_surface.h" +#include "SDL_video.h" #include "../Misc.h" -#include "../Shared/SDL2.h" typedef struct RenderBackend_Surface { diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index df78130f..20eabc70 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -5,7 +5,15 @@ #include #include -#include "SDL.h" +#include "SDL_blendmode.h" +#include "SDL_error.h" +#include "SDL_hints.h" +#include "SDL_pixels.h" +#include "SDL_rect.h" +#include "SDL_render.h" +#include "SDL_stdinc.h" +#include "SDL_version.h" +#include "SDL_video.h" #define SPRITEBATCH_IMPLEMENTATION #include "../../../external/cute_spritebatch.h" @@ -13,11 +21,6 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" -#include "../Shared/SDL2.h" -#include "../../Draw.h" -#include "../../Ending.h" -#include "../../MapName.h" -#include "../../TextScr.h" typedef struct RenderBackend_Surface { diff --git a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp index 1fab4793..cd5e0ca9 100644 --- a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp +++ b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp @@ -1,17 +1,13 @@ #include "../OpenGL.h" #include -#include -#ifdef USE_OPENGLES2 -#include -#else +#ifndef USE_OPENGLES2 #include #endif #include #include "../../../Misc.h" -#include "../../../Shared/GLFW3.h" GLFWwindow *window; diff --git a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp index 64c5dc77..547b69d3 100644 --- a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp +++ b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp @@ -3,15 +3,13 @@ #include #include -#ifdef USE_OPENGLES2 -#include -#else +#ifndef USE_OPENGLES2 #include #endif -#include "SDL.h" +#include "SDL_error.h" +#include "SDL_video.h" #include "../../../Misc.h" -#include "../../../Shared/SDL2.h" SDL_Window *window; diff --git a/src/Backends/Rendering/Window/Software/GLFW3.cpp b/src/Backends/Rendering/Window/Software/GLFW3.cpp index 1b13c1da..6f28448b 100644 --- a/src/Backends/Rendering/Window/Software/GLFW3.cpp +++ b/src/Backends/Rendering/Window/Software/GLFW3.cpp @@ -11,7 +11,6 @@ #include #include "../../../Misc.h" -#include "../../../Shared/GLFW3.h" GLFWwindow *window; diff --git a/src/Backends/Rendering/Window/Software/SDL2.cpp b/src/Backends/Rendering/Window/Software/SDL2.cpp index 27a02b1e..beb3c635 100644 --- a/src/Backends/Rendering/Window/Software/SDL2.cpp +++ b/src/Backends/Rendering/Window/Software/SDL2.cpp @@ -1,13 +1,14 @@ #include "../Software.h" #include -#include #include -#include "SDL.h" +#include "SDL_error.h" +#include "SDL_pixels.h" +#include "SDL_surface.h" +#include "SDL_video.h" #include "../../../Misc.h" -#include "../../../Shared/SDL2.h" SDL_Window *window; diff --git a/src/BossFrog.cpp b/src/BossFrog.cpp index 24f1f41e..2a8dc8e4 100644 --- a/src/BossFrog.cpp +++ b/src/BossFrog.cpp @@ -1,5 +1,7 @@ #include "BossFrog.h" +#include + #include "WindowsWrapper.h" #include "Boss.h" diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index e1cc4998..d845a9db 100644 --- a/src/BossIronH.cpp +++ b/src/BossIronH.cpp @@ -1,5 +1,7 @@ #include "BossIronH.h" +#include + #include "WindowsWrapper.h" #include "Boss.h" diff --git a/src/BossPress.cpp b/src/BossPress.cpp index 63edd596..1636d009 100644 --- a/src/BossPress.cpp +++ b/src/BossPress.cpp @@ -1,5 +1,7 @@ #include "BossPress.h" +#include + #include "WindowsWrapper.h" #include "Boss.h" diff --git a/src/BossTwinD.cpp b/src/BossTwinD.cpp index 5e9cac15..849093d0 100644 --- a/src/BossTwinD.cpp +++ b/src/BossTwinD.cpp @@ -1,5 +1,7 @@ #include "BossTwinD.h" +#include + #include "WindowsWrapper.h" #include "Boss.h" diff --git a/src/BulHit.cpp b/src/BulHit.cpp index 065d8659..50330203 100644 --- a/src/BulHit.cpp +++ b/src/BulHit.cpp @@ -1,5 +1,9 @@ #include "BulHit.h" +#include + +#include "WindowsWrapper.h" + #include "Bullet.h" #include "Caret.h" #include "Game.h" diff --git a/src/Draw.cpp b/src/Draw.cpp index c7e0d5d9..5b492b9d 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -1,7 +1,6 @@ #include "Draw.h" #include -#include #include #include diff --git a/src/Font.cpp b/src/Font.cpp index beb0c6a3..196ae0e7 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -1,6 +1,5 @@ #include "Font.h" -#include #include #include #include @@ -9,9 +8,6 @@ #include FT_FREETYPE_H #include FT_BITMAP_H -#include "WindowsWrapper.h" - -#include "Draw.h" #include "File.h" #include "Backends/Rendering.h" diff --git a/src/Game.cpp b/src/Game.cpp index 7dd2e57c..2f0c3fc4 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,8 +1,6 @@ #include "Game.h" #include -#include -#include #include #include "WindowsWrapper.h" diff --git a/src/GenericLoad.cpp b/src/GenericLoad.cpp index 850c799a..c34d6ecd 100644 --- a/src/GenericLoad.cpp +++ b/src/GenericLoad.cpp @@ -1,7 +1,5 @@ #include "GenericLoad.h" -#include - #include "WindowsWrapper.h" #include "CommonDefines.h" diff --git a/src/Main.cpp b/src/Main.cpp index e59db1f3..65947dff 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,7 +1,5 @@ #include "Main.h" -#include -#include #include #include #include @@ -9,19 +7,16 @@ #include "WindowsWrapper.h" #include "Backends/Misc.h" -#include "Backends/Rendering.h" #include "Bitmap.h" #include "CommonDefines.h" #include "Config.h" #include "Draw.h" -#include "File.h" #include "Game.h" #include "Generic.h" #include "Input.h" #include "KeyControl.h" #include "MyChar.h" #include "Organya.h" -#include "Profile.h" #include "Resource.h" #include "Sound.h" #include "Triangle.h" diff --git a/src/NpcAct240.cpp b/src/NpcAct240.cpp index 902f1d8d..3d3120f4 100644 --- a/src/NpcAct240.cpp +++ b/src/NpcAct240.cpp @@ -1,5 +1,7 @@ #include "NpcAct.h" +#include + #include "WindowsWrapper.h" #include "Caret.h" diff --git a/src/PixTone.cpp b/src/PixTone.cpp index fdaa6c1e..8be5ade4 100644 --- a/src/PixTone.cpp +++ b/src/PixTone.cpp @@ -1,7 +1,6 @@ #include "PixTone.h" #include -#include #include #include "WindowsWrapper.h" diff --git a/src/Sound.cpp b/src/Sound.cpp index cec619f1..e9641245 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -20,7 +20,6 @@ equivalents. #include "WindowsWrapper.h" #include "Backends/Audio.h" -#include "Main.h" #include "Organya.h" #include "PixTone.h" diff --git a/src/Stage.cpp b/src/Stage.cpp index b9370f3b..86604424 100644 --- a/src/Stage.cpp +++ b/src/Stage.cpp @@ -1,7 +1,5 @@ #include "Stage.h" -#include -#include #include #include "WindowsWrapper.h" From 3620e31bf83908c4ead54aa31853f13ae9322c39 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 1 Jul 2020 18:33:22 +0200 Subject: [PATCH 2/7] src/BackendS/Platform/WiiU.cpp: Add explicit include of `` for NULL Signed-off-by: Gabriel Ravier --- src/Backends/Platform/WiiU.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Backends/Platform/WiiU.cpp b/src/Backends/Platform/WiiU.cpp index f18be654..db2aeb0b 100644 --- a/src/Backends/Platform/WiiU.cpp +++ b/src/Backends/Platform/WiiU.cpp @@ -1,6 +1,7 @@ #include "../Misc.h" #include +#include #include #include #include From 187847fbcc663b96ee94ec400bd067d64e8b5433 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 Jul 2020 14:43:47 +0200 Subject: [PATCH 3/7] src: Fixed not including headers that are included for detection of conflicting definitions Signed-off-by: Gabriel Ravier --- src/Backends/Rendering/SDLSurface.cpp | 1 + src/Backends/Rendering/SDLTexture.cpp | 1 + src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp | 1 + src/Backends/Rendering/Window/OpenGL3/SDL2.cpp | 1 + src/Backends/Rendering/Window/Software/GLFW3.cpp | 1 + src/Backends/Rendering/Window/Software/SDL2.cpp | 1 + 6 files changed, 6 insertions(+) diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index 3b9c44dd..3c284e7b 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -13,6 +13,7 @@ #include "SDL_video.h" #include "../Misc.h" +#include "../Shared/SDL2.h" typedef struct RenderBackend_Surface { diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index 20eabc70..381f7559 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -21,6 +21,7 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" +#include "../Shared/SDL2.h" typedef struct RenderBackend_Surface { diff --git a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp index cd5e0ca9..86f1bc8c 100644 --- a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp +++ b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp @@ -8,6 +8,7 @@ #include #include "../../../Misc.h" +#include "../../../Shared/GLFW3.h" GLFWwindow *window; diff --git a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp index 547b69d3..71939c38 100644 --- a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp +++ b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp @@ -10,6 +10,7 @@ #include "SDL_video.h" #include "../../../Misc.h" +#include "../../../Shared/SDL2.h" SDL_Window *window; diff --git a/src/Backends/Rendering/Window/Software/GLFW3.cpp b/src/Backends/Rendering/Window/Software/GLFW3.cpp index 6f28448b..1b13c1da 100644 --- a/src/Backends/Rendering/Window/Software/GLFW3.cpp +++ b/src/Backends/Rendering/Window/Software/GLFW3.cpp @@ -11,6 +11,7 @@ #include #include "../../../Misc.h" +#include "../../../Shared/GLFW3.h" GLFWwindow *window; diff --git a/src/Backends/Rendering/Window/Software/SDL2.cpp b/src/Backends/Rendering/Window/Software/SDL2.cpp index beb3c635..0c008852 100644 --- a/src/Backends/Rendering/Window/Software/SDL2.cpp +++ b/src/Backends/Rendering/Window/Software/SDL2.cpp @@ -9,6 +9,7 @@ #include "SDL_video.h" #include "../../../Misc.h" +#include "../../../Shared/SDL2.h" SDL_Window *window; From 41c3afd927f72ef86d7eb81c0e4746b2b490c62b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 Jul 2020 14:54:29 +0200 Subject: [PATCH 4/7] src/Sound.cpp: Re-added Main.h include but commented it out with an explanation as to why Signed-off-by: Gabriel Ravier --- src/Sound.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Sound.cpp b/src/Sound.cpp index e9641245..b0af2c01 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -20,6 +20,7 @@ equivalents. #include "WindowsWrapper.h" #include "Backends/Audio.h" +//#include "Main.h" // Was for gModulePath, but this is unneeded in portable since LoadSoundObject is commented out in portable #include "Organya.h" #include "PixTone.h" From 81edd4db52645520c62790fc64262335ccef28a2 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 Jul 2020 14:59:55 +0200 Subject: [PATCH 5/7] src: Restored SDL.h includes to conform to project style of including SDL2 Signed-off-by: Gabriel Ravier --- src/Backends/Audio/SDL2.cpp | 3 --- src/Backends/Controller/SDL2.cpp | 3 --- src/Backends/Platform/SDL2.cpp | 12 ------------ src/Backends/Rendering/SDLSurface.cpp | 7 +------ src/Backends/Rendering/SDLTexture.cpp | 10 +--------- src/Backends/Rendering/Window/OpenGL3/SDL2.cpp | 3 +-- src/Backends/Rendering/Window/Software/SDL2.cpp | 5 +---- 7 files changed, 4 insertions(+), 39 deletions(-) diff --git a/src/Backends/Audio/SDL2.cpp b/src/Backends/Audio/SDL2.cpp index e8260dd8..c737a582 100644 --- a/src/Backends/Audio/SDL2.cpp +++ b/src/Backends/Audio/SDL2.cpp @@ -5,9 +5,6 @@ #include #include "SDL.h" -#include "SDL_audio.h" -#include "SDL_error.h" -#include "SDL_stdinc.h" #include "../Misc.h" diff --git a/src/Backends/Controller/SDL2.cpp b/src/Backends/Controller/SDL2.cpp index c127893d..12182e27 100644 --- a/src/Backends/Controller/SDL2.cpp +++ b/src/Backends/Controller/SDL2.cpp @@ -4,9 +4,6 @@ #include #include "SDL.h" -#include "SDL_error.h" -#include "SDL_joystick.h" -#include "SDL_stdinc.h" #include "../Misc.h" #include "../Shared/SDL2.h" diff --git a/src/Backends/Platform/SDL2.cpp b/src/Backends/Platform/SDL2.cpp index 7aa2ae0f..ccda4c6c 100644 --- a/src/Backends/Platform/SDL2.cpp +++ b/src/Backends/Platform/SDL2.cpp @@ -8,18 +8,6 @@ #include #include "SDL.h" -#include "SDL_error.h" -#include "SDL_events.h" -#include "SDL_filesystem.h" -#include "SDL_keyboard.h" -#include "SDL_keycode.h" -#include "SDL_messagebox.h" -#include "SDL_mouse.h" -#include "SDL_pixels.h" -#include "SDL_stdinc.h" -#include "SDL_surface.h" -#include "SDL_timer.h" -#include "SDL_video.h" #include "../Rendering.h" #include "../Shared/SDL2.h" diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index 3c284e7b..21d46091 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -5,12 +5,7 @@ #include #include -#include "SDL_error.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_stdinc.h" -#include "SDL_surface.h" -#include "SDL_video.h" +#include "SDL.h" #include "../Misc.h" #include "../Shared/SDL2.h" diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index 381f7559..4effac72 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -5,15 +5,7 @@ #include #include -#include "SDL_blendmode.h" -#include "SDL_error.h" -#include "SDL_hints.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_render.h" -#include "SDL_stdinc.h" -#include "SDL_version.h" -#include "SDL_video.h" +#include "SDL.h" #define SPRITEBATCH_IMPLEMENTATION #include "../../../external/cute_spritebatch.h" diff --git a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp index 71939c38..72eb2c47 100644 --- a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp +++ b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp @@ -6,8 +6,7 @@ #ifndef USE_OPENGLES2 #include #endif -#include "SDL_error.h" -#include "SDL_video.h" +#include "SDL.h" #include "../../../Misc.h" #include "../../../Shared/SDL2.h" diff --git a/src/Backends/Rendering/Window/Software/SDL2.cpp b/src/Backends/Rendering/Window/Software/SDL2.cpp index 0c008852..416a8d80 100644 --- a/src/Backends/Rendering/Window/Software/SDL2.cpp +++ b/src/Backends/Rendering/Window/Software/SDL2.cpp @@ -3,10 +3,7 @@ #include #include -#include "SDL_error.h" -#include "SDL_pixels.h" -#include "SDL_surface.h" -#include "SDL_video.h" +#include "SDL.h" #include "../../../Misc.h" #include "../../../Shared/SDL2.h" From 47ed4d7bfd002c3b71e66ce79a435b47e3a80f87 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 2 Jul 2020 14:54:15 +0100 Subject: [PATCH 6/7] Restore `stddef.h` in `Main.cpp` `NULL` is used in this file --- src/Main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Main.cpp b/src/Main.cpp index 65947dff..f5ee1c78 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,5 +1,6 @@ #include "Main.h" +#include #include #include #include From 720b1dfea7eeba14a77a493e714e1292f0399c60 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 2 Jul 2020 14:55:18 +0100 Subject: [PATCH 7/7] Reword a comment --- src/Sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sound.cpp b/src/Sound.cpp index b0af2c01..f2c57572 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -20,7 +20,7 @@ equivalents. #include "WindowsWrapper.h" #include "Backends/Audio.h" -//#include "Main.h" // Was for gModulePath, but this is unneeded in portable since LoadSoundObject is commented out in portable +//#include "Main.h" // Was for gModulePath, but this is unneeded in the portable branch since LoadSoundObject is commented-out #include "Organya.h" #include "PixTone.h"