diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/osd/sdl/sdlinc.h | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/osd/sdl/sdlinc.h')
-rw-r--r-- | src/osd/sdl/sdlinc.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/osd/sdl/sdlinc.h b/src/osd/sdl/sdlinc.h index 2bb5dfd0954..47ead42c0cf 100644 --- a/src/osd/sdl/sdlinc.h +++ b/src/osd/sdl/sdlinc.h @@ -3,20 +3,11 @@ #ifndef _sdlinc_h_ #define _sdlinc_h_ -#if (SDLMAME_SDL2) #include <SDL2/SDL.h> #include <SDL2/SDL_version.h> // on win32 this includes windows.h by itself and breaks us! #ifndef SDLMAME_WIN32 #include <SDL2/SDL_syswm.h> #endif -#else -#include <SDL/SDL.h> -#include <SDL/SDL_version.h> -// on win32 this includes windows.h by itself and breaks us! -#if !defined(SDLMAME_WIN32) && !defined(SDLMAME_DARWIN) && !defined(SDLMAME_MACOSX) -#include <SDL/SDL_syswm.h> -#endif -#endif #endif |