Update the examples to use SDL2

This should make it easier to build the examples on 64-bit, where there are no
premade dev libs for SDL1 on 64-bit mingw. FindSDL_sound.cmake has been
updated to accept SDL or SDL2.

4 files changed, 499 insertions, 301 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9296ed1..27ec7209 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -901,11 +901,11 @@ IF(ALSOFT_UTILS AND NOT ALSOFT_NO_CONFIG_UTIL)
     add_subdirectory(utils/alsoft-config)
 ENDIF()
 IF(ALSOFT_EXAMPLES)
-    FIND_PACKAGE(SDL)
-    IF(SDL_FOUND)
+    FIND_PACKAGE(SDL2)
+    IF(SDL2_FOUND)
         FIND_PACKAGE(SDL_sound)
         IF(SDL_SOUND_FOUND AND CMAKE_VERSION VERSION_LESS "2.8.8")
-            INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
+            INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
         ENDIF()
     ENDIF()
 ENDIF()
@@ -1056,26 +1056,30 @@ IF(ALSOFT_UTILS)
 ENDIF()
 
 IF(ALSOFT_EXAMPLES)
-    IF(SDL_FOUND AND SDL_SOUND_FOUND)
+    IF(SDL2_FOUND AND SDL_SOUND_FOUND)
         ADD_LIBRARY(ex-common STATIC examples/common/alhelpers.c
                                      examples/common/sdl_sound.c)
-        SET_PROPERTY(TARGET ex-common APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL_SOUND_INCLUDE_DIR})
+        SET_PROPERTY(TARGET ex-common APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR}
+                                                                          ${SDL_SOUND_INCLUDE_DIR})
 
         ADD_EXECUTABLE(alstream examples/alstream.c)
-        TARGET_LINK_LIBRARIES(alstream ex-common ${SDL_SOUND_LIBRARIES} ${LIBNAME})
-        SET_PROPERTY(TARGET alstream APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL_SOUND_INCLUDE_DIR})
+        TARGET_LINK_LIBRARIES(alstream ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY} ${LIBNAME})
+        SET_PROPERTY(TARGET alstream APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR}
+                                                                         ${SDL_SOUND_INCLUDE_DIR})
 
         ADD_EXECUTABLE(alreverb examples/alreverb.c)
-        TARGET_LINK_LIBRARIES(alreverb ex-common ${SDL_SOUND_LIBRARIES} ${LIBNAME})
-        SET_PROPERTY(TARGET alreverb APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL_SOUND_INCLUDE_DIR})
+        TARGET_LINK_LIBRARIES(alreverb ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY} ${LIBNAME})
+        SET_PROPERTY(TARGET alreverb APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR}
+                                                                         ${SDL_SOUND_INCLUDE_DIR})
 
         ADD_EXECUTABLE(allatency examples/allatency.c)
-        TARGET_LINK_LIBRARIES(allatency ex-common ${SDL_SOUND_LIBRARIES} ${LIBNAME})
-        SET_PROPERTY(TARGET allatency APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL_SOUND_INCLUDE_DIR})
+        TARGET_LINK_LIBRARIES(allatency ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY} ${LIBNAME})
+        SET_PROPERTY(TARGET allatency APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR}
+                                                                          ${SDL_SOUND_INCLUDE_DIR})
 
         ADD_EXECUTABLE(alloopback examples/alloopback.c)
