Support for SDL2-video

mywave82 · Nov 27, 2018 · f4e3a9d · f4e3a9d
1 parent 7b725e8
commit f4e3a9d
Show file tree

Hide file tree

Showing 15 changed files with 2,535 additions and 5 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -57,6 +57,9 @@ endif
 ifeq ($(HAVE_SDL),1)
 	$(CP) ocp-sdl "$(DESTDIR)$(BINDIR)/ocp-sdl"
 endif
+ifeq ($(HAVE_SDL2),1)
+	$(CP) ocp-sdl2 "$(DESTDIR)$(BINDIR)/ocp-sdl2"
+endif
 ifeq ($(HAVE_X11),1)
 	$(CP) ocp-x11 "$(DESTDIR)$(BINDIR)/ocp-x11"
 endif

diff --git a/Rules.make.in b/Rules.make.in
@@ -56,6 +56,10 @@ SDL_CFLAGS=@SDL_CFLAGS@
 SDL_LIBS=@SDL_LIBS@
 HAVE_SDL=@HAVE_SDL@
 
+SDL2_CFLAGS=@SDL2_CFLAGS@
+SDL2_LIBS=@SDL2_LIBS@
+HAVE_SDL2=@HAVE_SDL2@
+
 # These affect what plugins are compiled in at some points
 CDROM_SUPPORT=@CDROM_SUPPORT@
 LINUX=@LINUX@

diff --git a/config.h.in b/config.h.in
@@ -194,6 +194,7 @@
 /* #define MCP_DEBUG 1 */
 /* #define COREAUDIO_DEBUG 1 */
 /* #define SDL_DEBUG 1 */
+/* #define SDL2_DEBUG 1 */
 /* #define CPIFACE_DEBUG 1 */
 
 #define VERBOSE_FRAMEBUFFER 1
@@ -276,6 +277,8 @@
 
 #undef HAVE_SDL
 
+#undef HAVE_SDL2
+
 #undef HAVE_MAD
 
 #undef HAVE_ERRNO_H