From 6cb4c9c051874096c78ef0868a276c06380da648 Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 6 May 2016 02:41:23 +0200 Subject: [PATCH] RIP sdlinc.h --- src/osd/modules/input/input_common.cpp | 2 +- src/osd/modules/input/input_sdl.cpp | 2 +- src/osd/modules/input/input_sdlcommon.cpp | 2 +- src/osd/modules/lib/osdlib_unix.cpp | 2 +- src/osd/modules/render/draw13.h | 2 +- src/osd/modules/render/drawbgfx.cpp | 2 +- src/osd/modules/render/drawogl.cpp | 2 +- src/osd/modules/render/drawsdl.cpp | 2 +- src/osd/modules/render/drawsdl.h | 2 ++ src/osd/modules/render/sdlglcontext.h | 2 +- src/osd/modules/sound/sdl_sound.cpp | 2 +- src/osd/sdl/sdlinc.h | 10 ---------- src/osd/sdl/sdlmain.cpp | 2 +- src/osd/sdl/video.cpp | 2 +- src/osd/sdl/window.cpp | 4 +--- 15 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 src/osd/sdl/sdlinc.h diff --git a/src/osd/modules/input/input_common.cpp b/src/osd/modules/input/input_common.cpp index d9f20e299d6..05c7511cdd7 100644 --- a/src/osd/modules/input/input_common.cpp +++ b/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 +#include #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 diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index 50ddf09cf33..2101623fe6c 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -17,7 +17,7 @@ #if defined(SDLMAME_SDL2) // standard sdl header -#include "sdlinc.h" +#include #include #include #include diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp index 82c470534b2..3071959a463 100644 --- a/src/osd/modules/input/input_sdlcommon.cpp +++ b/src/osd/modules/input/input_sdlcommon.cpp @@ -14,7 +14,7 @@ #if defined(OSD_SDL) // standard sdl header -#include "sdlinc.h" +#include #include #include #include diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp index ea7dd60c203..52999835a1c 100644 --- a/src/osd/modules/lib/osdlib_unix.cpp +++ b/src/osd/modules/lib/osdlib_unix.cpp @@ -18,7 +18,7 @@ #include "osdcore.h" #include "osdlib.h" -#include "sdlinc.h" +#include //============================================================ // osd_getenv //============================================================ diff --git a/src/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h index e242749ba10..03320f7327b 100644 --- a/src/osd/modules/render/draw13.h +++ b/src/osd/modules/render/draw13.h @@ -23,7 +23,7 @@ typedef UINT64 HashT; #endif // standard SDL headers -#include "sdl/sdlinc.h" +#include struct quad_setup_data { diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index 7b43ac48331..ca6de0ea608 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -13,7 +13,7 @@ #include #endif #else -#include "sdlinc.h" +#include #endif // MAMEOS headers diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index cf8dff7bd2d..907b2dd6978 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -24,7 +24,7 @@ #ifndef OSD_WINDOWS // standard SDL headers #define TOBEMIGRATED 1 -#include "sdlinc.h" +#include #endif #include "modules/lib/osdlib.h" diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp index 5cbf63ec056..4a0c3c0fea1 100644 --- a/src/osd/modules/render/drawsdl.cpp +++ b/src/osd/modules/render/drawsdl.cpp @@ -20,7 +20,7 @@ #include "rendersw.hxx" // standard SDL headers -#include "sdlinc.h" +#include // OSD headers #include "osdsdl.h" diff --git a/src/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h index 4bdceb69ab7..cdb64802b8a 100644 --- a/src/osd/modules/render/drawsdl.h +++ b/src/osd/modules/render/drawsdl.h @@ -15,6 +15,8 @@ #ifndef __DRAWSDL1__ #define __DRAWSDL1__ +#include + /* renderer_sdl2 is the information about SDL for the current screen */ class renderer_sdl1 : public osd_renderer { diff --git a/src/osd/modules/render/sdlglcontext.h b/src/osd/modules/render/sdlglcontext.h index e20c351908a..b8ff4d72aa2 100644 --- a/src/osd/modules/render/sdlglcontext.h +++ b/src/osd/modules/render/sdlglcontext.h @@ -13,7 +13,7 @@ #ifndef __SDL_GL_CONTEXT__ #define __SDL_GL_CONTEXT__ -#include "sdlinc.h" +#include #include "modules/opengl/osd_opengl.h" class sdl_gl_context : public osd_gl_context diff --git a/src/osd/modules/sound/sdl_sound.cpp b/src/osd/modules/sound/sdl_sound.cpp index 31c2d651f1d..efab053ef6e 100644 --- a/src/osd/modules/sound/sdl_sound.cpp +++ b/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 // MAME headers #include "emu.h" diff --git a/src/osd/sdl/sdlinc.h b/src/osd/sdl/sdlinc.h deleted file mode 100644 index 03bd37874ca..00000000000 --- a/src/osd/sdl/sdlinc.h +++ /dev/null @@ -1,10 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Olivier Galibert, R. Belmont -#ifndef _sdlinc_h_ -#define _sdlinc_h_ - -#include -#include -#include - -#endif diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp index 2f2cec699a2..000ed3b41a0 100644 --- a/src/osd/sdl/sdlmain.cpp +++ b/src/osd/sdl/sdlmain.cpp @@ -31,7 +31,7 @@ #include #endif -#include "sdlinc.h" +#include // MAME headers #include "osdepend.h" diff --git a/src/osd/sdl/video.cpp b/src/osd/sdl/video.cpp index 418df2cbe89..e881f6b69d7 100644 --- a/src/osd/sdl/video.cpp +++ b/src/osd/sdl/video.cpp @@ -7,7 +7,7 @@ // SDLMAME by Olivier Galibert and R. Belmont // //============================================================ -#include "sdlinc.h" +#include // MAME headers #include "emu.h" diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp index 59f9d01badf..a7eb0813def 100644 --- a/src/osd/sdl/window.cpp +++ b/src/osd/sdl/window.cpp @@ -14,9 +14,7 @@ #endif // standard SDL headers -#include "sdlinc.h" - -#include +#include // standard C headers #include