Migrated to libSDL2 - no more video tearing.

Makefile.in

@@ -264,8 +264,9 @@ PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SCM_REVISION = @SCM_REVISION@
+SDL2_CONFIG = @SDL2_CONFIG@
+SDL2_FRAMEWORK = @SDL2_FRAMEWORK@
 SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
 SDL_CXXFLAGS = @SDL_CXXFLAGS@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@

README

@@ -9,7 +9,7 @@ COMPILE/INSTALL/RUN
 Windows
 -------
 Windows users can download and run a pre-compiled Windows binary
-[here](https://github.com/ttsiodras/MandelbrotSSE/releases/download/2.7/mandelSSE-win32-2.7.zip).
+[here](https://github.com/ttsiodras/MandelbrotSSE/releases/download/2.8/mandelSSE-win32-2.8.zip).
 
 After decompressing, you can simply execute either one of the two .bat
 files. The 'autopilot' one zooms in a specific location, while the other
@@ -22,11 +22,13 @@ cross-compilation instructions later in this document.
 For Linux/BSD/OSX users
 -----------------------
 
-Make sure you have libSDL installed - then...
+Make sure you have libSDL2 installed - then...
 
     $ ./configure
     $ make
 
+You can then simply...
+
     $ src/mandelSSE -h
 
     Usage: ./src/mandelSSE [-a|-m] [-h] [-f rate] [WIDTH HEIGHT]
@@ -40,7 +42,7 @@ Make sure you have libSDL installed - then...
     If WIDTH and HEIGHT are not provided, they default to: 1024 768
 
     $ src/mandelSSE
-    (Runs in autopilot in 1024x768 window, using XaoS)
+    (Runs in autopilot in a 1024x768 window)
 
     $ src/mandelSSE -m 1280 720
     (Runs in mouse-driven mode, in a 1280x720 window)
@@ -183,29 +185,27 @@ Have a look!
 
 Cross compiling for Windows via MinGW
 -------------------------------------
-After decompressing the SDL 1.2.15 tarball, install MinGW:
+After decompressing the SDL 2.0.22 tarball, install MinGW:
 
     $ sudo apt install gcc-mingw-w64
 
 Then download the source code of libSDL and compile it as follows:
 
-    $ cd SDL-1.2.15
-    $ ./configure --host=x86_64-w64-mingw32 --disable-dga \
-            --disable-video-dga --disable-video-x11-dgamouse \
+    $ cd SDL-2.0.22
+    $ ./configure --host=x86_64-w64-mingw32 \
             --disable-video-x11 --disable-x11-shared \
-            --prefix=/usr/local/packages/SDL-1.2.15-win32
+            --prefix=/usr/local/packages/SDL-2.0.22-win32
     $ make
     $ sudo make install
 
-Finally, come back to this source folder, and compile the XaoS
-version:
+Finally, come back to this source folder, and compile:
 
     $ ./configure --host=x86_64-w64-mingw32 \
-            --with-sdl-prefix=/usr/local/packages/SDL-1.2.15-win32 \
+            --with-sdl-prefix=/usr/local/packages/SDL-2.0.22-win32 \
             --disable-sdltest
     $ make
     $ cp src/mandelSSE.exe \
-            /usr/local/packages/SDL-1.2.15-win32/bin/SDL.dll \
+            /usr/local/packages/SDL-2.0.22-win32/bin/SDL.dll \
             /some/path/for/Windows/
 
 MISC

README.md

@@ -9,7 +9,7 @@ COMPILE/INSTALL/RUN
 Windows
 -------
 Windows users can download and run a pre-compiled Windows binary
-[here](https://github.com/ttsiodras/MandelbrotSSE/releases/download/2.7/mandelSSE-win32-2.7.zip).
+[here](https://github.com/ttsiodras/MandelbrotSSE/releases/download/2.8/mandelSSE-win32-2.8.zip).
 
 After decompressing, you can simply execute either one of the two .bat
 files. The 'autopilot' one zooms in a specific location, while the other
@@ -22,7 +22,7 @@ cross-compilation instructions later in this document.
 For Linux/BSD/OSX users
 -----------------------
 
-Make sure you have libSDL installed - then...
+Make sure you have libSDL2 installed - then...
 
     $ ./configure
     $ make
@@ -42,7 +42,7 @@ You can then simply...
     If WIDTH and HEIGHT are not provided, they default to: 1024 768
 
     $ src/mandelSSE
-    (Runs in autopilot in 1024x768 window, using XaoS)
+    (Runs in autopilot in a 1024x768 window)
 
     $ src/mandelSSE -m 1280 720
     (Runs in mouse-driven mode, in a 1280x720 window)
@@ -185,29 +185,27 @@ Have a look!
 
 Cross compiling for Windows via MinGW
 -------------------------------------
-After decompressing the SDL 1.2.15 tarball, install MinGW:
+After decompressing the SDL 2.0.22 tarball, install MinGW:
 
     $ sudo apt install gcc-mingw-w64
 
 Then download the source code of libSDL and compile it as follows:
 
-    $ cd SDL-1.2.15
-    $ ./configure --host=x86_64-w64-mingw32 --disable-dga \
-            --disable-video-dga --disable-video-x11-dgamouse \
+    $ cd SDL-2.0.22
+    $ ./configure --host=x86_64-w64-mingw32 \
             --disable-video-x11 --disable-x11-shared \
-            --prefix=/usr/local/packages/SDL-1.2.15-win32
+            --prefix=/usr/local/packages/SDL-2.0.22-win32
     $ make
     $ sudo make install
 
-Finally, come back to this source folder, and compile the XaoS
-version:
+Finally, come back to this source folder, and compile:
 
     $ ./configure --host=x86_64-w64-mingw32 \
-            --with-sdl-prefix=/usr/local/packages/SDL-1.2.15-win32 \
+            --with-sdl-prefix=/usr/local/packages/SDL-2.0.22-win32 \
             --disable-sdltest
     $ make
     $ cp src/mandelSSE.exe \
-            /usr/local/packages/SDL-1.2.15-win32/bin/SDL.dll \
+            /usr/local/packages/SDL-2.0.22-win32/bin/SDL.dll \
             /some/path/for/Windows/
 
 MISC

aclocal.m4

@@ -370,69 +370,100 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
 # stolen back from Frank Belew
 # stolen from Manish Singh
 # Shamelessly stolen from Owen Taylor
+#
+# Changelog:
+# * also look for SDL2.framework under Mac OS X
+# * removed HP/UX 9 support.
+# * updated for newer autoconf.
 
 # serial 2
 
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
 dnl
-AC_DEFUN([AM_PATH_SDL],
+AC_DEFUN([AM_PATH_SDL2],
 [dnl
-dnl Get the cflags and libraries from the sdl-config script
+dnl Get the cflags and libraries from the sdl2-config script
 dnl
 AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
             sdl_prefix="$withval", sdl_prefix="")
 AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
             sdl_exec_prefix="$withval", sdl_exec_prefix="")
 AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
 		    , enable_sdltest=yes)
+AC_ARG_ENABLE(sdlframework, [  --disable-sdlframework Do not search for SDL2.framework],
+        , search_sdl_framework=yes)
+
+AC_ARG_VAR(SDL2_FRAMEWORK, [Path to SDL2.framework])
 
-  min_sdl_version=ifelse([$1], ,1.2.0,$1)
+  min_sdl_version=ifelse([$1], ,2.0.0,$1)
 
   if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
-    PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version],
+    PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
            [sdl_pc=yes],
            [sdl_pc=no])
   else
     sdl_pc=no
     if test x$sdl_exec_prefix != x ; then
       sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
-      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+      if test x${SDL2_CONFIG+set} != xset ; then
+        SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
       fi
     fi
     if test x$sdl_prefix != x ; then
       sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
-      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+      if test x${SDL2_CONFIG+set} != xset ; then
+        SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
       fi
     fi
   fi
 
   if test "x$sdl_pc" = xyes ; then
     no_sdl=""
-    SDL_CONFIG="pkg-config sdl"
+    SDL2_CONFIG="pkg-config sdl2"
   else
     as_save_PATH="$PATH"
     if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
       PATH="$prefix/bin:$prefix/usr/bin:$PATH"
     fi
-    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+    AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH])
     PATH="$as_save_PATH"