-        TARGET_LINK_LIBRARIES(alloopback ex-common ${SDL_SOUND_LIBRARIES} ${SDL_LIBRARY} ${LIBNAME})
-        SET_PROPERTY(TARGET alloopback APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL_INCLUDE_DIR}
+        TARGET_LINK_LIBRARIES(alloopback ex-common ${SDL_SOUND_LIBRARIES} ${SDL2_LIBRARY} ${LIBNAME})
+        SET_PROPERTY(TARGET alloopback APPEND PROPERTY INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR}
                                                                            ${SDL_SOUND_INCLUDE_DIR})
 
         INSTALL(TARGETS alstream alreverb allatency alloopback
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
new file mode 100644
index 00000000..70e607a8
--- /dev/null
+++ b/cmake/FindSDL2.cmake
@@ -0,0 +1,193 @@
+# Locate SDL2 library
+# This module defines
+# SDL2_LIBRARY, the name of the library to link against
+# SDL2_FOUND, if false, do not try to link to SDL2
+# SDL2_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL2_BUILDING_LIBRARY
+# If this is defined, then no SDL2_main will be linked in because
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL2_LIBRARY variable.
+#
+# Don't forget to include SDL2main.h and SDL2main.m your project for the
+# OS X framework based version. (Other versions link to -lSDL2main which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+#
+#
+# $SDL2DIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDL2DIR
+# used in building SDL2.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL2 guidelines.
+# Added a search for SDL2main which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL2_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
+# This needed to change because "proper" SDL2 convention
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
+#
+# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
+# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
+# was not created for redistribution, and exists temporarily pending official
+# SDL2 CMake modules.
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES include/SDL2 include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local/include/SDL2
+  /usr/include/SDL2
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
+
+FIND_LIBRARY(SDL2_LIBRARY_TEMP
+  NAMES SDL2
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
+
+IF(NOT SDL2_BUILDING_LIBRARY)
+  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+    # Non-OS X framework versions expect you to also dynamically link to
+    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
+    # seem to provide SDL2main for compatibility even though they don't
+    # necessarily need it.
+    FIND_LIBRARY(SDL2MAIN_LIBRARY
+      NAMES SDL2main
+      HINTS
+      $ENV{SDL2DIR}
+      PATH_SUFFIXES lib64 lib
+      PATHS
+      /sw
+      /opt/local
+      /opt/csw
+      /opt
+    )
+  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+# SDL2 may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+SET(SDL2_FOUND "NO")
+IF(SDL2_LIBRARY_TEMP)
+  # For SDL2main
+  IF(NOT SDL2_BUILDING_LIBRARY)
+    IF(SDL2MAIN_LIBRARY)
+      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
+    ENDIF(SDL2MAIN_LIBRARY)
+  ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+  # CMake doesn't display the -framework Cocoa string in the UI even
+  # though it actually is there if I modify a pre-used variable.
+  # I think it has something to do with the CACHE STRING.
+  # So I use a temporary variable until the end so I can set the
+  # "real" variable in one-shot.
+  IF(APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+  ENDIF(APPLE)
+
+  # For threads, as mentioned Apple doesn't need this.
+  # In fact, there seems to be a problem if I used the Threads package
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  IF(NOT APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  ENDIF(NOT APPLE)
+
+  # For MinGW library
+  IF(MINGW)
+    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+  ENDIF(MINGW)
+  
+  IF(WIN32)
+    SET(SDL2_LIBRARY_TEMP winmm imm32 version msimg32 ${SDL2_LIBRARY_TEMP})
+  ENDIF(WIN32)
+
+  # Set the final string here so the GUI reflects the final state.
+  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+
+  SET(SDL2_FOUND "YES")
+ENDIF(SDL2_LIBRARY_TEMP)
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
+                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+
+IF(SDL2_STATIC)
+  if (UNIX AND NOT APPLE)
+    EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS)
+    STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}")
+    SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS})
+  ENDIF()
+ENDIF(SDL2_STATIC)
diff --git a/cmake/FindSDL_sound.cmake b/cmake/FindSDL_sound.cmake
index 97d2a84c..2dab1a1c 100644
--- a/cmake/FindSDL_sound.cmake
+++ b/cmake/FindSDL_sound.cmake
@@ -1,7 +1,7 @@
 # - Locates the SDL_sound library
 #
 # This module depends on SDL being found and
-# must be called AFTER FindSDL.cmake is called.
+# must be called AFTER FindSDL.cmake or FindSDL2.cmake is called.
 #
 # This module defines
 #  SDL_SOUND_INCLUDE_DIR, where to find SDL_sound.h
@@ -52,8 +52,8 @@
 #
 # On OSX, this will prefer the Framework version (if found) over others.
 # People will have to manually change the cache values of
