Remove dependency on SDL headers in libretro builds

I'd already removed the SDL static libraries from libretro builds for
portability, but kept the headers to make it easier to port the codebase
to libretro. Eventually it was time to stop using the SDL headers as a
crutch.

Author: white-axe

meson.build

@@ -112,7 +112,6 @@ if is_libretro
     libretro_defines = [
         '-DMKXPZ_VERSION="@0@"'.format(meson.project_version()),
         '-DMKXPZ_RETRO',
-        '-DSHARED_FLUID',
         '-D_FILE_OFFSET_BITS=64',
         '-DMPG123_NO_LARGENAME',
         '-DGL_GLES_PROTOTYPES=0',
@@ -499,7 +498,6 @@ if is_libretro
 
     libretro_deps = [
         subproject('libretro-common').get_variable('libretro_common'),
-        subproject('sdl2-headers').get_variable('sdl2_headers'),
         cmake.subproject('boost_asio', options: boost_options).dependency('boost_asio'),
         cmake.subproject('boost_mp11', options: boost_options).dependency('boost_mp11'),
         cmake.subproject('boost_describe', options: boost_options).dependency('boost_describe'),

src/audio/fluid-fun.cpp

@@ -1,8 +1,10 @@
 #include "fluid-fun.h"
 
 #include <string.h>
-#include <SDL_loadso.h>
-#include <SDL_platform.h>
+#ifndef MKXPZ_RETRO
+#  include <SDL_loadso.h>
+#  include <SDL_platform.h>
+#endif // MKXPZ_RETRO
 
 #include "debugwriter.h"
 
@@ -14,18 +16,18 @@
 #  define FLUID_LIB "libfluidsynth.3.dylib"
 #elif defined(__WIN32__)
 #  define FLUID_LIB "fluidsynth.dll"
-#elif !defined(SHARED_FLUID)
+#elif !defined(MKXPZ_RETRO) && !defined(SHARED_FLUID)
 #  error "platform not recognized"
 #endif
 
 struct FluidFunctions fluid;
-#ifndef SHARED_FLUID
+#if !defined(MKXPZ_RETRO) && !defined(SHARED_FLUID)
 static void *so;
 #endif
 
 void initFluidFunctions()
 {
-#ifdef SHARED_FLUID
+#if defined(MKXPZ_RETRO) || defined(SHARED_FLUID)
 
 #define FLUID_FUN(name, type) \
 	fluid.name = fluid_##name;
@@ -55,7 +57,7 @@ FLUID_FUNCS2
 
 	return;
 
-#ifndef SHARED_FLUID
+#if !defined(MKXPZ_RETRO) && !defined(SHARED_FLUID)
 fail:
 	Debug() << "Failed to load " FLUID_LIB ". Midi playback is disabled.";
 

src/audio/fluid-fun.h

@@ -1,12 +1,10 @@
 #ifndef FLUIDFUN_H
 #define FLUIDFUN_H
 
-#ifdef SHARED_FLUID
-#  ifdef MKXPZ_RETRO
-#    include <fluidlite.h>
-#  else
-#    include <fluidsynth.h>
-#  endif // MKXPZ_RETRO
+#ifdef MKXPZ_RETRO
+#  include <fluidlite.h>
+#elif defined(SHARED_FLUID)
+#  include <fluidsynth.h>
 #else
 #  define FLUIDSYNTH_VERSION_MAJOR 3
 #endif
@@ -31,7 +29,7 @@ typedef fluid_settings_t* (*NEWFLUIDSETTINGSPROC)(void);
 typedef fluid_synth_t* (*NEWFLUIDSYNTHPROC)(fluid_settings_t* settings);
 typedef void (*DELETEFLUIDSETTINGSPROC)(fluid_settings_t* settings);
 
-#if (defined(SHARED_FLUID) && defined(MKXPZ_RETRO)) || FLUIDSYNTH_VERSION_MAJOR == 1
+#if defined(MKXPZ_RETRO) || FLUIDSYNTH_VERSION_MAJOR == 1
 typedef int (*DELETEFLUIDSYNTHPROC)(fluid_synth_t* synth);
 #else
 typedef void (*DELETEFLUIDSYNTHPROC)(fluid_synth_t* synth);

src/display/bitmap.cpp

@@ -1455,8 +1455,10 @@ void Bitmap::stretchBlt(IntRect destRect,
         }
     }
 
+#ifndef MKXPZ_RETRO // TODO
     if (blitTemp)
         SDL_FreeSurface(blitTemp);
+#endif // MKXPZ_RETRO
 
     p->addTaintedArea(destRect);
     p->onModified();
@@ -1764,13 +1766,15 @@ void Bitmap::clear()
     p->onModified();
 }
 
+#ifndef MKXPZ_RETRO
 static uint32_t &getPixelAt(SDL_Surface *surf, SDL_PixelFormat *form, int x, int y)
 {
     size_t offset = x*form->BytesPerPixel + y*surf->pitch;
     uint8_t *bytes = (uint8_t*) surf->pixels + offset;
 
     return *((uint32_t*) bytes);
 }
+#endif // MKXPZ_RETRO
 
 Color Bitmap::getPixel(int x, int y) const
 {
@@ -2077,6 +2081,7 @@ static std::string fixupString(const char *str)
     return s;
 }
 
+#ifndef MKXPZ_RETRO
 static void applyShadow(SDL_Surface *&in, const SDL_PixelFormat &fm, const SDL_Color &c)
 {
     SDL_Surface *out = SDL_CreateRGBSurface
@@ -2163,6 +2168,7 @@ static void applyShadow(SDL_Surface *&in, const SDL_PixelFormat &fm, const SDL_C
     SDL_FreeSurface(in);
     in = out;
 }
+#endif // MKXPZ_RETRO
 
 #ifdef MKXPZ_RETRO
 IntRect Bitmap::textRect(const char *str)

src/display/gl/gl-meta.h

@@ -26,7 +26,16 @@
 #include "gl-util.h"
 #include "vertex.h"
 
-#include <SDL_surface.h>
+#ifdef MKXPZ_RETRO
+struct SDL_Surface
+{
+	int w;
+	int h;
+	void *pixels;
+};
+#else
+#  include <SDL_surface.h>
+#endif // MKXPZ_RETRO
 
 namespace GLMeta
 {

src/display/gl/glstate.cpp

@@ -27,8 +27,6 @@
 #include "shader.h"
 #include "sharedstate.h"
 
-#include <SDL_rect.h>
-
 static void applyBool(GLenum state, bool mode) {
   mode ? gl.Enable(state) : gl.Disable(state);
 }

src/display/sprite.cpp

@@ -41,8 +41,6 @@
 # define M_PI 3.14159265358979323846
 #endif
 
-#include <SDL_rect.h>
-
 #include "sigslot/signal.hpp"
 
 struct SpritePrivate

src/display/tilemap.cpp

@@ -47,8 +47,6 @@
 #include <algorithm>
 #include <vector>
 
-#include <SDL_surface.h>
-
 extern const StaticRect autotileRects[];
 
 typedef std::vector<SVertex> SVVector;

src/etc/etc-internal.h

@@ -24,7 +24,17 @@
 
 #include "util.h"
 
-#include <SDL_rect.h>
+#ifdef MKXPZ_RETRO
+struct SDL_Rect
+{
+	int x;
+	int y;
+	int w;
+	int h;
+};
+#else
+#  include <SDL_rect.h>
+#endif // MKXPZ_RETRO
 
 struct Vec2
 {

src/etc/etc.h

@@ -27,7 +27,17 @@
 #include "serializable.h"
 #include "etc-internal.h"
 
+#ifdef MKXPZ_RETRO
+struct SDL_Color
+{
+	uint8_t r;
+	uint8_t g;
+	uint8_t b;
+	uint8_t a;
+};
+#else
 struct SDL_Color;
+#endif // MKXPZ_RETRO
 
 enum BlendType
 {