RIP sdlinc.h

src/osd/modules/input/input_common.cpp

@@ -33,7 +33,7 @@
 #define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, ascii)     { ITEM_ID_##mame, KEY_ ## disc, virtual, ascii, "ITEM_ID_"#mame, (char*) #mame }
 #elif defined(OSD_SDL)
 // SDL include
-#include <sdlinc.h>
+#include <SDL2/SDL.h>
 #define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, ascii, UI) { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, SDLK_ ## sdlkey, ascii, "ITEM_ID_"#mame, (char *) UI }
 #define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, ascii)     { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, SDLK_ ## sdlkey, ascii, "ITEM_ID_"#mame, (char*) #mame }
 #else

src/osd/modules/input/input_sdl.cpp

@@ -17,7 +17,7 @@
 #if defined(SDLMAME_SDL2)
 
 // standard sdl header
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 #include <ctype.h>
 #include <stddef.h>
 #include <mutex>

src/osd/modules/input/input_sdlcommon.cpp

@@ -14,7 +14,7 @@
 #if defined(OSD_SDL)
 
 // standard sdl header
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 #include <ctype.h>
 #include <stddef.h>
 #include <mutex>

src/osd/modules/lib/osdlib_unix.cpp

@@ -18,7 +18,7 @@
 #include "osdcore.h"
 #include "osdlib.h"
 
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 //============================================================
 //  osd_getenv
 //============================================================

src/osd/modules/render/draw13.h

@@ -23,7 +23,7 @@ typedef UINT64 HashT;
 #endif
 
 // standard SDL headers
-#include "sdl/sdlinc.h"
+#include <SDL2/SDL.h>
 
 struct quad_setup_data
 {

src/osd/modules/render/drawbgfx.cpp

@@ -13,7 +13,7 @@
 #include <SDL2/SDL_syswm.h>
 #endif
 #else
-#include "sdlinc.h"
+#include <SDL2/SDL_syswm.h>
 #endif
 
 // MAMEOS headers

src/osd/modules/render/drawogl.cpp

@@ -24,7 +24,7 @@
 #ifndef OSD_WINDOWS
 // standard SDL headers
 #define TOBEMIGRATED 1
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 #endif
 
 #include "modules/lib/osdlib.h"

src/osd/modules/render/drawsdl.cpp

@@ -20,7 +20,7 @@
 #include "rendersw.hxx"
 
 // standard SDL headers
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 
 // OSD headers
 #include "osdsdl.h"

src/osd/modules/render/drawsdl.h

@@ -15,6 +15,8 @@
 #ifndef __DRAWSDL1__
 #define __DRAWSDL1__
 
+#include <SDL2/SDL.h>
+
 /* renderer_sdl2 is the information about SDL for the current screen */
 class renderer_sdl1 : public osd_renderer
 {

src/osd/modules/render/sdlglcontext.h

@@ -13,7 +13,7 @@
 #ifndef __SDL_GL_CONTEXT__
 #define __SDL_GL_CONTEXT__
 
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 #include "modules/opengl/osd_opengl.h"
 
 class sdl_gl_context : public osd_gl_context

src/osd/modules/sound/sdl_sound.cpp

@@ -14,7 +14,7 @@
 #if (defined(OSD_SDL) || defined(USE_SDL_SOUND))
 
 // standard sdl header
-#include "../../sdl/sdlinc.h"
+#include <SDL2/SDL.h>
 
 // MAME headers
 #include "emu.h"

src/osd/sdl/sdlinc.h

@@ -1,10 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Olivier Galibert, R. Belmont
-#ifndef _sdlinc_h_
-#define _sdlinc_h_
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_version.h>
-#include <SDL2/SDL_syswm.h>
-
-#endif

src/osd/sdl/sdlmain.cpp

@@ -31,7 +31,7 @@
 #include <windows.h>
 #endif
 
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 
 // MAME headers
 #include "osdepend.h"

src/osd/sdl/video.cpp

@@ -7,7 +7,7 @@
 //  SDLMAME by Olivier Galibert and R. Belmont
 //
 //============================================================
-#include "sdlinc.h"
+#include <SDL2/SDL.h>
 
 // MAME headers
 #include "emu.h"

src/osd/sdl/window.cpp

@@ -14,9 +14,7 @@
 #endif
 
 // standard SDL headers
-#include "sdlinc.h"
-
-#include <SDL2/SDL_thread.h>
+#include <SDL2/SDL.h>
 
 // standard C headers
 #include <math.h>