summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/sdlinc.h
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2012-02-12 20:59:24 +0000
committer Couriersud <couriersud@users.noreply.github.com>2012-02-12 20:59:24 +0000
commit534416655539c77a6817cc3a3fd5352389997b39 (patch)
treea7d68c4a45c9530ee293ab14578243a0b131dc4e /src/osd/sdl/sdlinc.h
parentd75dbab0de7da33196f08f0cf7992d906ffbb832 (diff)
updated sdl os-core to compile against stock SDL-2.0 [couriersud].
- The SDL team has moved from 1.3 to 2.0. At the same time, changes were made to allow SDL1.2 and SDL2.0 to coexist. All SDL2.0 include files are now in /usr/include/SDL2. - Added sdlinc.h to avoid having tons of #ifdef .. #include in the code. - Scalemode is no longer a per-window setting - Fixed a bug in YUV rendering. - Use SDL_GetClipboard (SDL2.0) - Updated README_SDL20.txt Currently, SDL 2.0 is only supported on *nix. Volunteers welcome.
Diffstat (limited to 'src/osd/sdl/sdlinc.h')
-rw-r--r--src/osd/sdl/sdlinc.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/osd/sdl/sdlinc.h b/src/osd/sdl/sdlinc.h
new file mode 100644
index 00000000000..69cc396b71a
--- /dev/null
+++ b/src/osd/sdl/sdlinc.h
@@ -0,0 +1,20 @@
+#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!
+#ifndef SDLMAME_WIN32
+#include <SDL/SDL_syswm.h>
+#endif
+#endif
+
+#endif