-    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
     no_sdl=""
 
-    if test "$SDL_CONFIG" = "no" ; then
-      no_sdl=yes
-    else
-      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
-      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+    if test "$SDL2_CONFIG" = "no" -a "x$search_sdl_framework" = "xyes"; then
+      AC_MSG_CHECKING(for SDL2.framework)
+      if test "x$SDL2_FRAMEWORK" != x; then
+        sdl_framework=$SDL2_FRAMEWORK
+      else
+        for d in / ~/ /System/; do
+          if test -d "$dLibrary/Frameworks/SDL2.framework"; then
+            sdl_framework="$dLibrary/Frameworks/SDL2.framework"
+          fi
+        done
+      fi
+
+      if test x"$sdl_framework" != x && test -d "$sdl_framework"; then
+        AC_MSG_RESULT($sdl_framework)
+        sdl_framework_dir=`dirname $sdl_framework`
+        SDL_CFLAGS="-F$sdl_framework_dir -Wl,-framework,SDL2 -I$sdl_framework/include"
+        SDL_LIBS="-F$sdl_framework_dir -Wl,-framework,SDL2"
+      else
+        no_sdl=yes
+      fi
+    fi
+
+    if test "$SDL2_CONFIG" != "no"; then
+      if test "x$sdl_pc" = "xno"; then
+        AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+        SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
+        SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
+      fi
 
