Drop support for SDL1, which is no longer maintained.

diff --git a/Makefile.in b/Makefile.in
index 80dc0e06cd6be732bc621f44c83b96804bbe9a58..4ff17057ba8ae6f6d220de21c7da648584f32961 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,23 +17,19 @@ datarootdir = @datarootdir@
 datadir = @datadir@
 top_builddir = @top_builddir@
 with_demo_app = @with_demo_app@
-with_SDL2 = @with_SDL2@
 with_benchmark = @with_benchmark@
 with_coverage = @with_coverage@
 
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ @benchmark_CFLAGS@
-ifeq ($(with_SDL2),yes)
-CXXFLAGS += -DHAVE_SDL2
-endif
+CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ @benchmark_CFLAGS@
 ifeq ($(with_benchmark),yes)
 CXXFLAGS += -DHAVE_BENCHMARK
 endif
 LDFLAGS=@LDFLAGS@
 LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
-TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ @benchmark_LIBS@ -lpthread
-DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
+TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @benchmark_LIBS@ -lpthread
+DEMO_LDLIBS=@SDL2_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 SHELL=@SHELL@
 LIBTOOL=@LIBTOOL@ --tag=CXX
 RANLIB=ranlib

diff --git a/configure.ac b/configure.ac
index 427e67d8499d23c8758c06f546a830535094269f..25efcc8e56e49df6e67c259255d94c0c649cf089 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,20 +14,12 @@ PKG_CHECK_MODULES([Eigen3], [eigen3])
 PKG_CHECK_MODULES([epoxy], [epoxy])
 PKG_CHECK_MODULES([FFTW3], [fftw3])
 
-# Needed for unit tests and the demo app. We prefer SDL2 if possible,
-# but can also use classic SDL.
-with_SDL2=no
+# Needed for unit tests and the demo app.
 with_demo_app=yes
-PKG_CHECK_MODULES([SDL2], [sdl2], [with_SDL2=yes], [
-  PKG_CHECK_MODULES([SDL], [sdl])
-])
-
-# These are only needed for the demo app.
-if test $with_SDL2 = "yes"; then
-  PKG_CHECK_MODULES([SDL2_image], [SDL2_image], [], [with_demo_app=no; AC_MSG_WARN([SDL2_image not found, demo program will not be built])])
-else
-  PKG_CHECK_MODULES([SDL_image], [SDL_image], [], [with_demo_app=no; AC_MSG_WARN([SDL_image not found, demo program will not be built])])
-fi
+PKG_CHECK_MODULES([SDL2], [sdl2])
+
+# This is only needed for the demo app.
+PKG_CHECK_MODULES([SDL2_image], [SDL2_image], [], [with_demo_app=no; AC_MSG_WARN([SDL2_image not found, demo program will not be built])])
 PKG_CHECK_MODULES([libpng], [libpng], [], [with_demo_app=no; AC_MSG_WARN([libpng not found, demo program will not be built])])
 
 # This is only needed for microbenchmarks, so optional.
@@ -35,7 +27,6 @@ PKG_CHECK_MODULES([benchmark], [benchmark], [with_benchmark=yes], [with_benchmar
 
 AC_SUBST([with_demo_app])
 AC_SUBST([with_benchmark])
-AC_SUBST([with_SDL2])
 
 with_coverage=no
 AC_ARG_ENABLE([coverage], [  --enable-coverage       build with information needed to compute test coverage], [with_coverage=yes])

diff --git a/demo.cpp b/demo.cpp
index aabb615d02f05391d09ce88b06b125e0845fe21c..1c38fc30b7ecf70e9f4351920d55b2344e1515fc 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -5,7 +5,6 @@
 
 #include <epoxy/gl.h>
 
-#ifdef HAVE_SDL2
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_error.h>
 #include <SDL2/SDL_events.h>
@@ -13,16 +12,6 @@
 #include <SDL2/SDL_keyboard.h>
 #include <SDL2/SDL_mouse.h>
 #include <SDL2/SDL_video.h>
-#else
-#include <SDL/SDL.h>
-#include <SDL/SDL_error.h>
-#include <SDL/SDL_events.h>
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_keyboard.h>
-#include <SDL/SDL_keysym.h>
-#include <SDL/SDL_mouse.h>
-#include <SDL/SDL_video.h>
-#endif
 
 #include <assert.h>
 #include <features.h>
@@ -133,11 +122,6 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
        rgba_fmt.Bshift = 0;
        rgba_fmt.Ashift = 24;
 
-#ifndef HAVE_SDL2
-       rgba_fmt.colorkey = 0;
-       rgba_fmt.alpha = 255;
-#endif
-
        SDL_Surface *converted = SDL_ConvertSurface(img, &rgba_fmt, SDL_SWSURFACE);
 
        *w = img->w;
@@ -189,7 +173,6 @@ int main(int argc, char **argv)
        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
-#ifdef HAVE_SDL2
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
@@ -201,10 +184,6 @@ int main(int argc, char **argv)
                SDL_WINDOW_OPENGL);
        SDL_GLContext context = SDL_GL_CreateContext(window);
        assert(context != nullptr);
-#else
-       SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
-       SDL_WM_SetCaption("OpenGL window", nullptr);
-#endif
 
        CHECK(init_movit(".", MOVIT_DEBUG_ON));
        printf("GPU texture subpixel precision: about %.1f bits\n",
@@ -305,11 +284,7 @@ int main(int argc, char **argv)
                draw_saturation_bar(0.75f, blur_radius / 100.0f);
                draw_saturation_bar(0.80f, blurred_mix_amount);
 
-#ifdef HAVE_SDL2
                SDL_GL_SwapWindow(window);
-#else
-               SDL_GL_SwapBuffers();
-#endif
                check_error();
 
                glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);

diff --git a/gtest_sdl_main.cpp b/gtest_sdl_main.cpp
index e3051ad3518a86c8c48055d00ed5b694644e32de..be8bdd4d372054f68c81cf28968dcb40a88f8c4e 100644 (file)
--- a/gtest_sdl_main.cpp
+++ b/gtest_sdl_main.cpp
@@ -1,14 +1,8 @@
 #define GTEST_HAS_EXCEPTIONS 0
 
-#ifdef HAVE_SDL2
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_error.h>
 #include <SDL2/SDL_video.h>
-#else
-#include <SDL/SDL.h>
-#include <SDL/SDL_error.h>
-#include <SDL/SDL_video.h>
-#endif
 #ifdef HAVE_BENCHMARK
 #include <benchmark/benchmark.h>
 #endif
@@ -27,7 +21,6 @@ int main(int argc, char **argv) {
        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
-#ifdef HAVE_SDL2
        // You can uncomment this if you want to try a core context.
        // For Mesa, you can get the same effect by doing
        //
@@ -48,10 +41,6 @@ int main(int argc, char **argv) {
                SDL_WINDOW_OPENGL);
        SDL_GLContext context = SDL_GL_CreateContext(window);
        assert(context != nullptr);
-#else
-       SDL_SetVideoMode(32, 32, 0, SDL_OPENGL);
-       SDL_WM_SetCaption("OpenGL window for unit test", nullptr);
-#endif
 
        int err;
        if (argc >= 2 && strcmp(argv[1], "--benchmark") == 0) {