-# SDL_LIBRARY to override this selectionor set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
+# SDL_LIBRARY or SDL2_LIBRARY to override this selection or set the CMake
+# environment CMAKE_INCLUDE_PATH to modify the search paths.
 
 #=============================================================================
 # Copyright 2005-2009 Kitware, Inc.
@@ -74,289 +74,288 @@ mark_as_advanced(SDL_SOUND_EXTRAS)
 
 # Find SDL_sound.h
 find_path(SDL_SOUND_INCLUDE_DIR SDL_sound.h
-  HINTS
-    ENV SDLSOUNDDIR
-    ENV SDLDIR
-  PATH_SUFFIXES SDL SDL12 SDL11
-  )
+    HINTS
+        ENV SDLSOUNDDIR
+        ENV SDLDIR
+    PATH_SUFFIXES SDL SDL12 SDL11
+)
 
 find_library(SDL_SOUND_LIBRARY
-  NAMES SDL_sound
-  HINTS
-    ENV SDLSOUNDDIR
-    ENV SDLDIR
-  )
-
-if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
-
-  # CMake is giving me problems using TRY_COMPILE with the CMAKE_FLAGS
-  # for the :STRING syntax if I have multiple values contained in a
-  # single variable. This is a problem for the SDL_LIBRARY variable
-  # because it does just that. When I feed this variable to the command,
-  # only the first value gets the appropriate modifier (e.g. -I) and
-  # the rest get dropped.
-  # To get multiple single variables to work, I must separate them with a "\;"
-  # I could go back and modify the FindSDL.cmake module, but that's kind of painful.
-  # The solution would be to try something like:
-  # set(SDL_TRY_COMPILE_LIBRARY_LIST "${SDL_TRY_COMPILE_LIBRARY_LIST}\;${CMAKE_THREAD_LIBS_INIT}")
-  # Instead, it was suggested on the mailing list to write a temporary CMakeLists.txt
-  # with a temporary test project and invoke that with TRY_COMPILE.
-  # See message thread "Figuring out dependencies for a library in order to build"
-  # 2005-07-16
-  #     try_compile(
-  #             MY_RESULT
-  #             ${CMAKE_BINARY_DIR}
-  #             ${PROJECT_SOURCE_DIR}/DetermineSoundLibs.c
-  #             CMAKE_FLAGS
-  #                     -DINCLUDE_DIRECTORIES:STRING=${SDL_INCLUDE_DIR}\;${SDL_SOUND_INCLUDE_DIR}
-  #                     -DLINK_LIBRARIES:STRING=${SDL_SOUND_LIBRARY}\;${SDL_LIBRARY}
-  #             OUTPUT_VARIABLE MY_OUTPUT
-  #     )
-
-  # To minimize external dependencies, create a sdlsound test program
-  # which will be used to figure out if additional link dependencies are
-  # required for the link phase.
-  file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/DetermineSoundLibs.c
-    "#include \"SDL_sound.h\"
-    #include \"SDL.h\"
-    int main(int argc, char* argv[])
-    {
-        Sound_AudioInfo desired;
-        Sound_Sample* sample;
-
-        SDL_Init(0);
-        Sound_Init();
-
-        /* This doesn't actually have to work, but Init() is a no-op
-         * for some of the decoders, so this should force more symbols
-         * to be pulled in.
-         */
-        sample = Sound_NewSampleFromFile(argv[1], &desired, 4096);
-
-        Sound_Quit();
-        SDL_Quit();
-        return 0;
-     }"
-     )
-
-   # Calling
-   # target_link_libraries(DetermineSoundLibs "${SDL_SOUND_LIBRARY} ${SDL_LIBRARY})
-   # causes problems when SDL_LIBRARY looks like
-   # /Library/Frameworks/SDL.framework;-framework Cocoa
-   # The ;-framework Cocoa seems to be confusing CMake once the OS X
-   # framework support was added. I was told that breaking up the list
-   # would fix the problem.
-   set(TMP_TRY_LIBS)
-   foreach(lib ${SDL_SOUND_LIBRARY} ${SDL_LIBRARY})
-     set(TMP_TRY_LIBS "${TMP_TRY_LIBS} \"${lib}\"")
-   endforeach()
-
-   # message("TMP_TRY_LIBS ${TMP_TRY_LIBS}")
-
-   # Write the CMakeLists.txt and test project
-   # Weird, this is still sketchy. If I don't quote the variables
-   # in the TARGET_LINK_LIBRARIES, I seem to loose everything
-   # in the SDL_LIBRARY string after the "-framework".
-   # But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work.
-   file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt
-     "cmake_minimum_required(VERSION 2.8)
-        project(DetermineSoundLibs C)
-        include_directories(${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
-        add_executable(DetermineSoundLibs DetermineSoundLibs.c)
-        target_link_libraries(DetermineSoundLibs ${TMP_TRY_LIBS})"
-     )
-
-   try_compile(
-     MY_RESULT
-     ${PROJECT_BINARY_DIR}/CMakeTmp
-     ${PROJECT_BINARY_DIR}/CMakeTmp
-     DetermineSoundLibs
-     OUTPUT_VARIABLE MY_OUTPUT
-     )
-
-   # message("${MY_RESULT}")
-   # message(${MY_OUTPUT})
-
-   if(NOT MY_RESULT)
-
-     # I expect that MPGLIB, VOC, WAV, AIFF, and SHN are compiled in statically.
-     # I think Timidity is also compiled in statically.
-     # I've never had to explcitly link against Quicktime, so I'll skip that for now.
-
-     set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARY})
-
-     # Find MikMod
-     if("${MY_OUTPUT}" MATCHES "MikMod_")
-     find_library(MIKMOD_LIBRARY
-         NAMES libmikmod-coreaudio mikmod
-         PATHS
-           ENV MIKMODDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-       )
-       if(MIKMOD_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY})
-       endif(MIKMOD_LIBRARY)
-     endif("${MY_OUTPUT}" MATCHES "MikMod_")
-
-     # Find ModPlug
-     if("${MY_OUTPUT}" MATCHES "MODPLUG_")
-       find_library(MODPLUG_LIBRARY
-         NAMES modplug
-         PATHS
-           ENV MODPLUGDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-       )
-       if(MODPLUG_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MODPLUG_LIBRARY})
-       endif()
-     endif()
-
-
-     # Find Ogg and Vorbis
-     if("${MY_OUTPUT}" MATCHES "ov_")
-       find_library(VORBIS_LIBRARY
-         NAMES vorbis Vorbis VORBIS
-         PATHS
-           ENV VORBISDIR
-           ENV OGGDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-         )
-       if(VORBIS_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY})
-       endif()
-
-       find_library(OGG_LIBRARY
-         NAMES ogg Ogg OGG
-         PATHS
-           ENV OGGDIR
-           ENV VORBISDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-         )
-       if(OGG_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
-       endif()
-     endif()
-
-
-     # Find SMPEG
-     if("${MY_OUTPUT}" MATCHES "SMPEG_")
-       find_library(SMPEG_LIBRARY
-         NAMES smpeg SMPEG Smpeg SMpeg
-         PATHS
-           ENV SMPEGDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-         )
-       if(SMPEG_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY})
-       endif()
-     endif()
-
-
-     # Find FLAC
-     if("${MY_OUTPUT}" MATCHES "FLAC_")
-       find_library(FLAC_LIBRARY
-         NAMES flac FLAC
-         PATHS
-           ENV FLACDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-         )
-       if(FLAC_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY})
-       endif()
-     endif()
-
-
-     # Hmmm...Speex seems to depend on Ogg. This might be a problem if
-     # the TRY_COMPILE attempt gets blocked at SPEEX before it can pull
-     # in the Ogg symbols. I'm not sure if I should duplicate the ogg stuff
-     # above for here or if two ogg entries will screw up things.
-     if("${MY_OUTPUT}" MATCHES "speex_")
-       find_library(SPEEX_LIBRARY
-         NAMES speex SPEEX
-         PATHS
-           ENV SPEEXDIR
-           ENV SDLSOUNDDIR
-           ENV SDLDIR
-           /sw
-           /opt/local
-           /opt/csw
-           /opt
-         PATH_SUFFIXES
-           lib
-         )
-       if(SPEEX_LIBRARY)
-         set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY})
-       endif()
-
-       # Find OGG (needed for Speex)
-     # We might have already found Ogg for Vorbis, so skip it if so.
-       if(NOT OGG_LIBRARY)
-         find_library(OGG_LIBRARY
-           NAMES ogg Ogg OGG
-           PATHS
-             ENV OGGDIR
-             ENV VORBISDIR
-             ENV SPEEXDIR
-             ENV SDLSOUNDDIR
-             ENV SDLDIR
-             /sw
-             /opt/local
-             /opt/csw
-             /opt
-           PATH_SUFFIXES lib
-           )
-         if(OGG_LIBRARY)
-           set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
-         endif()
-       endif()
-     endif()
-
-     set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP} CACHE INTERNAL "SDL_sound and dependent libraries")
-   else()
-     set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY} CACHE INTERNAL "SDL_sound and dependent libraries")
-   endif()
+    NAMES SDL_sound
+    HINTS
+        ENV SDLSOUNDDIR
+        ENV SDLDIR
+)
+
+if(SDL2_FOUND OR SDL_FOUND)
+    if(SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
+        # CMake is giving me problems using TRY_COMPILE with the CMAKE_FLAGS
+        # for the :STRING syntax if I have multiple values contained in a
+        # single variable. This is a problem for the SDL2_LIBRARY variable
+        # because it does just that. When I feed this variable to the command,
+        # only the first value gets the appropriate modifier (e.g. -I) and
+        # the rest get dropped.
+        # To get multiple single variables to work, I must separate them with a "\;"
+        # I could go back and modify the FindSDL2.cmake module, but that's kind of painful.
+        # The solution would be to try something like:
+        # set(SDL2_TRY_COMPILE_LIBRARY_LIST "${SDL2_TRY_COMPILE_LIBRARY_LIST}\;${CMAKE_THREAD_LIBS_INIT}")
+        # Instead, it was suggested on the mailing list to write a temporary CMakeLists.txt
+        # with a temporary test project and invoke that with TRY_COMPILE.
+        # See message thread "Figuring out dependencies for a library in order to build"
+        # 2005-07-16
+        #     try_compile(
+        #             MY_RESULT
+        #             ${CMAKE_BINARY_DIR}
+        #             ${PROJECT_SOURCE_DIR}/DetermineSoundLibs.c
+        #             CMAKE_FLAGS
+        #                     -DINCLUDE_DIRECTORIES:STRING=${SDL2_INCLUDE_DIR}\;${SDL_SOUND_INCLUDE_DIR}
+        #                     -DLINK_LIBRARIES:STRING=${SDL_SOUND_LIBRARY}\;${SDL2_LIBRARY}
+        #             OUTPUT_VARIABLE MY_OUTPUT
+        #     )
+
+        # To minimize external dependencies, create a sdlsound test program
+        # which will be used to figure out if additional link dependencies are
+        # required for the link phase.
+        file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/DetermineSoundLibs.c
+            "#include \"SDL_sound.h\"
+            #include \"SDL.h\"
+            int main(int argc, char* argv[])
+            {
+                Sound_AudioInfo desired;
+                Sound_Sample* sample;
+
+                SDL_Init(0);
+                Sound_Init();
+
+                /* This doesn't actually have to work, but Init() is a no-op
+                 * for some of the decoders, so this should force more symbols
+                 * to be pulled in.
+                 */
+                sample = Sound_NewSampleFromFile(argv[1], &desired, 4096);
+
+                Sound_Quit();
+                SDL_Quit();
+                return 0;
+            }"
+        )
+
+        # Calling
+        # target_link_libraries(DetermineSoundLibs "${SDL_SOUND_LIBRARY} ${SDL2_LIBRARY})
+        # causes problems when SDL2_LIBRARY looks like
+        # /Library/Frameworks/SDL2.framework;-framework Cocoa
+        # The ;-framework Cocoa seems to be confusing CMake once the OS X
+        # framework support was added. I was told that breaking up the list
+        # would fix the problem.
+        set(TMP_TRY_LIBS)
+        if(SDL2_FOUND)
+            foreach(lib ${SDL_SOUND_LIBRARY} ${SDL2_LIBRARY})
+                set(TMP_TRY_LIBS "${TMP_TRY_LIBS} \"${lib}\"")
+            endforeach()
+            set(TMP_INCLUDE_DIRS ${SDL2_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
+        else()
+            foreach(lib ${SDL_SOUND_LIBRARY} ${SDL_LIBRARY})
+                set(TMP_TRY_LIBS "${TMP_TRY_LIBS} \"${lib}\"")
+            endforeach()
+            set(TMP_INCLUDE_DIRS ${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
+        endif()
+
+        # message("TMP_TRY_LIBS ${TMP_TRY_LIBS}")
+
+        # Write the CMakeLists.txt and test project
+        # Weird, this is still sketchy. If I don't quote the variables
+        # in the TARGET_LINK_LIBRARIES, I seem to loose everything
+        # in the SDL2_LIBRARY string after the "-framework".
+        # But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work.
+        file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt
+            "cmake_minimum_required(VERSION 2.8)
+            project(DetermineSoundLibs C)
+            include_directories(${TMP_INCLUDE_DIRS})
+            add_executable(DetermineSoundLibs DetermineSoundLibs.c)
+            target_link_libraries(DetermineSoundLibs ${TMP_TRY_LIBS})"
+        )
+        unset(TMP_INCLUDE_DIRS)
+        unset(TMP_TRY_LIBS)
+
+        try_compile(
+            MY_RESULT
+            ${PROJECT_BINARY_DIR}/CMakeTmp
+            ${PROJECT_BINARY_DIR}/CMakeTmp
+            DetermineSoundLibs
+            OUTPUT_VARIABLE MY_OUTPUT
+        )
+        # message("${MY_RESULT}")
+        # message(${MY_OUTPUT})
+
+        if(NOT MY_RESULT)
+            # I expect that MPGLIB, VOC, WAV, AIFF, and SHN are compiled in statically.
+            # I think Timidity is also compiled in statically.
+            # I've never had to explcitly link against Quicktime, so I'll skip that for now.
+
+            set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARY})
+
+            # Find MikMod
+            if("${MY_OUTPUT}" MATCHES "MikMod_")
+                find_library(MIKMOD_LIBRARY
+                    NAMES libmikmod-coreaudio mikmod
+                    PATHS
+                        ENV MIKMODDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(MIKMOD_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY})
+                endif(MIKMOD_LIBRARY)
+            endif("${MY_OUTPUT}" MATCHES "MikMod_")
+
+            # Find ModPlug
+            if("${MY_OUTPUT}" MATCHES "MODPLUG_")
+                find_library(MODPLUG_LIBRARY
+                    NAMES modplug
+                    PATHS
+                        ENV MODPLUGDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(MODPLUG_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MODPLUG_LIBRARY})
+                endif()
+            endif()
+
+            # Find Ogg and Vorbis
+            if("${MY_OUTPUT}" MATCHES "ov_")
+                find_library(VORBIS_LIBRARY
+                    NAMES vorbis Vorbis VORBIS
+                    PATHS
+                        ENV VORBISDIR
+                        ENV OGGDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(VORBIS_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY})
+                endif()
+                find_library(OGG_LIBRARY
+                    NAMES ogg Ogg OGG
+                    PATHS
+                        ENV OGGDIR
+                        ENV VORBISDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(OGG_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
+                endif()
+            endif()
+
+            # Find SMPEG
+            if("${MY_OUTPUT}" MATCHES "SMPEG_")
+                find_library(SMPEG_LIBRARY
+                    NAMES smpeg SMPEG Smpeg SMpeg
+                    PATHS
+                        ENV SMPEGDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(SMPEG_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY})
+                endif()
+            endif()
+
+
+            # Find FLAC
+            if("${MY_OUTPUT}" MATCHES "FLAC_")
+                find_library(FLAC_LIBRARY
+                    NAMES flac FLAC
+                    PATHS
+                        ENV FLACDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(FLAC_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY})
+                endif()
+            endif()
+
+
+            # Hmmm...Speex seems to depend on Ogg. This might be a problem if
+            # the TRY_COMPILE attempt gets blocked at SPEEX before it can pull
+            # in the Ogg symbols. I'm not sure if I should duplicate the ogg stuff
+            # above for here or if two ogg entries will screw up things.
+            if("${MY_OUTPUT}" MATCHES "speex_")
+                find_library(SPEEX_LIBRARY
+                    NAMES speex SPEEX
+                    PATHS
+                        ENV SPEEXDIR
+                        ENV SDLSOUNDDIR
+                        ENV SDLDIR
+                        /sw
+                        /opt/local
+                        /opt/csw
+                        /opt
+                    PATH_SUFFIXES lib
+                )
+                if(SPEEX_LIBRARY)
+                    set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY})
+                endif()
+
+                # Find OGG (needed for Speex)
+                # We might have already found Ogg for Vorbis, so skip it if so.
+                if(NOT OGG_LIBRARY)
+                    find_library(OGG_LIBRARY
+                        NAMES ogg Ogg OGG
+                        PATHS
+                            ENV OGGDIR
+                            ENV VORBISDIR
+                            ENV SPEEXDIR
+                            ENV SDLSOUNDDIR
+                            ENV SDLDIR
+                            /sw
+                            /opt/local
+                            /opt/csw
+                            /opt
+                        PATH_SUFFIXES lib
+                    )
+                    if(OGG_LIBRARY)
+                        set(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
+                    endif()
+                endif()
+            endif()
+
+            set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP} CACHE INTERNAL "SDL_sound and dependent libraries")
+        else()
+            set(SDL_SOUND_LIBRARIES ${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY} CACHE INTERNAL "SDL_sound and dependent libraries")
+        endif()
+    endif()
 endif()
 
 if(SDL_SOUND_INCLUDE_DIR AND EXISTS "${SDL_SOUND_INCLUDE_DIR}/SDL_sound.h")
