Kill me x2

src/settingsmenu.h

@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include <map>
-#include <SDL_joystick.h>
+#include <SDL3/SDL_joystick.h>
 
 struct SettingsMenuPrivate;
 struct RGSSThreadData;

src/soundemitter.cpp

@@ -28,7 +28,7 @@
 #include "util.h"
 #include "debugwriter.h"
 
-#include <SDL_sound.h>
+#include <SDL3_sound/SDL_sound.h>
 
 #define SE_CACHE_MEM (10*1024*1024) // 10 MB
 
@@ -192,13 +192,13 @@ struct SoundOpenHandler : FileSystem::OpenHandler
 	    : buffer(0)
 	{}
 
-	bool tryRead(SDL_RWops &ops, const char *ext)
+	bool tryRead(SDL_IOStream &ops, const char *ext)
 	{
 		Sound_Sample *sample = Sound_NewSample(&ops, ext, 0, STREAM_BUF_SIZE);
 
 		if (!sample)
 		{
-			SDL_RWclose(&ops);
+			SDL_CloseIO(&ops);
 			return false;
 		}
 

src/sprite.cpp

@@ -38,7 +38,7 @@
 
 #include <math.h>
 
-#include <SDL_rect.h>
+#include <SDL3/SDL_rect.h>
 
 #include <sigc++/connection.h>
 
@@ -201,7 +201,7 @@ struct SpritePrivate
 		self.w = bitmap->width();
 		self.h = bitmap->height();
 
-		isVisible = SDL_HasIntersection(&self, &sceneRect);
+		isVisible = SDL_HasRectIntersection(&self, &sceneRect);
 	}
 
 	void emitWaveChunk(SVertex *&vert, float phase, int width,

src/steam.cpp

@@ -2,7 +2,7 @@
 #include "debugwriter.h"
 
 #include <map>
-#include <SDL2/SDL.h>
+#include <SDL3/SDL.h>
 #include "steamshim/steamshim_child.h"
 
 /* Achievements */

src/tilemap.cpp

@@ -46,7 +46,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <SDL_surface.h>
+#include <SDL3/SDL_surface.h>
 
 extern const StaticRect autotileRects[];
 

src/viewport.cpp

@@ -28,7 +28,7 @@
 #include "glstate.h"
 #include "graphics.h"
 
-#include <SDL_rect.h>
+#include <SDL3/SDL_rect.h>
 
 #include <sigc++/connection.h>
 
@@ -87,7 +87,7 @@ struct ViewportPrivate
 		                rect->width, rect->height };
 
 		SDL_Rect result;
-		isOnScreen = SDL_IntersectRect(&r1, &r2, &result);
+		isOnScreen = SDL_GetRectIntersection(&r1, &r2, &result);
 	}
 
 	bool needsEffectRender(bool flashing)