-      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+      sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+      sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+      sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
       if test "x$enable_sdltest" = "xyes" ; then
         ac_save_CFLAGS="$CFLAGS"
@@ -443,7 +474,7 @@ AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run
         LIBS="$LIBS $SDL_LIBS"
 dnl
 dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
+dnl checks the results of sdl2-config to some extent
 dnl
       rm -f conf.sdltest
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -471,11 +502,11 @@ int main (int argc, char *argv[])
     }
   else
     {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
       printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+      printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
+      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
       printf("*** config.cache before re-running configure\n");
       return 1;
     }
@@ -485,22 +516,25 @@ int main (int argc, char *argv[])
         CFLAGS="$ac_save_CFLAGS"
         CXXFLAGS="$ac_save_CXXFLAGS"
         LIBS="$ac_save_LIBS"
+
+      fi
+      if test "x$sdl_pc" = "xno"; then
+        if test "x$no_sdl" = "xyes"; then
+          AC_MSG_RESULT(no)
+        else
+          AC_MSG_RESULT(yes)
+        fi
       fi
-    fi
-    if test "x$no_sdl" = x ; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
     fi
   fi
   if test "x$no_sdl" = x ; then
      ifelse([$2], , :, [$2])
   else
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
+     if test "$SDL2_CONFIG" = "no" ; then
+       echo "*** The sdl2-config script installed by SDL could not be found"
        echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
+       echo "*** your path, or set the SDL2_CONFIG environment variable to the"
+       echo "*** full path to sdl2-config."
      else
        if test -f conf.sdltest ; then
         :
@@ -530,7 +564,7 @@ int main(int argc, char *argv[])
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means SDL was incorrectly installed"
           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+          echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ])
           CFLAGS="$ac_save_CFLAGS"
           CXXFLAGS="$ac_save_CXXFLAGS"
           LIBS="$ac_save_LIBS"