@@ -376,7 +375,6 @@ if(SDL_SOUND_INCLUDE_DIR AND EXISTS "${SDL_SOUND_INCLUDE_DIR}/SDL_sound.h")
 endif()
 
 include(FindPackageHandleStandardArgs)
-
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_sound
-                                  REQUIRED_VARS SDL_SOUND_LIBRARY SDL_SOUND_INCLUDE_DIR
+                                  REQUIRED_VARS SDL_SOUND_LIBRARIES SDL_SOUND_INCLUDE_DIR
                                   VERSION_VAR SDL_SOUND_VERSION_STRING)
diff --git a/examples/alloopback.c b/examples/alloopback.c
index 649ef6ef..2361ada1 100644
--- a/examples/alloopback.c
+++ b/examples/alloopback.c
@@ -92,13 +92,15 @@ static ALuint CreateSineWave(void)
 }
 
 
-int main()
+int main(int argc, char *argv[])
 {
     PlaybackInfo playback = { NULL, NULL, 0 };
     SDL_AudioSpec desired, obtained;
     ALuint source, buffer;
     ALCint attrs[16];
     ALenum state;
+    (void)argc;
+    (void)argv;
 
     /* Print out error if extension is missing. */
     if(!alcIsExtensionPresent(NULL, "ALC_SOFT_loopback"))
@@ -167,6 +169,8 @@ int main()
 
     attrs[6] = 0; /* end of list */
 
+    playback.FrameSize = FramesToBytes(1, attrs[1], attrs[3]);
+
     /* Initialize OpenAL loopback device, using our format attributes. */
     playback.Device = alcLoopbackOpenDeviceSOFT(NULL);
     if(!playback.Device)
@@ -187,7 +191,6 @@ int main()
         fprintf(stderr, "Failed to set an OpenAL audio context\n");
         goto error;
     }
-    playback.FrameSize = FramesToBytes(1, attrs[1], attrs[3]);
 
     /* Start SDL playing. Our callback (thus alcRenderSamplesSOFT) will now
      * start being called regularly to update the AL playback state. */