Allow linking against system libraries for almost everything (#1790)

.gitignore

@@ -188,3 +188,4 @@ BuildLog.htm
 *.swp
 *.pc
 *.d
+.vscode/

CMake/CMakeMacros.cmake

@@ -7,18 +7,22 @@ endfunction()
 
 function(sm_append_simple_target_property target property str)
   get_target_property(current_property ${target} ${property})
-  if (current_property)
+  if(current_property)
     list(APPEND current_property ${str})
-    set_target_properties(${target} PROPERTIES ${property} "${current_property}")
+    set_target_properties(${target}
+                          PROPERTIES ${property} "${current_property}")
   else()
     set_target_properties(${target} PROPERTIES ${property} ${str})
   endif()
 endfunction()
 
-# Borrowed from http://stackoverflow.com/a/7172941/445373
+# Borrowed from http://stackoverflow.com/a/7172941/445373 TODO: Upgrade to cmake
-# TODO: Upgrade to cmake 3.x so that this function is not needed.
+# 3.x so that this function is not needed.
 function(sm_join values glue output)
-  string(REPLACE ";" "${glue}" _TMP_STR "${values}")
+  string(REPLACE ";"
+                 "${glue}"
+                 _TMP_STR
+                 "${values}")
   set(${output} "${_TMP_STR}" PARENT_SCOPE)
 endfunction()
 
@@ -28,20 +32,22 @@ endfunction()
 
 function(sm_add_compile_flag target flag)
   get_target_property(current_property ${target} COMPILE_FLAGS)
-  if (current_property)
+  if(current_property)
     set(current_property "${current_property} ${flag}")
-    set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${current_property}")
+    set_target_properties(${target}
+                          PROPERTIES COMPILE_FLAGS "${current_property}")
   else()
     set_target_properties(${target} PROPERTIES COMPILE_FLAGS ${flag})
   endif()
 endfunction()
 
 function(sm_add_link_flag target flag)
-  if (MSVC)
+  if(MSVC)
     # Use a modified form of sm_append_simple_target_property.
     get_target_property(current_property ${target} LINK_FLAGS)
-    if (current_property)
+    if(current_property)
-      set_target_properties(${target} PROPERTIES LINK_FLAGS "${current_property} ${flag}")
+      set_target_properties(${target}
+                            PROPERTIES LINK_FLAGS "${current_property} ${flag}")
     else()
       set_target_properties(${target} PROPERTIES LINK_FLAGS ${flag})
     endif()
@@ -51,25 +57,32 @@ function(sm_add_link_flag target flag)
 endfunction()
 
 function(disable_project_warnings projectName)
-  if (NOT WITH_EXTERNAL_WARNINGS)
+  if(NOT WITH_EXTERNAL_WARNINGS)
-    if (MSVC)
+    if(MSVC)
       sm_add_compile_flag(${projectName} "/W0")
     elseif(APPLE)
-      set_target_properties(${projectName} PROPERTIES XCODE_ATTRIBUTE_GCC_WARN_INHIBIT_ALL_WARNINGS "YES")
+      set_target_properties(
+        ${projectName}
+        PROPERTIES XCODE_ATTRIBUTE_GCC_WARN_INHIBIT_ALL_WARNINGS "YES")
     else()
       set_target_properties(${projectName} PROPERTIES COMPILE_FLAGS "-w")
     endif()
   endif()
 endfunction()
 
-macro(check_compile_features BIN_DIR SOURCE_FILE GREETER GREET_SUCCESS GREET_FAILURE TARGET_VAR ON_SUCCESS)
+macro(check_compile_features
+      BIN_DIR
+      SOURCE_FILE
+      GREETER
+      GREET_SUCCESS
+      GREET_FAILURE
+      TARGET_VAR
+      ON_SUCCESS)
   if(NOT DEFINED "${TARGET_VAR}")
     message(STATUS "${GREETER}")
-    try_compile(${TARGET_VAR} "${BIN_DIR}"
+    try_compile(${TARGET_VAR} "${BIN_DIR}" SOURCES "${SOURCE_FILE}")
-      SOURCES "${SOURCE_FILE}"
-    )
     if(${TARGET_VAR})
-      if (${ON_SUCCESS})
+      if(${ON_SUCCESS})
         message(STATUS "${GREETER} - ${GREET_SUCCESS}")
         set(${TARGET_VAR} 1 CACHE INTERNAL "${GREETER}")
       else()
@@ -100,9 +113,8 @@ macro(configure_msvc_runtime)
                 CMAKE_CXX_FLAGS_DEBUG
                 CMAKE_CXX_FLAGS_MINSIZEREL
                 CMAKE_CXX_FLAGS_RELEASE
-      CMAKE_CXX_FLAGS_RELWITHDEBINFO
+                CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    )
+    if(WITH_STATIC_LINKING)
-    if (WITH_STATIC_LINKING)
       set(TO_REPLACE "/MD")
       set(REPLACE_WITH "/MT")
     else()
@@ -110,8 +122,12 @@ macro(configure_msvc_runtime)
       set(REPLACE_WITH "/MD")
     endif()
     foreach(COMPILER_VARIABLE ${COMPILER_VARIABLES})
-      if (${COMPILER_VARIABLE} MATCHES "${TO_REPLACE}")
+      if(${COMPILER_VARIABLE} MATCHES "${TO_REPLACE}")
-        string(REGEX REPLACE "${TO_REPLACE}" "${REPLACE_WITH}" ${COMPILER_VARIABLE} "${${COMPILER_VARIABLE}}")
+        string(REGEX
+               REPLACE "${TO_REPLACE}"
+                       "${REPLACE_WITH}"
+                       ${COMPILER_VARIABLE}
+                       "${${COMPILER_VARIABLE}}")
       endif()
     endforeach()
   endif()

CMake/CPackSetup.cmake

@@ -17,9 +17,7 @@ set(CPACK_NSIS_URL_INFO_ABOUT "http://www.stepmania.com/")
 set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 set(CPACK_RESOURCE_FILE_README "${SM_ROOT_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${SM_CMAKE_DIR}/license_install.txt")
-set(CPACK_PACKAGE_EXECUTABLES
+set(CPACK_PACKAGE_EXECUTABLES "${SM_EXE_NAME}" "StepMania ${SM_VERSION_MAJOR}")
-  "${SM_EXE_NAME}" "StepMania ${SM_VERSION_MAJOR}" 
-)
 set(CPACK_NSIS_MUI_ICON "${SM_INSTALLER_DIR}/install.ico")
 set(CPACK_NSIS_MUI_UNIICON "${SM_INSTALLER_DIR}/uninstall.ico")
 set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
@@ -27,7 +25,8 @@ set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
 # Custom items for nsis go here.
 set(CPACK_SM_NSIS_REPOSITORY "https://github.com/stepmania/stepmania")
 set(CPACK_SM_NSIS_ROOT_DIR "${SM_ROOT_DIR}")
-set(CPACK_SM_NSIS_PRODUCT_ID "StepMania ${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
+set(CPACK_SM_NSIS_PRODUCT_ID
+    "StepMania ${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
 set(CPACK_SM_NSIS_PRODUCT_VERSION "${SM_VERSION_TRADITIONAL}.0")
 set(CPACK_SM_NSIS_HEADER_BITMAP "${SM_INSTALLER_DIR}/header-sm5.bmp")
 set(CPACK_SM_NSIS_WELCOME_BITMAP "${SM_INSTALLER_DIR}/welcome-sm5.bmp")
@@ -35,16 +34,24 @@ set(CPACK_SM_NSIS_GIT_VERSION "${SM_VERSION_GIT}")
 
 if(WIN32)
   # The header and welcome bitmaps require backslashes.
-  string(REGEX REPLACE "/" "\\\\\\\\" CPACK_SM_NSIS_HEADER_BITMAP "${CPACK_SM_NSIS_HEADER_BITMAP}")
+  string(REGEX
-  string(REGEX REPLACE "/" "\\\\\\\\" CPACK_SM_NSIS_WELCOME_BITMAP "${CPACK_SM_NSIS_WELCOME_BITMAP}")
+         REPLACE "/"
+                 "\\\\\\\\"
+                 CPACK_SM_NSIS_HEADER_BITMAP
+                 "${CPACK_SM_NSIS_HEADER_BITMAP}")
+  string(REGEX
+         REPLACE "/"
+                 "\\\\\\\\"
+                 CPACK_SM_NSIS_WELCOME_BITMAP
+                 "${CPACK_SM_NSIS_WELCOME_BITMAP}")
 
   set(CPACK_PACKAGE_FILE_NAME "${SM_EXE_NAME}-${NSIS_VERSION_FINAL}-win32")
-  # By setting these install keys manually,
+  # By setting these install keys manually, The default directory of "StepMania
-  # The default directory of "StepMania major.minor.patch" is lost.
+  # major.minor.patch" is lost. This is currently done to maintain backwards
-  # This is currently done to maintain backwards compatibility.
+  # compatibility. However, removing these two will allow for multiple versions
-  # However, removing these two will allow for multiple versions of StepMania
+  # of StepMania to be installed relatively cleanly.
-  # to be installed relatively cleanly.
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY
-  set(CPACK_PACKAGE_INSTALL_DIRECTORY "StepMania ${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
+      "StepMania ${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
   set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "StepMania ${SM_VERSION_MAJOR}")
   set(CPACK_NSIS_EXECUTABLES_DIRECTORY "Program")
   set(CPACK_NSIS_INSTALL_ROOT "C:\\\\Games")

CMake/DefineOptions.cmake

@@ -4,32 +4,41 @@
 option(WITH_NETWORKING "Build with networking support." ON)
 
 # This option quiets warnings that are a part of external projects.
-option(WITH_EXTERNAL_WARNINGS "Build with warnings for all components, not just StepMania." OFF)
+option(WITH_EXTERNAL_WARNINGS
+       "Build with warnings for all components, not just StepMania." OFF)
 
 # This option is not yet working, but will likely default to ON in the future.
-option(WITH_LTO "Build with Link Time Optimization (LTO)/Whole Program Optimization." OFF)
+option(WITH_LTO
+       "Build with Link Time Optimization (LTO)/Whole Program Optimization."
+       OFF)
 
 # This option handles if we use SSE2 processing.
 option(WITH_SSE2 "Build with SSE2 Optimizations." ON)
 
-# This option may go away in the future: if it does, JPEG will always be required.
+# This option may go away in the future: if it does, JPEG will always be
+# required.
 option(WITH_JPEG "Build with JPEG Image Support." ON)
 
 # Turn this on to set this to a specific release mode.
 option(WITH_FULL_RELEASE "Build as a proper, full release." OFF)
 
-# Turn this on to compile tomcrypt with no assembly data. This is a portable mode.
+# Turn this on to compile tomcrypt with no assembly data. This is a portable
-option(WITH_PORTABLE_TOMCRYPT "Build with assembly/free tomcrypt, making it portable." ON)
+# mode.
+option(WITH_PORTABLE_TOMCRYPT
+       "Build with assembly/free tomcrypt, making it portable." ON)
 
-# Turn this on to not use the ROLC assembly featurs of tomcrypt.
+# Turn this on to not use the ROLC assembly featurs of tomcrypt. If
-# If WITH_PORTABLE_TOMCRYPT is ON, this will automatically have no effect.
+# WITH_PORTABLE_TOMCRYPT is ON, this will automatically have no effect.
-option(WITH_NO_ROLC_TOMCRYPT "Build without the ROLC assembly instructions for tomcrypt. (Ignored by Apple builds)" OFF)
+option(
+  WITH_NO_ROLC_TOMCRYPT
+  "Build without the ROLC assembly instructions for tomcrypt."
+  OFF)
 
 # Turn this option off to not use the GPL exclusive components.
 option(WITH_GPL_LIBS "Build with GPL libraries." ON)
 
-# Turn this option off to disable using WAV files with the game.
+# Turn this option off to disable using WAV files with the game. Note that it is
-# Note that it is recommended to keep this on.
+# recommended to keep this on.
 option(WITH_WAV "Build with WAV Support." ON)
 
 # Turn this option off to disable using MP3 files with the game.
@@ -39,27 +48,49 @@ option(WITH_MP3 "Build with MP3 Support." ON)
 option(WITH_OGG "Build with OGG/Vorbis Support." ON)
 
 # Turn this option on to log every segment added or removed.
-option(WITH_LOGGING_TIMING_DATA "Build with logging all Add and Erase Segment calls." OFF)
+option(WITH_LOGGING_TIMING_DATA
+       "Build with logging all Add and Erase Segment calls." OFF)
+
+option(WITH_SYSTEM_PNG "Build with system PNG library (may not work on 1.6+)"
+       OFF)
+option(WITH_SYSTEM_OGG "Build with system OGG libraries" OFF)
+option(WITH_SYSTEM_GLEW "Build with system GLEW library" OFF)
+option(WITH_SYSTEM_TOMMATH "Build with system libtommath" OFF)
+option(WITH_SYSTEM_TOMCRYPT "Build with system libtomcrypt" OFF)
+option(WITH_SYSTEM_MAD "Build with system libmad" OFF)
+option(WITH_SYSTEM_JSONCPP "Build with system jsoncpp" OFF)
+option(WITH_SYSTEM_JPEG "Build with system jpeglib" OFF)
+option(WITH_SYSTEM_PCRE "Build with system PCRE" OFF)
+option(WITH_SYSTEM_ZLIB "Build against system zlib" OFF)
+
+option(WITH_SDL "Build with SDL" OFF)
 
 if(NOT MSVC)
   # Turn this option off to disable using FFMEPG.
   option(WITH_FFMPEG "Build with FFMPEG." ON)
-  # Change this number to utilize a different number of jobs for building FFMPEG.
+  # Change this number to utilize a different number of jobs for building
+  # FFMPEG.
   option(WITH_FFMPEG_JOBS "Build FFMPEG with this many jobs." 2)
 else()
   # Turn this option on to enable using the Texture Font Generator.
-  option(WITH_TEXTURE_GENERATOR "Build with the Texture Font Generator. Ensure the MFC library is installed." OFF)
+  option(
+    WITH_TEXTURE_GENERATOR
+    "Build with the Texture Font Generator. Ensure the MFC library is installed."
+    OFF)
   # Turn this option off to use dynamic linking instead of static linking.
   option(WITH_STATIC_LINKING "Build StepMania with static linking." ON)
 endif()
 
 if(WIN32)
   option(WITH_MINIMAID "Build with Minimaid Lights Support." OFF)
-  # Developer only option: connect to IRC to report the result. Only use with build servers.
+  # Developer only option: connect to IRC to report the result. Only use with
+  # build servers.
   option(WITH_IRC_POST_HOOK "Report via IRC of the success afterwards." OFF)
 elseif(LINUX)
   # Builder beware: later versions of ffmpeg may break!
-    option(WITH_SYSTEM_FFMPEG "Build with the system's FFMPEG, disabled build with bundled's FFMPEG" OFF)
+  option(WITH_SYSTEM_FFMPEG
+         "Build with the system's FFMPEG, disabled build with bundled's FFMPEG"
+         OFF)
   option(WITH_CRYSTALHD_DISABLED "Build FFMPEG without Crystal HD support." OFF)
   option(WITH_MINIMAID "Build with Minimaid Lights Support." OFF)
   option(WITH_TTY "Build with Linux TTY Input Support." OFF)
@@ -68,5 +99,12 @@ elseif(LINUX)
   option(WITH_GTK2 "Build with GTK2 Support." ON)
   option(WITH_PARALLEL_PORT "Build with Parallel Lights I/O Support." OFF)
   option(WITH_CRASH_HANDLER "Build with Crash Handler Support." ON)
-    option(WITH_XINERAMA "Build using libXinerama to query for monitor numbers (if available)." ON)
+  option(WITH_XINERAMA
+         "Build using libXinerama to query for monitor numbers (if available)."
+         ON)
+  option(WITH_ALSA "Build with ALSA support" ON)
+  option(WITH_PULSEAUDIO "Build with PulseAudio support" OFF)
+  option(WITH_JACK "Build with JACK support" OFF)
+  option(WITH_XRANDR "Build with Xrandr support" ON)
+  option(WITH_X11 "Build with X11 support" ON)
 endif()

CMake/Modules/FindDirectX.cmake

@@ -1,9 +1,7 @@
-# From the CMake wiki, get the DirectX version needed.
+# From the CMake wiki, get the DirectX version needed. This assumes default
-# This assumes default directories.
+# directories.
 
-# Once loaded, the following are defined:
+# Once loaded, the following are defined: DIRECTX_FOUND DIRECTX_INCLUDE_DIR
-#  DIRECTX_FOUND
-#  DIRECTX_INCLUDE_DIR
 # DIRECTX_LIBRARIES
 
 if(NOT WIN32)
@@ -16,28 +14,27 @@ endif()
 
 set(DIRECTX_INCLUDE_SEARCH_PATHS
     # TODO: Do not be limited to x86 in the future.
-  "$ENV{DXSDK_DIR}/Include"
+    "$ENV{DXSDK_DIR}/Include")
-)
 
 set(DIRECTX_LIBRARY_SEARCH_PATHS
     # TODO: Do not be limited to x86 in the future.
-  "$ENV{DXSDK_DIR}/Lib/x86"
+    "$ENV{DXSDK_DIR}/Lib/x86")
-)
 
 find_path(DIRECTX_INCLUDE_DIR
           NAMES "DxErr.h"
           PATHS ${DIRECTX_INCLUDE_SEARCH_PATHS}
-  DOC "Where can DxErr.h be found?"
+          DOC "Where can DxErr.h be found?")
-)
 
 find_library(DIRECTX_LIBRARIES
              NAMES "DxErr.lib" "d3dx9.lib"
              PATHS ${DIRECTX_LIBRARY_SEARCH_PATHS}
-  DOC "Where can the DX libraries be found?"
+             DOC "Where can the DX libraries be found?")
-)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DIRECTX DEFAULT_MSG DIRECTX_INCLUDE_DIR DIRECTX_LIBRARIES)
+find_package_handle_standard_args(DIRECTX
+                                  DEFAULT_MSG
+                                  DIRECTX_INCLUDE_DIR
+                                  DIRECTX_LIBRARIES)
 
 if(DIRECTX_FOUND)
   mark_as_advanced(DIRECTX_INCLUDE_DIR DIRECTX_LIBRARIES)

CMake/Modules/FindDl.cmake

@@ -1,24 +1,18 @@
 # Stick to traditional approaches here. The following are defined.
 
-# DL_FOUND - The system has the dl library.
+# DL_FOUND - The system has the dl library. DL_INCLUDE_DIR - The dl include
-# DL_INCLUDE_DIR - The dl include directory.
+# directory. DL_LIBRARIES - The library file to link to.
-# DL_LIBRARIES - The library file to link to.
 
-if (DL_INCLUDE_DIR AND DL_LIBRARIES)
+if(DL_INCLUDE_DIR AND DL_LIBRARIES)
   # Already in cache, so don't repeat the finding procedures.
   set(DL_FIND_QUIETLY TRUE)
 endif()
 
-find_path(DL_INCLUDE_DIR dlfcn.h
+find_path(DL_INCLUDE_DIR dlfcn.h PATHS /usr/local/include /usr/include)
-  PATHS /usr/local/include /usr/include
-)
 
-find_library(DL_LIBRARIES dl
+find_library(DL_LIBRARIES dl PATHS /usr/local/lib /usr/lib /lib)
-  PATHS /usr/local/lib /usr/lib /lib
-)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(DL DEFAULT_MSG DL_LIBRARIES DL_INCLUDE_DIR)
 
 mark_as_advanced(DL_INCLUDE_DIR DL_LIBRARIES)
-

CMake/Modules/FindFFMPEG.cmake

@@ -1,133 +1,122 @@
 # This was copied from the robotology/ycm project.
 
-#.rst:
+# .rst: FindFFMPEG
-# FindFFMPEG
 # ----------
 #
 # Find the native FFMPEG includes and library
 #
 # This module defines::
 #
-#  FFMPEG_INCLUDE_DIR, where to find avcodec.h, avformat.h ...
+# FFMPEG_INCLUDE_DIR, where to find avcodec.h, avformat.h ... FFMPEG_LIBRARIES,
-#  FFMPEG_LIBRARIES, the libraries to link against to use FFMPEG.
+# the libraries to link against to use FFMPEG. FFMPEG_FOUND, If false, do not
-#  FFMPEG_FOUND, If false, do not try to use FFMPEG.
+# try to use FFMPEG.
 #
 # also defined, but not for general use are::
 #
 # FFMPEG_avformat_LIBRARY, where to find the FFMPEG avformat library.
 # FFMPEG_avcodec_LIBRARY, where to find the FFMPEG avcodec library.
 #
-# This is useful to do it this way so that we can always add more libraries
+# This is useful to do it this way so that we can always add more libraries if
-# if needed to ``FFMPEG_LIBRARIES`` if ffmpeg ever changes...
+# needed to ``FFMPEG_LIBRARIES`` if ffmpeg ever changes...
 
-#=============================================================================
+# =============================================================================
 # Copyright: 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen
 #
-# Distributed under the OSI-approved BSD License (the "License");
+# Distributed under the OSI-approved BSD License (the "License"); see
-# see accompanying file Copyright.txt for details.
+# accompanying file Copyright.txt for details.
 #
-# This software is distributed WITHOUT ANY WARRANTY; without even the
+# This software is distributed WITHOUT ANY WARRANTY; without even the implied
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# See the License for more information.
+# License for more information.
-#=============================================================================
+# =============================================================================
-# (To distribute this file outside of YCM, substitute the full
+# (To distribute this file outside of YCM, substitute the full License text for
-#  License text for the above reference.)
+# the above reference.)
 
 # Originally from VTK project
 
-
+find_path(FFMPEG_INCLUDE_DIR
-find_path(FFMPEG_INCLUDE_DIR libavformat/avformat.h
+          libavformat/avformat.h
           $ENV{FFMPEG_DIR}
           $ENV{FFMPEG_DIR}/ffmpeg
           $ENV{FFMPEG_DIR}/include/ffmpeg
           /usr/local/include/ffmpeg
           /usr/include/ffmpeg
           /usr/include/
-  /usr/local/include/
+          /usr/local/include/)
-)
 
-find_library(FFMPEG_avformat_LIBRARY avformat
+find_library(FFMPEG_avformat_LIBRARY
+             avformat
              $ENV{FFMPEG_DIR}
              $ENV{FFMPEG_DIR}/lib
              $ENV{FFMPEG_DIR}/libavformat
              /usr/local/lib
-  /usr/lib
+             /usr/lib)
-)
 
-find_library(FFMPEG_avcodec_LIBRARY avcodec
+find_library(FFMPEG_avcodec_LIBRARY
+             avcodec
              $ENV{FFMPEG_DIR}
              $ENV{FFMPEG_DIR}/lib
              $ENV{FFMPEG_DIR}/libavcodec
              /usr/local/lib
-  /usr/lib
+             /usr/lib)
-)
 
-find_library(FFMPEG_avutil_LIBRARY avutil
+find_library(FFMPEG_avutil_LIBRARY
+             avutil
              $ENV{FFMPEG_DIR}
              $ENV{FFMPEG_DIR}/lib
              $ENV{FFMPEG_DIR}/libavutil
              /usr/local/lib
-  /usr/lib
+             /usr/lib)
-)
 
 if(NOT DISABLE_SWSCALE)
-  find_library(FFMPEG_swscale_LIBRARY swscale
+  find_library(FFMPEG_swscale_LIBRARY
+               swscale
                $ENV{FFMPEG_DIR}
                $ENV{FFMPEG_DIR}/lib
                $ENV{FFMPEG_DIR}/libswscale
                /usr/local/lib
-    /usr/lib
+               /usr/lib)
-  )
 endif(NOT DISABLE_SWSCALE)
 
-find_library(FFMPEG_avdevice_LIBRARY avdevice
+find_library(FFMPEG_avdevice_LIBRARY
+             avdevice
              $ENV{FFMPEG_DIR}
              $ENV{FFMPEG_DIR}/lib
              $ENV{FFMPEG_DIR}/libavdevice
              /usr/local/lib
-  /usr/lib
+             /usr/lib)
-)
 
-find_library(_FFMPEG_z_LIBRARY_ z
+find_library(_FFMPEG_z_LIBRARY_
+             z
              $ENV{FFMPEG_DIR}
              $ENV{FFMPEG_DIR}/lib
              /usr/local/lib
-  /usr/lib
+             /usr/lib)
-)
-
-
 
 if(FFMPEG_INCLUDE_DIR)
   if(FFMPEG_avformat_LIBRARY)
     if(FFMPEG_avcodec_LIBRARY)
       if(FFMPEG_avutil_LIBRARY)
         set(FFMPEG_FOUND "YES")
-        set(FFMPEG_LIBRARIES ${FFMPEG_avformat_LIBRARY}
+        set(FFMPEG_LIBRARIES
+            ${FFMPEG_avformat_LIBRARY}
             ${FFMPEG_avcodec_LIBRARY}
-                             ${FFMPEG_avutil_LIBRARY}
+            ${FFMPEG_avutil_LIBRARY})
-          )
         if(FFMPEG_swscale_LIBRARY)
-          set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES}
+          set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_swscale_LIBRARY})
-                               ${FFMPEG_swscale_LIBRARY}
-          )
         endif()
         if(FFMPEG_avdevice_LIBRARY)
-          set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES}
+          set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_avdevice_LIBRARY})
-                               ${FFMPEG_avdevice_LIBRARY}
-          )
         endif()
         if(_FFMPEG_z_LIBRARY_)
-          set( FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES}
+          set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${_FFMPEG_z_LIBRARY_})
-                                ${_FFMPEG_z_LIBRARY_}
-          )
         endif()
       endif()
     endif()
   endif()
 endif()
 
-mark_as_advanced(
+mark_as_advanced(FFMPEG_INCLUDE_DIR
-  FFMPEG_INCLUDE_DIR
                  FFMPEG_INCLUDE_DIR1
                  FFMPEG_INCLUDE_DIR2
                  FFMPEG_INCLUDE_DIR3
@@ -138,11 +127,15 @@ mark_as_advanced(
                  FFMPEG_avutil_LIBRARY
                  FFMPEG_swscale_LIBRARY
                  FFMPEG_avdevice_LIBRARY
-  _FFMPEG_z_LIBRARY_
+                 _FFMPEG_z_LIBRARY_)
-  )
 
 # Set package properties if FeatureSummary was included
 if(COMMAND set_package_properties)
-  set_package_properties(FFMPEG PROPERTIES DESCRIPTION "A complete, cross-platform solution to record, convert and stream audio and video")
+  set_package_properties(
+    FFMPEG
+    PROPERTIES
+    DESCRIPTION
+    "A complete, cross-platform solution to record, convert and stream audio and video"
+    )
   set_package_properties(FFMPEG PROPERTIES URL "http://ffmpeg.org/")
 endif()

CMake/Modules/FindIconv.cmake

@@ -1,12 +1,12 @@
-# Borrowed from https://github.com/onyx-intl/cmake_modules/blob/master/FindIconv.cmake
+# Borrowed from https://github.com/onyx-
+# intl/cmake_modules/blob/master/FindIconv.cmake
 
 # Find Iconv on the system. When this is done, the following are defined:
 
-# ICONV_FOUND - The system has Iconv.
+# ICONV_FOUND - The system has Iconv. ICONV_INCLUDE_DIR - The Iconv include
-# ICONV_INCLUDE_DIR - The Iconv include directory.
+# directory. ICONV_LIBRARIES - The library file to link to.
-# ICONV_LIBRARIES - The library file to link to.
 
-if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+if(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
   # Already in cache, so don't repeat the finding procedures.
   set(ICONV_FIND_QUIETLY TRUE)
 endif()
@@ -16,7 +16,9 @@ set(ICONV_NAMES ${ICONV_NAMES} iconv libiconv libiconv-2 c)
 find_library(ICONV_LIBRARIES NAMES ${ICONV_NAMES})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ICONV DEFAULT_MSG ICONV_LIBRARIES ICONV_INCLUDE_DIR)
+find_package_handle_standard_args(ICONV
+                                  DEFAULT_MSG
+                                  ICONV_LIBRARIES
+                                  ICONV_INCLUDE_DIR)
 
 mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARIES)
-

CMake/Modules/FindJACK.cmake

@@ -1,75 +1,64 @@
 # This was borrowed from the gnuradio repository.
 
-# - Try to find jack-2.6
+# * Try to find jack-2.6 Once done this will define
-# Once done this will define
 #
-#  JACK_FOUND - system has jack
+# JACK_FOUND - system has jack JACK_INCLUDE_DIRS - the jack include directory
-#  JACK_INCLUDE_DIRS - the jack include directory
+# JACK_LIBRARIES - Link these to use jack JACK_DEFINITIONS - Compiler switches
-#  JACK_LIBRARIES - Link these to use jack
+# required for using jack
-#  JACK_DEFINITIONS - Compiler switches required for using jack
 #
-#  Copyright (c) 2008 Andreas Schneider <[email protected]>
+# Copyright (c) 2008 Andreas Schneider <[email protected]> Modified for other
-#  Modified for other libraries by Lasse Kärkkäinen <tronic>
+# libraries by Lasse Kärkkäinen <tronic>
 #
-#  Redistribution and use is allowed according to the terms of the New
+# Redistribution and use is allowed according to the terms of the New BSD
-#  BSD license.
+# license. For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
-if (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+if(JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
   # in cache already
   set(JACK_FOUND TRUE)
-else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+else(JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
-  # use pkg-config to get the directories and then use these values
+  # use pkg-config to get the directories and then use these values in the
-  # in the FIND_PATH() and FIND_LIBRARY() calls
+  # FIND_PATH() and FIND_LIBRARY() calls
-  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
     include(UsePkgConfig)
     pkgconfig(jack _JACK_INCLUDEDIR _JACK_LIBDIR _JACK_LDFLAGS _JACK_CFLAGS)
-  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  else(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
     find_package(PkgConfig)
-    if (PKG_CONFIG_FOUND)
+    if(PKG_CONFIG_FOUND)
       pkg_check_modules(_JACK jack)
-    endif (PKG_CONFIG_FOUND)
+    endif(PKG_CONFIG_FOUND)
-  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  endif(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
   find_path(JACK_INCLUDE_DIR
-    NAMES
+            NAMES jack/jack.h
-      jack/jack.h
+            PATHS ${_JACK_INCLUDEDIR}
-    PATHS
-      ${_JACK_INCLUDEDIR}
                   /usr/include
                   /usr/local/include
                   /opt/local/include
-      /sw/include
+                  /sw/include)
-  )
 
   find_library(JACK_LIBRARY
-    NAMES
+               NAMES jack
-      jack
+               PATHS ${_JACK_LIBDIR}
-    PATHS
-      ${_JACK_LIBDIR}
                      /usr/lib
                      /usr/local/lib
                      /opt/local/lib
-      /sw/lib
+                     /sw/lib)
-  )
 
-  if (JACK_LIBRARY AND JACK_INCLUDE_DIR)	
+  if(JACK_LIBRARY AND JACK_INCLUDE_DIR)
     set(JACK_FOUND TRUE)
 
-    set(JACK_INCLUDE_DIRS	
+    set(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR})
-      ${JACK_INCLUDE_DIR}	
-    )
 
-    set(JACK_LIBRARIES
+    set(JACK_LIBRARIES ${JACK_LIBRARIES} ${JACK_LIBRARY})
-      ${JACK_LIBRARIES}
-      ${JACK_LIBRARY}
-    )
 
-  endif (JACK_LIBRARY AND JACK_INCLUDE_DIR)
+  endif(JACK_LIBRARY AND JACK_INCLUDE_DIR)
 
   include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(JACK DEFAULT_MSG
+  find_package_handle_standard_args(JACK
-    JACK_INCLUDE_DIRS JACK_LIBRARIES)
+                                    DEFAULT_MSG
+                                    JACK_INCLUDE_DIRS
+                                    JACK_LIBRARIES)
 
-  # show the JACK_INCLUDE_DIRS and JACK_LIBRARIES variables only in the advanced view
+  # show the JACK_INCLUDE_DIRS and JACK_LIBRARIES variables only in the advanced
+  # view
   mark_as_advanced(JACK_INCLUDE_DIRS JACK_LIBRARIES)
-endif (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+endif(JACK_LIBRARIES AND JACK_INCLUDE_DIRS)

CMake/Modules/FindMad.cmake

@@ -3,7 +3,9 @@ find_path(LIBMAD_INCLUDE_DIR mad.h)
 find_library(LIBMAD_LIBRARY mad)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LIBMAD DEFAULT_MSG LIBMAD_LIBRARY LIBMAD_INCLUDE_DIR)
+find_package_handle_standard_args(LIBMAD
+                                  DEFAULT_MSG
+                                  LIBMAD_LIBRARY
+                                  LIBMAD_INCLUDE_DIR)
 
 mark_as_advanced(LIBMAD_LIBRARY LIBMAD_INCLUDE_DIR)
-

CMake/Modules/FindOSS.cmake

@@ -1,24 +1,19 @@
-# Copied from marsyas, which is also copied from fqterm.
+# Copied from marsyas, which is also copied from fqterm. Further modifications
-# Further modifications are done.
+# are done.
 
-IF(UNIX)
+if(UNIX)
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    SET(OSS_HDR_NAME "linux/soundcard.h")
+    set(OSS_HDR_NAME "linux/soundcard.h")
-  ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  else(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+    if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-      SET(OSS_HDR_NAME "sys/soundcard.h")
+      set(OSS_HDR_NAME "sys/soundcard.h")
-    ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+    endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-ENDIF(UNIX)
+endif(UNIX)
 
-FIND_PATH(OSS_INCLUDE_DIR "${OSS_HDR_NAME}"
+find_path(OSS_INCLUDE_DIR "${OSS_HDR_NAME}" "/usr/include" "/usr/local/include")
-  "/usr/include" "/usr/local/include"
-)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OSS DEFAULT_MSG OSS_INCLUDE_DIR)
 
-MARK_AS_ADVANCED (
+mark_as_advanced(OSS_FOUND OSS_INCLUDE_DIR)
-  OSS_FOUND
-  OSS_INCLUDE_DIR
-)

CMake/Modules/FindOgg.cmake

@@ -1,17 +1,15 @@
 # Borrowed from code.openhub.net
 
-# Base Io build system
+# Base Io build system Written by Jeremy Tregunna <[email protected]>
-# Written by Jeremy Tregunna <[email protected]>
 #
 # Find libogg.
 
-FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
+find_path(OGG_INCLUDE_DIR ogg/ogg.h)
 
-SET(OGG_NAMES ${OGG_NAMES} ogg libogg)
+set(OGG_NAMES ${OGG_NAMES} ogg libogg)
-FIND_LIBRARY(OGG_LIBRARY NAMES ${OGG_NAMES} PATH)
+find_library(OGG_LIBRARY NAMES ${OGG_NAMES} PATH)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
+find_package_handle_standard_args(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
 
 mark_as_advanced(OGG_LIBRARY OGG_INCLUDE_DIR)
-

CMake/Modules/FindPcre.cmake

@@ -2,16 +2,16 @@
 
 # The following will be set:
 
-# PCRE_INCLUDE_DIR
+# PCRE_INCLUDE_DIR PCRE_LIBRARY PCRE_FOUND
-# PCRE_LIBRARY
-# PCRE_FOUND
 
 find_path(PCRE_INCLUDE_DIR NAMES pcre.h)
 find_library(PCRE_LIBRARY NAMES pcre)
 
 # Properly pass QUIETLY and REQUIRED.
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_LIBRARY)
+find_package_handle_standard_args(PCRE
+                                  DEFAULT_MSG
+                                  PCRE_INCLUDE_DIR
+                                  PCRE_LIBRARY)
 
 mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARY)
-

CMake/Modules/FindPulseAudio.cmake

@@ -4,9 +4,9 @@
 #
 # Once done this will define:
 #
-#  PULSEAUDIO_FOUND - system has the PulseAudio library
+# PULSEAUDIO_FOUND - system has the PulseAudio library PULSEAUDIO_INCLUDE_DIR -
-#  PULSEAUDIO_INCLUDE_DIR - the PulseAudio include directory
+# the PulseAudio include directory PULSEAUDIO_LIBRARY - the libraries needed to
-#  PULSEAUDIO_LIBRARY - the libraries needed to use PulseAudio
+# use PulseAudio
 #
 # Copyright (c) 2008, Matthias Kretz, <[email protected]>
 #
@@ -15,33 +15,36 @@
 #
 # There was no COPYING-CMAKE-SCRIPTS file in the repo in question. --wolfman
 
-if (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
+if(PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
   # Already in cache, be silent
   set(PULSEAUDIO_FIND_QUIETLY TRUE)
-endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
+endif(PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
 
-if (NOT WIN32)
+if(NOT WIN32)
   include(FindPkgConfig)
   pkg_check_modules(PULSEAUDIO libpulse)
   if(PULSEAUDIO_FOUND)
-      set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
+    set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES}
-      set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
+        CACHE FILEPATH "Path to the PulseAudio library")
+    set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR}
+        CACHE PATH "Path to the PulseAudio includes")
     # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
     # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
   endif(PULSEAUDIO_FOUND)
-endif (NOT WIN32)
+endif(NOT WIN32)
 
-if (NOT PULSEAUDIO_INCLUDE_DIR)
+if(NOT PULSEAUDIO_INCLUDE_DIR)
-   FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h)
+  find_path(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h)
-endif (NOT PULSEAUDIO_INCLUDE_DIR)
+endif(NOT PULSEAUDIO_INCLUDE_DIR)
 
-if (NOT PULSEAUDIO_LIBRARY)
+if(NOT PULSEAUDIO_LIBRARY)
-   FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse)
+  find_library(PULSEAUDIO_LIBRARY NAMES pulse)
-endif (NOT PULSEAUDIO_LIBRARY)
+endif(NOT PULSEAUDIO_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PULSEAUDIO DEFAULT_MSG
+find_package_handle_standard_args(PULSEAUDIO
-  PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY)
+                                  DEFAULT_MSG
+                                  PULSEAUDIO_INCLUDE_DIR
+                                  PULSEAUDIO_LIBRARY)
 
 mark_as_advanced(PULSEAUDIO_INCLUDE_DIR PULSEAUDIO_LIBRARY)
-

CMake/Modules/FindVa.cmake

@@ -2,9 +2,7 @@
 
 # The following will be set:
 
-# VA_INCLUDE_DIR
+# VA_INCLUDE_DIR VA_LIBRARY VA_FOUND
-# VA_LIBRARY
-# VA_FOUND
 
 find_path(VA_INCLUDE_DIR NAMES va/va.h)
 
@@ -12,6 +10,6 @@ set(VA_NAMES "${VA_NAMES}" "va" "libva")
 find_library(VA_LIBRARY NAMES ${VA_NAMES})
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VA DEFAULT_MSG VA_LIBRARY VA_INCLUDE_DIR)
+find_package_handle_standard_args(VA DEFAULT_MSG VA_LIBRARY VA_INCLUDE_DIR)
 
 mark_as_advanced(VA_LIBRARY VA_INCLUDE_DIR)

CMake/Modules/FindVorbis.cmake

@@ -1,17 +1,18 @@
 # Borrowed from code.openhub.net
 
-# Base Io build system
+# Base Io build system Written by Jeremy Tregunna <[email protected]>
-# Written by Jeremy Tregunna <[email protected]>
 #
 # Find libvorbis.
 
-FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h)
+find_path(VORBIS_INCLUDE_DIR vorbis/codec.h)
 
-SET(VORBIS_NAMES ${VORBIS_NAMES} vorbis libvorbis)
+set(VORBIS_NAMES ${VORBIS_NAMES} vorbis libvorbis)
-FIND_LIBRARY(VORBIS_LIBRARY NAMES ${VORBIS_NAMES} PATH)
+find_library(VORBIS_LIBRARY NAMES ${VORBIS_NAMES} PATH)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG VORBIS_LIBRARY VORBIS_INCLUDE_DIR)
+find_package_handle_standard_args(VORBIS
+                                  DEFAULT_MSG
+                                  VORBIS_LIBRARY
+                                  VORBIS_INCLUDE_DIR)
 
 mark_as_advanced(VORBIS_LIBRARY VORBIS_INCLUDE_DIR)
-

CMake/Modules/FindVorbisFile.cmake

@@ -2,13 +2,15 @@
 #
 # Find libvorbisfile.
 
-FIND_PATH(VORBISFILE_INCLUDE_DIR vorbis/vorbisfile.h)
+find_path(VORBISFILE_INCLUDE_DIR vorbis/vorbisfile.h)
 
-SET(VORBISFILE_NAMES ${VORBISFILE_NAMES} vorbisfile libvorbisfile)
+set(VORBISFILE_NAMES ${VORBISFILE_NAMES} vorbisfile libvorbisfile)
-FIND_LIBRARY(VORBISFILE_LIBRARY NAMES ${VORBISFILE_NAMES} PATH)
+find_library(VORBISFILE_LIBRARY NAMES ${VORBISFILE_NAMES} PATH)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBISFILE DEFAULT_MSG VORBISFILE_LIBRARY VORBISFILE_INCLUDE_DIR)
+find_package_handle_standard_args(VORBISFILE
+                                  DEFAULT_MSG
+                                  VORBISFILE_LIBRARY
+                                  VORBISFILE_INCLUDE_DIR)
 
 mark_as_advanced(VORBISFILE_LIBRARY VORBISFILE_INCLUDE_DIR)
-

CMake/Modules/FindXinerama.cmake

@@ -1,52 +1,52 @@
-# This is borrowed from FreeRDP.
+# This is borrowed from FreeRDP. - Find XINERAMA Find the XINERAMA libraries
-# - Find XINERAMA
-# Find the XINERAMA libraries
 #
-#  This module defines the following variables:
+# This module defines the following variables: XINERAMA_FOUND        - true if
-#     XINERAMA_FOUND        - true if XINERAMA_INCLUDE_DIR & XINERAMA_LIBRARY are found
+# XINERAMA_INCLUDE_DIR & XINERAMA_LIBRARY are found XINERAMA_LIBRARIES    - Set
-#     XINERAMA_LIBRARIES    - Set when XINERAMA_LIBRARY is found
+# when XINERAMA_LIBRARY is found XINERAMA_INCLUDE_DIRS - Set when
-#     XINERAMA_INCLUDE_DIRS - Set when XINERAMA_INCLUDE_DIR is found
+# XINERAMA_INCLUDE_DIR is found
 #
-#     XINERAMA_INCLUDE_DIR  - where to find Xinerama.h, etc.
+# XINERAMA_INCLUDE_DIR  - where to find Xinerama.h, etc. XINERAMA_LIBRARY      -
-#     XINERAMA_LIBRARY      - the XINERAMA library
+# the XINERAMA library
 #
 
-#=============================================================================
+# =============================================================================
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 O.S. Systems Software Ltda. Copyright 2011 Otavio Salvador
-# Copyright 2011 Otavio Salvador <[email protected]>
+# <[email protected]> Copyright 2011 Marc-Andre Moreau
-# Copyright 2011 Marc-Andre Moreau <[email protected]>
+# <[email protected]>
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# you may not use this file except in compliance with the License.
+# use this file except in compliance with the License. You may obtain a copy of
-# You may obtain a copy of the License at
+# the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# See the License for the specific language governing permissions and
+# License for the specific language governing permissions and limitations under
-# limitations under the License.
+# the License.
-#=============================================================================
+# =============================================================================
 
-find_path(XINERAMA_INCLUDE_DIR NAMES X11/extensions/Xinerama.h
+find_path(XINERAMA_INCLUDE_DIR
+          NAMES X11/extensions/Xinerama.h
           PATHS /opt/X11/include
           PATH_SUFFIXES X11/extensions
-          DOC "The Xinerama include directory"
+          DOC "The Xinerama include directory")
-)
 
-find_library(XINERAMA_LIBRARY NAMES Xinerama
+find_library(XINERAMA_LIBRARY
+             NAMES Xinerama
              PATHS /opt/X11/lib
-          DOC "The Xinerama library"
+             DOC "The Xinerama library")
-)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xinerama DEFAULT_MSG XINERAMA_LIBRARY XINERAMA_INCLUDE_DIR)
+find_package_handle_standard_args(Xinerama
+                                  DEFAULT_MSG
+                                  XINERAMA_LIBRARY
+                                  XINERAMA_INCLUDE_DIR)
 
 if(XINERAMA_FOUND)
-  set( XINERAMA_LIBRARIES ${XINERAMA_LIBRARY} )
+  set(XINERAMA_LIBRARIES ${XINERAMA_LIBRARY})
-  set( XINERAMA_INCLUDE_DIRS ${XINERAMA_INCLUDE_DIR} )
+  set(XINERAMA_INCLUDE_DIRS ${XINERAMA_INCLUDE_DIR})
 endif()
 
 mark_as_advanced(XINERAMA_INCLUDE_DIR XINERAMA_LIBRARY)
-

CMake/Modules/FindXrandr.cmake

@@ -1,44 +1,45 @@
-# This is borrowed from FreeRDP.
+# This is borrowed from FreeRDP. - Find XRANDR Find the XRANDR libraries
-# - Find XRANDR
-# Find the XRANDR libraries
 #
-#  This module defines the following variables:
+# This module defines the following variables: XRANDR_FOUND        - true if
-#     XRANDR_FOUND        - true if XRANDR_INCLUDE_DIR & XRANDR_LIBRARY are found
+# XRANDR_INCLUDE_DIR & XRANDR_LIBRARY are found XRANDR_LIBRARIES    - Set when
-#     XRANDR_LIBRARIES    - Set when XRANDR_LIBRARY is found
+# XRANDR_LIBRARY is found XRANDR_INCLUDE_DIRS - Set when XRANDR_INCLUDE_DIR is
-#     XRANDR_INCLUDE_DIRS - Set when XRANDR_INCLUDE_DIR is found
+# found
 #
-#     XRANDR_INCLUDE_DIR  - where to find Xrandr.h, etc.
+# XRANDR_INCLUDE_DIR  - where to find Xrandr.h, etc. XRANDR_LIBRARY      - the
-#     XRANDR_LIBRARY      - the XRANDR library
+# XRANDR library
 #
 
-#=============================================================================
+# =============================================================================
 # Copyright 2012 Alam Arias <[email protected]>
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# you may not use this file except in compliance with the License.
+# use this file except in compliance with the License. You may obtain a copy of
-# You may obtain a copy of the License at
+# the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# See the License for the specific language governing permissions and
+# License for the specific language governing permissions and limitations under
-# limitations under the License.
+# the License.
-#=============================================================================
+# =============================================================================
 
-find_path(XRANDR_INCLUDE_DIRS NAMES X11/extensions/Xrandr.h
+find_path(XRANDR_INCLUDE_DIRS
+          NAMES X11/extensions/Xrandr.h
           PATH_SUFFIXES X11/extensions
           PATHS /opt/X11/include
-  DOC "The XRANDR include directory"
+          DOC "The XRANDR include directory")
-)
 
-find_library(XRANDR_LIBRARIES NAMES Xrandr
+find_library(XRANDR_LIBRARIES
+             NAMES Xrandr
              PATHS /opt/X11/lib
-  DOC "The XRANDR library"
+             DOC "The XRANDR library")
-)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XRANDR DEFAULT_MSG XRANDR_LIBRARIES XRANDR_INCLUDE_DIRS)
+find_package_handle_standard_args(XRANDR
+                                  DEFAULT_MSG
+                                  XRANDR_LIBRARIES
+                                  XRANDR_INCLUDE_DIRS)
 
 mark_as_advanced(XRANDR_INCLUDE_DIRS XRANDR_LIBRARIES)

CMake/Modules/Findnasm.cmake

@@ -4,10 +4,8 @@ include(FindPackageHandleStandardArgs)
 
 find_program(NASM_EXECUTABLE nasm
              HINTS $ENV{NASM_ROOT} ${NASM_ROOT}
-  PATH_SUFFIXES bin
+             PATH_SUFFIXES bin)
-)
 
 find_package_handle_standard_args(nasm DEFAULT_MSG NASM_EXECUTABLE)
 
 mark_as_advanced(NASM_EXECUTABLE)
-

CMake/Modules/Findyasm.cmake

@@ -4,10 +4,8 @@ include(FindPackageHandleStandardArgs)
 
 find_program(YASM_EXECUTABLE yasm
              HINTS $ENV{YASM_ROOT} ${YASM_ROOT}
-  PATH_SUFFIXES bin
+             PATH_SUFFIXES bin)
-)
 
 find_package_handle_standard_args(yasm DEFAULT_MSG YASM_EXECUTABLE)
 
 mark_as_advanced(YASM_EXECUTABLE)
-

CMake/SMDefs.cmake

@@ -2,72 +2,75 @@
 set(SM_VERSION_MAJOR 5)
 set(SM_VERSION_MINOR 1)
 set(SM_VERSION_PATCH 0)
-set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
+set(SM_VERSION_TRADITIONAL
+    "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
 
 execute_process(COMMAND git rev-parse --short HEAD
                 WORKING_DIRECTORY "${SM_ROOT_DIR}"
                 OUTPUT_VARIABLE SM_VERSION_GIT_HASH
                 RESULT_VARIABLE ret
-  OUTPUT_STRIP_TRAILING_WHITESPACE
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
-)
 
 if(NOT (ret STREQUAL "0"))
-  message(WARNING "git was not found on your path. If you collect bug reports, please add git to your path and rerun cmake.")
+  message(
+    WARNING
+      "git was not found on your path. If you collect bug reports, please add git to your path and rerun cmake."
+    )
   set(SM_VERSION_GIT_HASH "UNKNOWN")
-  set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
+  set(SM_VERSION_FULL
-  set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
+      "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
+  set(SM_VERSION_GIT
+      "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
 else()
-  if (WITH_FULL_RELEASE)
+  if(WITH_FULL_RELEASE)
-    set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
+    set(SM_VERSION_FULL
-    set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
+        "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
+    set(SM_VERSION_GIT
+        "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
   else()
-    set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
+    set(SM_VERSION_FULL
-    set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
+        "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
+    set(SM_VERSION_GIT
+        "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
   endif()
 endif()
 
-if (CMAKE_MAJOR_VERSION STREQUAL "3")
+if(CMAKE_MAJOR_VERSION STREQUAL "3")
   # Use the CMake 3 approach whenever possible.
   string(TIMESTAMP SM_TIMESTAMP_DATE "%Y%m%d")
   string(TIMESTAMP SM_TIMESTAMP_TIME "%H:%M:%S" UTC)
 else()
   if(MSVC)
-    message(STATUS "Getting date and time information via PowerShell. This may take a few seconds.")
+    message(
-    execute_process(
+      STATUS
-      COMMAND powershell get-date -format "{yyyyMMdd}"
+        "Getting date and time information via PowerShell. This may take a few seconds."
+      )
+    execute_process(COMMAND powershell get-date -format "{yyyyMMdd}"
                     OUTPUT_VARIABLE SM_TIMESTAMP_DATE
                     RESULT_VARIABLE ret
-      OUTPUT_STRIP_TRAILING_WHITESPACE
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    )
 
-    execute_process(
+    execute_process(COMMAND powershell get-date -format "{HH:mm:ss zzz}"
-      COMMAND powershell get-date -format "{HH:mm:ss zzz}"
                     OUTPUT_VARIABLE SM_TIMESTAMP_TIME
                     RESULT_VARIABLE ret
-      OUTPUT_STRIP_TRAILING_WHITESPACE
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    )
   else()
-    execute_process(
+    execute_process(COMMAND date "+%Y%m%d"
-      COMMAND date "+%Y%m%d"
                     OUTPUT_VARIABLE SM_TIMESTAMP_DATE
                     RESULT_VARIABLE ret
-      OUTPUT_STRIP_TRAILING_WHITESPACE
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    )
 
-    execute_process(
+    execute_process(COMMAND date "+%H:%M:%S %z"
-      COMMAND date "+%H:%M:%S %z"
                     OUTPUT_VARIABLE SM_TIMESTAMP_TIME
                     RESULT_VARIABLE ret
-      OUTPUT_STRIP_TRAILING_WHITESPACE
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    )
   endif()
 
-  if (NOT (ret STREQUAL "0"))
+  if(NOT (ret STREQUAL "0"))
     set(SM_TIMESTAMP_DATE "xxxxyyzz")
   endif()
 
-  if (NOT (ret STREQUAL "0"))
+  if(NOT (ret STREQUAL "0"))
     set(SM_TIMESTAMP_TIME "xx:yy:zz ???")
   endif()
 endif()
-

CMake/SetupFfmpeg.cmake

@@ -1,14 +1,25 @@
+if(CMAKE_GENERATOR MATCHES "Ninja")
+  message(
+    FATAL_ERROR
+      "You cannot use the Ninja generator when building the bundled ffmpeg library."
+    )
+endif()
+
 set(SM_FFMPEG_VERSION "2.1.3")
-set(SM_FFMPEG_SRC_LIST "${SM_EXTERN_DIR}" "/ffmpeg-linux-" "${SM_FFMPEG_VERSION}")
+set(SM_FFMPEG_SRC_LIST
+    "${SM_EXTERN_DIR}"
+    "/ffmpeg-linux-"
+    "${SM_FFMPEG_VERSION}")
 sm_join("${SM_FFMPEG_SRC_LIST}" "" SM_FFMPEG_SRC_DIR)
 set(SM_FFMPEG_CONFIGURE_EXE "${SM_FFMPEG_SRC_DIR}/configure")
-if (MINGW)
+if(MINGW)
-  # Borrow from http://stackoverflow.com/q/11845823
+  # Borrow from http://stackoverflow.com/q/11845823 string(SUBSTRING
-  # string(SUBSTRING ${SM_FFMPEG_CONFIGURE_EXE} 0 1 FIRST_LETTER)
+  # ${SM_FFMPEG_CONFIGURE_EXE} 0 1 FIRST_LETTER) string(TOLOWER ${FIRST_LETTER}
-  # string(TOLOWER ${FIRST_LETTER} FIRST_LETTER_LOW)
+  # FIRST_LETTER_LOW) string(REPLACE "${FIRST_LETTER}:" "/${FIRST_LETTER_LOW}" #
-  # string(REPLACE "${FIRST_LETTER}:" "/${FIRST_LETTER_LOW}" # SM_FFMPEG_CONFIGURE_EXE ${SM_FFMPEG_CONFIGURE_EXE})
+  # SM_FFMPEG_CONFIGURE_EXE ${SM_FFMPEG_CONFIGURE_EXE}) string(REGEX REPLACE
-  # string(REGEX REPLACE "\\\\" "/" SM_FFMPEG_CONFIGURE_EXE "${SM_FFMPEG_CONFIGURE_EXE}")
+  # "\\\\" "/" SM_FFMPEG_CONFIGURE_EXE "${SM_FFMPEG_CONFIGURE_EXE}")
-  set(SM_FFMPEG_CONFIGURE_EXE "extern/ffmpeg-linux-${SM_FFMPEG_VERSION}/configure")
+  set(SM_FFMPEG_CONFIGURE_EXE
+      "extern/ffmpeg-linux-${SM_FFMPEG_VERSION}/configure")
 endif()
 list(APPEND FFMPEG_CONFIGURE
             "${SM_FFMPEG_CONFIGURE_EXE}"
@@ -19,73 +30,72 @@ list(APPEND FFMPEG_CONFIGURE
             "--disable-postproc"
             "--disable-avfilter"
             "--disable-shared"
-  "--enable-static"
+            "--enable-static")
-)
 
 if(CMAKE_POSITION_INDEPENDENT_CODE)
   list(APPEND FFMPEG_CONFIGURE "--enable-pic")
 endif()
 
 if(MACOSX)
-  # TODO: Remove these two items when Mac OS X StepMania builds in 64-bit.
+  find_program(FFMPEG_YASM_EXECUTABLE yasm
-  list(APPEND FFMPEG_CONFIGURE
-    "--arch=i386"
-    "--cc=clang -m32"
-  )
-
-  find_program(
-    FFMPEG_YASM_EXECUTABLE
-    yasm
                PATHS /usr/bin /usr/local/bin /opt/local/bin)
-  list(APPEND FFMPEG_CONFIGURE
+  list(APPEND FFMPEG_CONFIGURE "--yasmexe=${FFMPEG_YASM_EXECUTABLE}")
-    "--yasmexe=${FFMPEG_YASM_EXECUTABLE}"
-  )
 endif()
 
 if(WITH_GPL_LIBS)
-  list(APPEND FFMPEG_CONFIGURE
+  list(APPEND FFMPEG_CONFIGURE "--enable-gpl")
-    "--enable-gpl"
-  )
 endif()
 
-if (WITH_CRYSTALHD_DISABLED)
+if(WITH_CRYSTALHD_DISABLED)
   list(APPEND FFMPEG_CONFIGURE "--disable-crystalhd")
 endif()
 
-if (NOT WITH_EXTERNAL_WARNINGS)
+if(NOT WITH_EXTERNAL_WARNINGS)
-  list(APPEND FFMPEG_CONFIGURE
+  list(APPEND FFMPEG_CONFIGURE "--extra-cflags=-w")
-    "--extra-cflags=-w"
-  )
 endif()
 
-list(APPEND SM_FFMPEG_MAKE
+list(APPEND SM_FFMPEG_MAKE $(MAKE))
-  $(MAKE)
+if(WITH_FFMPEG_JOBS GREATER 0)
-)
-if (WITH_FFMPEG_JOBS GREATER 0)
   list(APPEND SM_FFMPEG_MAKE "-j${WITH_FFMPEG_JOBS}")
 endif()
 
-if (IS_DIRECTORY "${SM_FFMPEG_SRC_DIR}")
+if(IS_DIRECTORY "${SM_FFMPEG_SRC_DIR}")
   externalproject_add("ffmpeg"
-    SOURCE_DIR "${SM_FFMPEG_SRC_DIR}"
+                      SOURCE_DIR
-    CONFIGURE_COMMAND ${FFMPEG_CONFIGURE}
+                      "${SM_FFMPEG_SRC_DIR}"
-    BUILD_COMMAND "${SM_FFMPEG_MAKE}"
+                      CONFIGURE_COMMAND
-    UPDATE_COMMAND ""
+                      ${FFMPEG_CONFIGURE}
-    INSTALL_COMMAND ""
+                      BUILD_COMMAND
-    TEST_COMMAND ""
+                      "${SM_FFMPEG_MAKE}"
-  )
+                      UPDATE_COMMAND
+                      ""
+                      INSTALL_COMMAND
+                      ""
+                      TEST_COMMAND
+                      "")
 else()
   # --shlibdir=$our_installdir/stepmania-$VERSION
   externalproject_add("ffmpeg"
-    DOWNLOAD_COMMAND git clone "--branch" "n${SM_FFMPEG_VERSION}" "--depth" "1" "git://github.com/stepmania/ffmpeg.git" "${SM_FFMPEG_SRC_DIR}"
+                      DOWNLOAD_COMMAND
-    CONFIGURE_COMMAND "${FFMPEG_CONFIGURE}"
+                      git
-    BUILD_COMMAND "${SM_FFMPEG_MAKE}"
+                      clone
-    UPDATE_COMMAND ""
+                      "--branch"
-    INSTALL_COMMAND ""
+                      "n${SM_FFMPEG_VERSION}"
-    TEST_COMMAND ""
+                      "--depth"
-  )
+                      "1"
+                      "git://github.com/stepmania/ffmpeg.git"
+                      "${SM_FFMPEG_SRC_DIR}"
+                      CONFIGURE_COMMAND
+                      "${FFMPEG_CONFIGURE}"
+                      BUILD_COMMAND
+                      "${SM_FFMPEG_MAKE}"
+                      UPDATE_COMMAND
+                      ""
+                      INSTALL_COMMAND
+                      ""
+                      TEST_COMMAND
+                      "")
 endif()
 
 externalproject_get_property("ffmpeg" BINARY_DIR)
 set(SM_FFMPEG_ROOT ${BINARY_DIR})
-

CMake/SetupOggVorbis.cmake

@@ -1,16 +1,23 @@
 set(SM_OGG_SRC_DIR "${SM_EXTERN_DIR}/libogg-git")
 
-if (NOT (IS_DIRECTORY "${SM_OGG_SRC_DIR}"))
+if(NOT (IS_DIRECTORY "${SM_OGG_SRC_DIR}"))
-  message(ERROR "Submodule for ogg missing. Run git submodule init && git submodule update first.")
+  message(
+    ERROR
+    "Submodule for ogg missing. Run git submodule init && git submodule update first."
+    )
 endif()
 
 externalproject_add("ogg"
-  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                    CMAKE_ARGS
-  SOURCE_DIR "${SM_OGG_SRC_DIR}"
+                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-  UPDATE_COMMAND ""
+                    SOURCE_DIR
-  INSTALL_COMMAND ""
+                    "${SM_OGG_SRC_DIR}"
-  TEST_COMMAND ""
+                    UPDATE_COMMAND
-)
+                    ""
+                    INSTALL_COMMAND
+                    ""
+                    TEST_COMMAND
+                    "")
 
 externalproject_get_property("ogg" BINARY_DIR)
 set(SM_OGG_ROOT ${BINARY_DIR})
@@ -21,27 +28,48 @@ if(APPLE AND CMAKE_GENERATOR MATCHES "Unix Makefiles")
   # necessary for the time being.
   externalproject_add_step("ogg"
                            fix-path
-                           COMMAND ${CMAKE_COMMAND} -E make_directory ${SM_OGG_ROOT}/${CMAKE_BUILD_TYPE}
+                           COMMAND
-                           DEPENDEES build)
+                           ${CMAKE_COMMAND}
+                           -E
+                           make_directory
+                           ${SM_OGG_ROOT}/${CMAKE_BUILD_TYPE}
+                           DEPENDEES
+                           build)
   externalproject_add_step("ogg"
                            copy-libogg
-                           COMMAND ${CMAKE_COMMAND} -E copy ${SM_OGG_ROOT}/libogg.a ${SM_OGG_ROOT}/${CMAKE_BUILD_TYPE}/
+                           COMMAND
-                           DEPENDEES fix-path)
+                           ${CMAKE_COMMAND}
+                           -E
+                           copy
+                           ${SM_OGG_ROOT}/libogg.a
+                           ${SM_OGG_ROOT}/${CMAKE_BUILD_TYPE}/
+                           DEPENDEES
+                           fix-path)
 endif()
 
 set(SM_VORBIS_SRC_DIR "${SM_EXTERN_DIR}/libvorbis-git")
 
-if (NOT (IS_DIRECTORY "${SM_VORBIS_SRC_DIR}"))
+if(NOT (IS_DIRECTORY "${SM_VORBIS_SRC_DIR}"))
-  message(ERROR "Submodule for vorbis missing. Run git submodule init && git submodule update first.")
+  message(
+    ERROR
+    "Submodule for vorbis missing. Run git submodule init && git submodule update first."
+    )
 endif()
 
-externalproject_add("vorbis"
+externalproject_add(
-  CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DOGG_INCLUDE_DIRS:STRING=${SM_OGG_INCLUDE_DIR} -DOGG_LIBRARIES:STRING=${SM_OGG_ROOT}/${CMAKE_BUILD_TYPE}/libogg.a
+  "vorbis"
-  SOURCE_DIR "${SM_VORBIS_SRC_DIR}"
+  CMAKE_ARGS
-  UPDATE_COMMAND ""
+  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-  INSTALL_COMMAND ""
+  -DOGG_INCLUDE_DIRS:STRING=${SM_OGG_INCLUDE_DIR}
-  TEST_COMMAND ""
+  -DOGG_LIBRARIES:STRING=${SM_OGG_ROOT}/${CMAKE_BUILD_TYPE}/libogg.a
-)
+  SOURCE_DIR
+  "${SM_VORBIS_SRC_DIR}"
+  UPDATE_COMMAND
+  ""
+  INSTALL_COMMAND
+  ""
+  TEST_COMMAND
+  "")
 
 externalproject_get_property("vorbis" BINARY_DIR)
 set(SM_VORBIS_ROOT ${BINARY_DIR})
@@ -51,16 +79,33 @@ if(APPLE AND CMAKE_GENERATOR MATCHES "Unix Makefiles")
   # See note above
   externalproject_add_step("vorbis"
                            fix-path
-                           COMMAND ${CMAKE_COMMAND} -E make_directory ${SM_VORBIS_ROOT}/lib/${CMAKE_BUILD_TYPE}
+                           COMMAND
-                           DEPENDEES build)
+                           ${CMAKE_COMMAND}
+                           -E
+                           make_directory
+                           ${SM_VORBIS_ROOT}/lib/${CMAKE_BUILD_TYPE}
+                           DEPENDEES
+                           build)
   externalproject_add_step("vorbis"
                            copy-libvorbis
-                           COMMAND ${CMAKE_COMMAND} -E copy ${SM_VORBIS_ROOT}/lib/libvorbis.a ${SM_VORBIS_ROOT}/lib/${CMAKE_BUILD_TYPE}/
+                           COMMAND
-                           DEPENDEES fix-path)
+                           ${CMAKE_COMMAND}
+                           -E
+                           copy
+                           ${SM_VORBIS_ROOT}/lib/libvorbis.a
+                           ${SM_VORBIS_ROOT}/lib/${CMAKE_BUILD_TYPE}/
+                           DEPENDEES
+                           fix-path)
   externalproject_add_step("vorbis"
                            copy-libvorbisfile
-                           COMMAND ${CMAKE_COMMAND} -E copy ${SM_VORBIS_ROOT}/lib/libvorbisfile.a ${SM_VORBIS_ROOT}/lib/${CMAKE_BUILD_TYPE}/
+                           COMMAND
-                           DEPENDEES fix-path)
+                           ${CMAKE_COMMAND}
+                           -E
+                           copy
+                           ${SM_VORBIS_ROOT}/lib/libvorbisfile.a
+                           ${SM_VORBIS_ROOT}/lib/${CMAKE_BUILD_TYPE}/
+                           DEPENDEES
+                           fix-path)
 endif()
 
 add_dependencies("vorbis" "ogg")

CMake/VerStubUtil.cmake

@@ -1,7 +1,6 @@
 include("${CMAKE_CURRENT_LIST_DIR}/SMDefs.cmake")
 
-# SM_TIMESTAMP_DATE and SM_TIMESTAMP_TIME, needed for the stub, are prepared/generated as we want them in SMDefs
+# SM_TIMESTAMP_DATE and SM_TIMESTAMP_TIME, needed for the stub, are
-configure_file(
+# prepared/generated as we want them in SMDefs
-    "${SM_SRC_DIR}/version_updater/verstub.cpp.in"
+configure_file("${SM_SRC_DIR}/version_updater/verstub.cpp.in"
-    "${SM_SRC_DIR}/generated/verstub.cpp"
+               "${SM_SRC_DIR}/generated/verstub.cpp")
-)

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(StepMania)
 
-include (StepmaniaCore.cmake)
+include(StepmaniaCore.cmake)
 
 # The external libraries need to be included.
 add_subdirectory(extern)

StepmaniaCore.cmake

@@ -2,6 +2,9 @@
 
 include(${CMAKE_CURRENT_LIST_DIR}/CMake/CMakeMacros.cmake)
 
+# Make Xcode's 'Archive' build work
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/extern")
+
 # Set up helper variables for future configuring.
 set(SM_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/CMake")
 set(SM_EXTERN_DIR "${CMAKE_CURRENT_LIST_DIR}/extern")
@@ -17,21 +20,21 @@ set(SM_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
 set(SM_EXE_NAME "StepMania")
 
 # Some OS specific helpers.
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(LINUX TRUE)
   set(SM_CPP_STANDARD "gnu++11")
 else()
   set(LINUX FALSE)
 endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(MACOSX TRUE)
   set(SM_CPP_STANDARD "gnu++14")
 else()
   set(MACOSX FALSE)
 endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "BSD")
+if(CMAKE_SYSTEM_NAME MATCHES "BSD")
   set(BSD TRUE)
   set(SM_CPP_STANDARD "gnu++11")
 else()
@@ -39,20 +42,18 @@ else()
 endif()
 
 # Allow for finding our libraries in a standard location.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" "${SM_CMAKE_DIR}/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}"
+            "${SM_CMAKE_DIR}/Modules/")
 
 include("${SM_CMAKE_DIR}/DefineOptions.cmake")
 
 include("${SM_CMAKE_DIR}/SMDefs.cmake")
 
-# Put the predefined targets in separate groups.
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
 # Set up the linker flags for MSVC builds.
 configure_msvc_runtime()
 
-# Checks the standard include directories for c-style headers.
+# Checks the standard include directories for c-style headers. We may use C++ in
-# We may use C++ in this project, but the check works better with plain C headers.
+# this project, but the check works better with plain C headers.
 include(CheckIncludeFiles)
 check_include_files(alloca.h HAVE_ALLOCA_H)
 check_include_files(assert.h HAVE_ASSERT_H)
@@ -82,7 +83,7 @@ check_include_files(endian.h HAVE_ENDIAN_H)
 check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H)
 check_include_files(machine/endian.h HAVE_MACHINE_ENDIAN_H)
 
-if (HAVE_STDLIB_H AND HAVE_STDARG_H AND HAVE_STRING_H AND HAVE_FLOAT_H)
+if(HAVE_STDLIB_H AND HAVE_STDARG_H AND HAVE_STRING_H AND HAVE_FLOAT_H)
   set(STDC_HEADERS 1)
 endif()
 
@@ -104,7 +105,6 @@ check_cxx_symbol_exists(snprintf cstdio HAVE_SNPRINTF)
 check_cxx_symbol_exists(strcasecmp cstring HAVE_STRCASECMP)
 check_function_exists(waitpid HAVE_WAITPID)
 
-
 # Mostly universal symbols.
 check_cxx_symbol_exists(powf cmath HAVE_POWF)
 check_cxx_symbol_exists(sqrtf cmath HAVE_SQRTF)
@@ -122,7 +122,7 @@ check_symbol_exists(size_t stdlib.h HAVE_SIZE_T_STDLIB)
 check_symbol_exists(size_t stdio.h HAVE_SIZE_T_STDIO)
 check_symbol_exists(posix_fadvise fcntl.h HAVE_POSIX_FADVISE)
 
-if (MINGW)
+if(MINGW)
   set(NEED_WINDOWS_LOADING_WINDOW TRUE)
   check_symbol_exists(PBS_MARQUEE commctrl.h HAVE_PBS_MARQUEE)
   check_symbol_exists(PBM_SETMARQUEE commctrl.h HAVE_PBM_SETMARQUEE)
@@ -155,27 +155,45 @@ check_type_size(ssize_t SIZEOF_SSIZE_T)
 
 include(TestBigEndian)
 test_big_endian(BIGENDIAN)
-if (${BIGENDIAN})
+if(${BIGENDIAN})
   set(ENDIAN_BIG 1)
 else()
   set(ENDIAN_LITTLE 1)
 endif()
 
-check_compile_features("${SM_CMAKE_DIR}/TestCode" "${SM_CMAKE_DIR}/TestCode/test_prototype.c" "Checking for function prototype capabilities" "found" "not found" SM_IGNORED_PROTOTYPE_CALL FALSE)
+check_compile_features("${SM_CMAKE_DIR}/TestCode"
+                       "${SM_CMAKE_DIR}/TestCode/test_prototype.c"
+                       "Checking for function prototype capabilities"
+                       "found"
+                       "not found"
+                       SM_IGNORED_PROTOTYPE_CALL
+                       FALSE)
 
 if(NOT SM_IGNORED_PROTOTYPE_CALL)
   set(HAVE_PROTOTYPES TRUE)
 endif()
 
-check_compile_features("${SM_CMAKE_DIR}/TestCode" "${SM_CMAKE_DIR}/TestCode/test_external.c" "Checking for external name shortening requirements" "not needed" "needed" SM_BUILT_LONG_NAME TRUE)
+check_compile_features("${SM_CMAKE_DIR}/TestCode"
+                       "${SM_CMAKE_DIR}/TestCode/test_external.c"
+                       "Checking for external name shortening requirements"
+                       "not needed"
+                       "needed"
+                       SM_BUILT_LONG_NAME
+                       TRUE)
 
-if (NOT SM_BUILT_LONG_NAME)
+if(NOT SM_BUILT_LONG_NAME)
   set(NEED_SHORT_EXTERNAL_NAMES 1)
 endif()
 
-check_compile_features("${SM_CMAKE_DIR}/TestCode" "${SM_CMAKE_DIR}/TestCode/test_broken.c" "Checking if incomplete types are broken." "not broken" "broken" SM_BUILT_INCOMPLETE_TYPE FALSE)
+check_compile_features("${SM_CMAKE_DIR}/TestCode"
+                       "${SM_CMAKE_DIR}/TestCode/test_broken.c"
+                       "Checking if incomplete types are broken."
+                       "not broken"
+                       "broken"
+                       SM_BUILT_INCOMPLETE_TYPE
+                       FALSE)
 
-if (SM_BUILT_INCOMPLETE_TYPE)
+if(SM_BUILT_INCOMPLETE_TYPE)
   set(INCOMPLETE_TYPES_BROKEN 1)
 endif()
 
@@ -198,12 +216,15 @@ if(WITH_MP3)
   else()
     find_package(Mad)
     if(NOT LIBMAD_FOUND)
-      message(FATAL_ERROR "Libmad library not found. If you wish to skip mp3 support, set WITH_MP3 to OFF when configuring.")
+      message(
+        FATAL_ERROR
+          "Libmad library not found. If you wish to skip mp3 support, set WITH_MP3 to OFF when configuring."
+        )
     else()
       set(HAS_MP3 TRUE)
     endif()
   endif()
-endif()
+endif(WITH_MP3)
 
 if(WITH_OGG)
   if(WIN32 OR MACOSX)
@@ -213,8 +234,11 @@ if(WITH_OGG)
     find_package(Vorbis)
     find_package(VorbisFile)
 
-    if(NOT (OGG_FOUND AND VORBIS_FOUND AND VORBISFILE_FOUND) )
+    if(NOT (OGG_FOUND AND VORBIS_FOUND AND VORBISFILE_FOUND))
-      message(FATAL_ERROR "Not all vorbis libraries were found. If you wish to skip vorbis support, set WITH_OGG to OFF when configuring.")
+      message(
+        FATAL_ERROR
+          "Not all vorbis libraries were found. If you wish to skip vorbis support, set WITH_OGG to OFF when configuring."
+        )
     else()
       set(HAS_OGG TRUE)
     endif()
@@ -222,94 +246,92 @@ if(WITH_OGG)
 endif()
 
 if(WITH_SDL)
-
+  find_package(SDL2 REQUIRED)
-    find_package(SDL2)
-
-    if(NOT SDL2_FOUND)
-        message(FATAL_ERROR "SDL2 Library was not found. If you wish to compile without SDL2, set WITH_SDL to OFF when configuring.")
-    else()
   set(HAS_SDL TRUE)
-    endif()
-
 endif()
 
 find_package(nasm)
 find_package(yasm)
 
 find_package(BZip2)
-if (NOT ${BZIP2_FOUND} AND NOT MSVC)
+if(NOT ${BZIP2_FOUND} AND NOT MSVC)
   message(FATAL_ERROR "Bzip2 support required.")
 endif()
 
 find_package(Iconv)
 
 find_package(Threads)
-if (${Threads_FOUND})
+if(${Threads_FOUND})
   set(HAS_PTHREAD TRUE)
   list(APPEND CMAKE_REQUIRED_LIBRARIES pthread)
-  check_symbol_exists(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
+  check_symbol_exists(pthread_mutex_timedlock pthread.h
-  check_symbol_exists(pthread_cond_timedwait pthread.h HAVE_PTHREAD_COND_TIMEDWAIT)
+                      HAVE_PTHREAD_MUTEX_TIMEDLOCK)
+  check_symbol_exists(pthread_cond_timedwait pthread.h
+                      HAVE_PTHREAD_COND_TIMEDWAIT)
 else()
   set(HAS_PTHREAD FALSE)
 endif()
 
 if(WIN32)
-  set(SYSTEM_PCRE_FOUND FALSE)
   find_package(DirectX REQUIRED)
 
-  if (MINGW AND WITH_FFMPEG)
+  if(MINGW AND WITH_FFMPEG AND NOT WITH_SYSTEM_FFMPEG)
     include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake")
     set(HAS_FFMPEG TRUE)
   else()
     # FFMPEG...it can be evil.
-    find_library(LIB_SWSCALE NAMES "swscale"
+    find_library(LIB_SWSCALE
-      PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" NO_DEFAULT_PATH
+                 NAMES "swscale"
-    )
+                 PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
+                 NO_DEFAULT_PATH)
     get_filename_component(LIB_SWSCALE ${LIB_SWSCALE} NAME)
 
-    find_library(LIB_AVCODEC NAMES "avcodec"
+    find_library(LIB_AVCODEC
-      PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" NO_DEFAULT_PATH
+                 NAMES "avcodec"
-    )
+                 PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
+                 NO_DEFAULT_PATH)
     get_filename_component(LIB_AVCODEC ${LIB_AVCODEC} NAME)
 
-    find_library(LIB_AVFORMAT NAMES "avformat"
+    find_library(LIB_AVFORMAT
-      PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" NO_DEFAULT_PATH
+                 NAMES "avformat"
-    )
+                 PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
+                 NO_DEFAULT_PATH)
     get_filename_component(LIB_AVFORMAT ${LIB_AVFORMAT} NAME)
 
-    find_library(LIB_AVUTIL NAMES "avutil"
+    find_library(LIB_AVUTIL
-      PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" NO_DEFAULT_PATH
+                 NAMES "avutil"
-    )
+                 PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
+                 NO_DEFAULT_PATH)
     get_filename_component(LIB_AVUTIL ${LIB_AVUTIL} NAME)
   endif()
 elseif(MACOSX)
-
+  if(WITH_FFMPEG AND NOT WITH_SYSTEM_FFMPEG)
-  if (WITH_FFMPEG)
     include("${SM_CMAKE_DIR}/SetupFfmpeg.cmake")
     set(HAS_FFMPEG TRUE)
   endif()
 
-  set(SYSTEM_PCRE_FOUND FALSE)
   set(WITH_CRASH_HANDLER TRUE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
   set(CMAKE_OSX_DEPLOYMENT_TARGET_FULL "10.9.0")
 
-  find_library(MAC_FRAME_ACCELERATE Accelerate ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_ACCELERATE Accelerate ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_APPKIT AppKit ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_APPKIT AppKit ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_AUDIOTOOLBOX AudioToolbox ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_AUDIOTOOLBOX AudioToolbox
-  find_library(MAC_FRAME_AUDIOUNIT AudioUnit ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+               ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_CARBON Carbon ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_AUDIOUNIT AudioUnit ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_COCOA Cocoa ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_CARBON Carbon ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_COREAUDIO CoreAudio ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_COCOA Cocoa ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_COREFOUNDATION CoreFoundation ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_COREAUDIO CoreAudio ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_CORESERVICES CoreServices ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_COREFOUNDATION CoreFoundation
-  find_library(MAC_FRAME_FOUNDATION Foundation ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+               ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_IOKIT IOKit ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_CORESERVICES CoreServices
-  find_library(MAC_FRAME_OPENGL OpenGL ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+               ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
-  find_library(MAC_FRAME_QUICKTIME QuickTime ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+  find_library(MAC_FRAME_FOUNDATION Foundation ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
+  find_library(MAC_FRAME_IOKIT IOKit ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
+  find_library(MAC_FRAME_OPENGL OpenGL ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
+  find_library(MAC_FRAME_SYSTEM System ${CMAKE_SYSTEM_FRAMEWORK_PATH} REQUIRED)
 
-  mark_as_advanced(
+  mark_as_advanced(MAC_FRAME_ACCELERATE
-    MAC_FRAME_ACCELERATE
                    MAC_FRAME_APPKIT
                    MAC_FRAME_AUDIOTOOLBOX
                    MAC_FRAME_AUDIOUNIT
@@ -321,106 +343,103 @@ elseif(MACOSX)
                    MAC_FRAME_FOUNDATION
                    MAC_FRAME_IOKIT
                    MAC_FRAME_OPENGL
-    MAC_FRAME_QUICKTIME
+                   MAC_FRAME_SYSTEM)
-  )
 elseif(LINUX)
   if(WITH_GTK2)
     find_package("GTK2" 2.0)
-    if (${GTK2_FOUND})
+    if(${GTK2_FOUND})
       set(HAS_GTK2 TRUE)
     else()
       set(HAS_GTK2 FALSE)
-      message("GTK2 was not found on your system. There will be no loading window.")
+      message(
+        "GTK2 was not found on your system. There will be no loading window.")
     endif()
   else()
     set(HAS_GTK2 FALSE)
   endif()
 
-  find_package(X11)
-  if(${X11_FOUND})
-    set(HAS_X11 TRUE)
-  else()
   set(HAS_X11 FALSE)
+  if(WITH_X11)
+    find_package(X11 REQUIRED)
+    set(HAS_X11 TRUE)
   endif()
 
-  find_package(Pcre)
+  find_package("ZLIB" REQUIRED)
-  set(SYSTEM_PCRE_FOUND ${PCRE_FOUND})
+  find_package("JPEG" REQUIRED)
-
-  find_package("ZLIB")
-  if (NOT(${ZLIB_FOUND}))
-    message(FATAL_ERROR "zlib support required.")
-  endif()
-
-  find_package("JPEG")
-  if(NOT(${JPEG_FOUND}))
-    message(FATAL_ERROR "jpeg support required.")
-  endif()
 
   find_package(Dl)
 
-  find_package(Xrandr REQUIRED)
-  if (${XRANDR_FOUND})
-    set(HAS_XRANDR TRUE)
-  else()
   set(HAS_XRANDR FALSE)
+  if(WITH_XRANDR)
+    find_package(Xrandr REQUIRED)
+    set(HAS_XRANDR TRUE)
   endif()
 
-  find_package(Xinerama)
-  if (${XINERAMA_FOUND})
-    set(HAS_XINERAMA TRUE)
-  else()
   set(HAS_XINERAMA FALSE)
+  if(WITH_XINERAMA)
+    find_package(Xinerama REQUIRED)
+    set(HAS_XINERAMA TRUE)
   endif()
 
-  find_package(PulseAudio)
-  if (PULSEAUDIO_FOUND)
-    set(HAS_PULSE TRUE)
-  else()
   set(HAS_PULSE FALSE)
+  if(WITH_PULSEAUDIO)
+    find_package(PulseAudio REQUIRED)
+    set(HAS_PULSE TRUE)
   endif()
 
-  find_package(ALSA)
-  if (ALSA_FOUND)
-    set(HAS_ALSA TRUE)
-  else()
   set(HAS_ALSA FALSE)
+  if(WITH_ALSA)
+    find_package(ALSA REQUIRED)
+    set(HAS_ALSA TRUE)
   endif()
 
-  find_package(JACK)
-  if (JACK_FOUND)
-    set(HAS_JACK TRUE)
-  else()
   set(HAS_JACK FALSE)
+  if(WITH_JACK)
+    find_package(JACK REQUIRED)
+    set(HAS_JACK TRUE)
   endif()
 
-  find_package(OSS)
-  if (OSS_FOUND)
-    set(HAS_OSS TRUE)
-  else()
   set(HAS_OSS FALSE)
+  if(WITH_OSS)
+    find_package(OSS)
+    set(HAS_OSS TRUE)
   endif()
 
   if(NOT OSS_FOUND AND NOT JACK_FOUND AND NOT ALSA_FOUND AND NOT PULSE_FOUND)
-    message(FATAL_ERROR "No sound libraries found. You will require at least one.")
+    message(
+      FATAL_ERROR
+        "No sound libraries found (or selected). You will require at least one."
+      )
   else()
-    message(STATUS "-- At least one sound library was found. Do not worry if any were not found at this stage.")
+    message(
+      STATUS
+        "-- At least one sound library was found. Do not worry if any were not found at this stage."
+      )
   endif()
 
-  if (WITH_FFMPEG AND NOT YASM_FOUND AND NOT NASM_FOUND)
+  if(WITH_FFMPEG AND NOT YASM_FOUND AND NOT NASM_FOUND)
-    message("Neither NASM nor YASM were found. Please install at least one of them if you wish for ffmpeg support.")
+    message(
+      "Neither NASM nor YASM were found. Please install at least one of them if you wish for ffmpeg support."
+      )
     set(WITH_FFMPEG OFF)
   endif()
 
   find_package("Va")
 
   if(WITH_FFMPEG)
-    if (WITH_SYSTEM_FFMPEG)
+    if(WITH_SYSTEM_FFMPEG)
       find_package("FFMPEG")
       if(NOT FFMPEG_FOUND)
-        message(FATAL_ERROR "System ffmpeg not found! Either install the libraries or remove the argument, then try again.")
+        message(
+          FATAL_ERROR
+            "System ffmpeg not found! Either install the libraries or remove the argument, then try again."
+          )
       else()
 
-        message(STATUS "-- Warning! Your version of ffmpeg may be too high! If you want to use the system ffmpeg, clear your cmake cache and do not include the system ffmpeg argument.")
+        message(
+          STATUS
+            "-- Warning! Your version of ffmpeg may be too high! If you want to use the system ffmpeg, clear your cmake cache and do not include the system ffmpeg argument."
+          )
         set(HAS_FFMPEG TRUE)
       endif()
     else()
@@ -432,19 +451,13 @@ elseif(LINUX)
   endif()
 
   find_package(OpenGL REQUIRED)
-  if (NOT ${OPENGL_FOUND})
-    message(FATAL_ERROR "OpenGL required to compile StepMania.")
-  endif()
-
   find_package(GLEW REQUIRED)
-  if (NOT ${GLEW_FOUND})
+endif(WIN32) # LINUX, APPLE
-    message(FATAL_ERROR "GLEW required to compile StepMania.")
-  endif()
 
-endif()
+configure_file("${SM_SRC_DIR}/config.in.hpp"
-
+               "${SM_SRC_DIR}/generated/config.hpp")
-configure_file("${SM_SRC_DIR}/config.in.hpp" "${SM_SRC_DIR}/generated/config.hpp")
+configure_file("${SM_SRC_DIR}/verstub.in.cpp"
-configure_file("${SM_SRC_DIR}/verstub.in.cpp" "${SM_SRC_DIR}/generated/verstub.cpp")
+               "${SM_SRC_DIR}/generated/verstub.cpp")
 
 # Define installer based items for cpack.
 include("${CMAKE_CURRENT_LIST_DIR}/CMake/CPackSetup.cmake")

extern/CMakeLists.txt

@@ -1,20 +1,21 @@
 include(CMakeProject-lua.cmake)
 include(CMakeProject-glew.cmake)
 include(CMakeProject-json.cmake)
-if (APPLE OR MSVC)
+include(CMakeProject-mad.cmake)
-  include(CMakeProject-mad.cmake)
+include(CMakeProject-zlib.cmake)
-  include(CMakeProject-zlib.cmake)
+include(CMakeProject-jpeg.cmake)
-  include(CMakeProject-jpeg.cmake)
+if(WITH_OGG)
-endif()
+  if(WITH_SYSTEM_OGG)
-if (MSVC AND WITH_OGG)
+    find_package(Ogg REQUIRED)
+    find_package(Vorbis REQUIRED)
+    find_package(VorbisFile REQUIRED)
+  else()
     include(CMakeProject-ogg.cmake)
     include(CMakeProject-vorbis.cmake)
     include(CMakeProject-vorbisfile.cmake)
+  endif()
 endif()
-if (NOT SYSTEM_PCRE_FOUND)
+include(CMakeProject-pcre.cmake)
-  include(CMakeProject-pcre.cmake)
-endif()
 include(CMakeProject-tomcrypt.cmake)
 include(CMakeProject-tommath.cmake)
 include(CMakeProject-png.cmake)
-

extern/CMakeProject-cppformat.cmake

@@ -1,15 +1,14 @@
-if (NOT IS_DIRECTORY "${SM_EXTERN_DIR}/cppformat")
+if(NOT IS_DIRECTORY "${SM_EXTERN_DIR}/cppformat")
-  message(ERROR "Submodule for cppformat missing. Run git submodule init && git submodule update first.")
+  message(
+    ERROR
+    "Submodule for cppformat missing. Run git submodule init && git submodule update first."
+    )
   return()
 endif()
 
-list(APPEND CPPFORMAT_SRC
+list(APPEND CPPFORMAT_SRC "cppformat/fmt/format.cc")
-  "cppformat/fmt/format.cc"
-)
 
-list(APPEND CPPFORMAT_HPP
+list(APPEND CPPFORMAT_HPP "cppformat/fmt/format.h")
-  "cppformat/fmt/format.h"
-)
 
 source_group("" FILES ${CPPFORMAT_SRC} ${CPPFORMAT_HPP})
 
@@ -21,19 +20,19 @@ disable_project_warnings("cppformat")
 
 target_include_directories("cppformat" PUBLIC "cppformat")
 
-if (MSVC)
+if(MSVC)
   sm_add_compile_definition("cppformat" _CRT_SECURE_NO_WARNINGS)
 elseif(APPLE)
-  set_target_properties("cppformat" PROPERTIES
+  set_target_properties("cppformat"
-    XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "${SM_CPP_STANDARD}"
+                        PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD
-    XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"
+                                   "${SM_CPP_STANDARD}"
-  )
+                                   XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY
+                                   "libc++")
   sm_add_compile_flag("cppformat" "-std=${SM_CPP_STANDARD}")
   sm_add_compile_flag("cppformat" "-stdlib=libc++")
 else() # Unix
   sm_add_compile_flag("cppformat" "-std=${SM_CPP_STANDARD}")
-  if (CMAKE_CXX_COMPILER MATCHES "clang")
+  if(CMAKE_CXX_COMPILER MATCHES "clang")
     sm_add_compile_flag("cppformat" "-stdlib=libc++")
   endif()
 endif()
-

extern/CMakeProject-glew.cmake

@@ -1,16 +1,22 @@
-set(GLEW_SRC "glew-1.5.8/src/glew.c")
+if(WITH_SYSTEM_GLEW)
+  find_package(GLEW REQUIRED)
+  set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIRS} PARENT_SCOPE)
+else()
 
-source_group("" FILES ${GLEW_SRC})
+  set(GLEW_SRC "glew-1.5.8/src/glew.c")
 
-add_library("glew" STATIC ${GLEW_SRC})
+  source_group("" FILES ${GLEW_SRC})
 
-set_property(TARGET "glew" PROPERTY FOLDER "External Libraries")
+  add_library("glew" STATIC ${GLEW_SRC})
 
-target_include_directories("glew" PUBLIC "glew-1.5.8/include")
+  set_property(TARGET "glew" PROPERTY FOLDER "External Libraries")
 
-sm_add_compile_definition("glew" GLEW_STATIC)
+  target_include_directories("glew" PUBLIC "glew-1.5.8/include")
 
-if(MSVC)
+  sm_add_compile_definition("glew" GLEW_STATIC)
+
+  if(MSVC)
     sm_add_compile_definition("glew" _MBCS)
-endif(MSVC)
+  endif(MSVC)
 
+endif()

extern/CMakeProject-jpeg.cmake

@@ -1,12 +1,16 @@
-set(JPEG_DIR "${SM_EXTERN_DIR}/libjpeg")
+if(WITH_SYSTEM_JPEG)
+  find_package(JPEG REQUIRED)
+  set(JPEG_LIBRARIES ${JPEG_LIBRARIES} PARENT_SCOPE)
+else()
+  set(JPEG_DIR "${SM_EXTERN_DIR}/libjpeg")
 
-configure_file("${SM_EXTERN_DIR}/config.jpeg.in.h" "${JPEG_DIR}/jconfig.h")
+  configure_file("${SM_EXTERN_DIR}/config.jpeg.in.h" "${JPEG_DIR}/jconfig.h")
 
-if (NOT HAVE_PROTOTYPES)
+  if(NOT HAVE_PROTOTYPES)
     list(APPEND JPEG_SRC "${JPEG_DIR}/ansi2knr.c")
-endif()
+  endif()
 
-list(APPEND JPEG_SRC
+  list(APPEND JPEG_SRC
               "${JPEG_DIR}/jaricom.c"
               "${JPEG_DIR}/jcapimin.c"
               "${JPEG_DIR}/jcapistd.c"
@@ -51,10 +55,9 @@ list(APPEND JPEG_SRC
               "${JPEG_DIR}/jmemmgr.c"
               "${JPEG_DIR}/jmemnobs.c"
               "${JPEG_DIR}/jquant1.c"
-  "${JPEG_DIR}/jquant2.c"
+              "${JPEG_DIR}/jquant2.c")
-)
 
-list(APPEND JPEG_HPP
+  list(APPEND JPEG_HPP
               "${JPEG_DIR}/jconfig.h"
               "${JPEG_DIR}/jdct.h"
               "${JPEG_DIR}/jerror.h"
@@ -63,21 +66,20 @@ list(APPEND JPEG_HPP
               "${JPEG_DIR}/jmorecfg.h"
               "${JPEG_DIR}/jpegint.h"
               "${JPEG_DIR}/jpeglib.h"
-  "${JPEG_DIR}/jversion.h"
+              "${JPEG_DIR}/jversion.h")
-)
 
-source_group("Source Files" FILES ${JPEG_SRC})
+  source_group("Source Files" FILES ${JPEG_SRC})
-source_group("Header Files" FILES ${JPEG_HPP})
+  source_group("Header Files" FILES ${JPEG_HPP})
 
-add_library("jpeg" ${JPEG_SRC} ${JPEG_HPP})
+  add_library("jpeg" ${JPEG_SRC} ${JPEG_HPP})
 
-disable_project_warnings("jpeg")
+  disable_project_warnings("jpeg")
 
-set_property(TARGET "jpeg" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "jpeg" PROPERTY FOLDER "External Libraries")
 
-if(MSVC)
+  if(MSVC)
     sm_add_compile_definition("jpeg" _CRT_SECURE_NO_WARNINGS)
-endif(MSVC)
+  endif(MSVC)
-
-target_include_directories("jpeg" PUBLIC "${JPEG_DIR}")
 
+  target_include_directories("jpeg" PUBLIC "${JPEG_DIR}")
+endif()

extern/CMakeProject-json.cmake

@@ -1,42 +1,47 @@
-list(APPEND JSON_SRC
+if(WITH_SYSTEM_JSONCPP)
+  find_library(JSONCPP_LIBRARY jsoncpp)
+  if(JSONCPP_LIBRARY MATCHES "JSONCPP_LIBRARY-NOTFOUND")
+    message(FATAL_ERROR "Need jsoncpp.")
+  endif()
+else()
+  list(APPEND JSON_SRC
               "jsoncpp/src/lib_json/json_reader.cpp"
               "jsoncpp/src/lib_json/json_value.cpp"
-  "jsoncpp/src/lib_json/json_writer.cpp"
+              "jsoncpp/src/lib_json/json_writer.cpp")
-)
 
-list(APPEND JSON_HPP
+  list(APPEND JSON_HPP
               "jsoncpp/include/json/config.h"
               "jsoncpp/include/json/features.h"
               "jsoncpp/include/json/forwards.h"
               "jsoncpp/include/json/json.h"
               "jsoncpp/include/json/reader.h"
               "jsoncpp/include/json/value.h"
-  "jsoncpp/include/json/writer.h"
+              "jsoncpp/include/json/writer.h")
-)
 
-source_group("" FILES ${JSON_SRC} ${JSON_HPP})
+  source_group("" FILES ${JSON_SRC} ${JSON_HPP})
 
-add_library("jsoncpp" STATIC ${JSON_SRC} ${JSON_HPP})
+  add_library("jsoncpp" STATIC ${JSON_SRC} ${JSON_HPP})
 
-set_property(TARGET "jsoncpp" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "jsoncpp" PROPERTY FOLDER "External Libraries")
 
-disable_project_warnings("jsoncpp")
+  disable_project_warnings("jsoncpp")
 
-target_include_directories("jsoncpp" PUBLIC "jsoncpp/include")
+  target_include_directories("jsoncpp" PUBLIC "jsoncpp/include")
 
-if(MSVC)
+  if(MSVC)
     sm_add_compile_definition("jsoncpp" _CRT_SECURE_NO_WARNINGS)
-elseif(APPLE)
+  elseif(APPLE)
-  set_target_properties("jsoncpp" PROPERTIES
+    set_target_properties("jsoncpp"
-    XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "gnu++14"
+                          PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD
-    XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"
+                                     "gnu++14"
-  )
+                                     XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY
+                                     "libc++")
     sm_add_compile_flag("jsoncpp" "-std=${SM_CPP_STANDARD}")
     sm_add_compile_flag("jsoncpp" "-stdlib=libc++")
-else() # Unix/Linux
+  else() # Unix/Linux
     sm_add_compile_flag("jsoncpp" "-std=gnu++11")
-  if (CMAKE_CXX_COMPILER MATCHES "clang")
+    if(CMAKE_CXX_COMPILER MATCHES "clang")
       sm_add_compile_flag("jsoncpp" "-stdlib=libc++")
     endif()
+  endif()
 endif()
-

extern/CMakeProject-lua.cmake

@@ -27,8 +27,7 @@ set(LUA_SRC
     "lua-5.1/src/ltm.c"
     "lua-5.1/src/lundump.c"
     "lua-5.1/src/lvm.c"
-  "lua-5.1/src/lzio.c"
+    "lua-5.1/src/lzio.c")
-)
 
 set(LUA_HPP
     "lua-5.1/src/lapi.h"
@@ -52,8 +51,7 @@ set(LUA_HPP
     "lua-5.1/src/lualib.h"
     "lua-5.1/src/lundump.h"
     "lua-5.1/src/lvm.h"
-  "lua-5.1/src/lzio.h"
+    "lua-5.1/src/lzio.h")
-)
 
 source_group("" FILES ${LUA_SRC})
 source_group("" FILES ${LUA_HPP})
@@ -69,4 +67,3 @@ if(MSVC)
 endif(MSVC)
 
 disable_project_warnings("lua-5.1")
-

extern/CMakeProject-mad.cmake

@@ -1,6 +1,9 @@
-set(MAD_DIR "${SM_EXTERN_DIR}/mad-0.15.1b")
+if(WITH_SYSTEM_MAD)
+  find_package(Mad REQUIRED)
+else()
+  set(MAD_DIR "${SM_EXTERN_DIR}/mad-0.15.1b")
 
-list(APPEND MAD_SRC
+  list(APPEND MAD_SRC
               "${MAD_DIR}/bit.c"
               "${MAD_DIR}/decoder.c"
               "${MAD_DIR}/fixed.c"
@@ -11,10 +14,9 @@ list(APPEND MAD_SRC
               "${MAD_DIR}/stream.c"
               "${MAD_DIR}/synth.c"
               "${MAD_DIR}/timer.c"
-  "${MAD_DIR}/version.c"
+              "${MAD_DIR}/version.c")
-)
 
-list(APPEND MAD_HPP
+  list(APPEND MAD_HPP
               "${MAD_DIR}/bit.h"
               "${MAD_DIR}/config.h"
               "${MAD_DIR}/decoder.h"
@@ -28,37 +30,36 @@ list(APPEND MAD_HPP
               "${MAD_DIR}/stream.h"
               "${MAD_DIR}/synth.h"
               "${MAD_DIR}/timer.h"
-  "${MAD_DIR}/version.h"
+              "${MAD_DIR}/version.h")
-)
 
-list(APPEND MAD_DAT
+  list(APPEND MAD_DAT
               "${MAD_DIR}/D.dat"
               "${MAD_DIR}/imdct_s.dat"
               "${MAD_DIR}/qc_table.dat"
               "${MAD_DIR}/rq_table.dat"
-  "${MAD_DIR}/sf_table.dat"
+              "${MAD_DIR}/sf_table.dat")
-)
 
-source_group("Source Files" FILES ${MAD_SRC})
+  source_group("Source Files" FILES ${MAD_SRC})
-source_group("Header Files" FILES ${MAD_HPP})
+  source_group("Header Files" FILES ${MAD_HPP})
-source_group("Data Files" FILES ${MAD_DAT})
+  source_group("Data Files" FILES ${MAD_DAT})
 
-add_library("mad" STATIC ${MAD_SRC} ${MAD_HPP} ${MAD_DAT})
+  add_library("mad" STATIC ${MAD_SRC} ${MAD_HPP} ${MAD_DAT})
 
-set_property(TARGET "mad" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "mad" PROPERTY FOLDER "External Libraries")
 
-disable_project_warnings("mad")
+  disable_project_warnings("mad")
 
-if(ENDIAN_BIG)
+  if(ENDIAN_BIG)
     set(WORDS_BIGENDIAN 1)
-endif()
+  endif()
 
-sm_add_compile_definition("mad" $<$<CONFIG:Debug>:DEBUG>)
+  sm_add_compile_definition("mad" $<$<CONFIG:Debug>:DEBUG>)
-sm_add_compile_definition("mad" HAVE_CONFIG_H)
+  sm_add_compile_definition("mad" HAVE_CONFIG_H)
 
-if(MSVC)
+  if(MSVC)
     sm_add_compile_definition("mad" _CRT_SECURE_NO_WARNINGS)
-  # TODO: Remove the need for this check since it's tied to 32-bit builds from first glance.
+    # TODO: Remove the need for this check since it's tied to 32-bit builds from
+    # first glance.
     sm_add_compile_definition("mad" ASO_ZEROCHECK)
     sm_add_compile_definition("mad" $<$<CONFIG:Debug>:FPM_DEFAULT>)
     sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_INTEL>)
@@ -66,10 +67,11 @@ if(MSVC)
     sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_INTEL>)
     # TODO: Provide a proper define for inline.
     sm_add_compile_definition("mad" inline=__inline)
-elseif(APPLE)
+  elseif(APPLE OR UNIX)
     sm_add_compile_definition("mad" FPM_64BIT=1)
-endif(MSVC)
+  endif(MSVC)
 
-target_include_directories("mad" PUBLIC "${MAD_DIR}")
+  target_include_directories("mad" PUBLIC "${MAD_DIR}")
 
-configure_file("${SM_EXTERN_DIR}/config.mad.in.h" "${MAD_DIR}/config.h")
+  configure_file("${SM_EXTERN_DIR}/config.mad.in.h" "${MAD_DIR}/config.h")
+endif()

extern/CMakeProject-mmmagic.cmake

@@ -2,14 +2,10 @@ if(LINUX)
   if(WITH_MINIMAID)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
       list(APPEND SMDATA_LINK_LIB
-        "${SM_EXTERN_DIR}/libmmmagic/linux-64bit/libmmmagic.a"
+                  "${SM_EXTERN_DIR}/libmmmagic/linux-64bit/libmmmagic.a" "udev")
-        "udev"
-      )
     else()
       list(APPEND SMDATA_LINK_LIB
-        "${SM_EXTERN_DIR}/libmmmagic/linux-32bit/libmmmagic.a"
+                  "${SM_EXTERN_DIR}/libmmmagic/linux-32bit/libmmmagic.a" "udev")
-        "udev"
-      )
     endif()
   endif()
 endif()

extern/CMakeProject-ogg.cmake

@@ -1,20 +1,16 @@
 set(OGG_DIR "${SM_EXTERN_DIR}/newogg")
 
-list(APPEND OGG_SRC
+list(APPEND OGG_SRC "${OGG_DIR}/src/bitwise.c" "${OGG_DIR}/src/framing.c")
-  "${OGG_DIR}/src/bitwise.c"
-  "${OGG_DIR}/src/framing.c"
-)
 
 list(APPEND OGG_HPP
             "${OGG_DIR}/include/ogg/config_types.h"
             "${OGG_DIR}/include/ogg/ogg.h"
-  "${OGG_DIR}/include/ogg/os_types.h"
+            "${OGG_DIR}/include/ogg/os_types.h")
-)
 
 source_group("Source Files" FILES ${OGG_SRC})
 source_group("Header Files" FILES ${OGG_HPP})
 
-add_library("ogg" STATIC ${OGG_SRC} ${OGG_HPP} ${OGG_DAT})
+add_library("ogg" STATIC ${OGG_SRC} ${OGG_HPP})
 
 set_property(TARGET "ogg" PROPERTY FOLDER "External Libraries")
 
@@ -22,4 +18,5 @@ disable_project_warnings("ogg")
 
 target_include_directories("ogg" PUBLIC "${OGG_DIR}/include")
 
-configure_file("${SM_EXTERN_DIR}/config.ogg.types.in.h" "${OGG_DIR}/include/ogg/config_types.h")
+configure_file("${SM_EXTERN_DIR}/config.ogg.types.in.h"
+               "${OGG_DIR}/include/ogg/config_types.h")

extern/CMakeProject-pcre.cmake

@@ -1,21 +1,16 @@
-set(PCRE_SRC
+if(WITH_SYSTEM_PCRE)
-  "pcre/get.c"
+  find_package(Pcre REQUIRED)
-  "pcre/maketables.c"
+else()
-  "pcre/pcre.c"
+  set(PCRE_SRC "pcre/get.c" "pcre/maketables.c" "pcre/pcre.c" "pcre/study.c")
-  "pcre/study.c"
-)
 
-set(PCRE_HPP
+  set(PCRE_HPP "pcre/internal.h" "pcre/pcre.h")
-  "pcre/internal.h"
-  "pcre/pcre.h"
-)
 
-source_group("" FILES ${PCRE_SRC})
+  source_group("" FILES ${PCRE_SRC})
-source_group("" FILES ${PCRE_HPP})
+  source_group("" FILES ${PCRE_HPP})
 
-add_library("pcre" ${PCRE_SRC} ${PCRE_HPP})
+  add_library("pcre" ${PCRE_SRC} ${PCRE_HPP})
 
-set_property(TARGET "pcre" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "pcre" PROPERTY FOLDER "External Libraries")
-
-disable_project_warnings("pcre")
 
+  disable_project_warnings("pcre")
+endif()

extern/CMakeProject-png.cmake

@@ -1,4 +1,8 @@
-set(PNG_SRC
+if(WITH_SYSTEM_PNG)
+  find_package(PNG REQUIRED)
+  set(PNG_LIBRARIES ${PNG_LIBRARIES} PARENT_SCOPE)
+else()
+  set(PNG_SRC
       "libpng/include/png.c"
       "libpng/include/pngerror.c"
       "libpng/include/pngget.c"
@@ -14,31 +18,29 @@ set(PNG_SRC
       "libpng/include/pngwio.c"
       "libpng/include/pngwrite.c"
       "libpng/include/pngwtran.c"
-  "libpng/include/pngwutil.c"
+      "libpng/include/pngwutil.c")
-)
 
-set(PNG_HPP
+  set(PNG_HPP
       "libpng/include/png.h"
       "libpng/include/pngconf.h"
       "libpng/include/pngdebug.h"
       "libpng/include/pnginfo.h"
       "libpng/include/pnglibconf.h"
       "libpng/include/pngpriv.h"
-  "libpng/include/pngstruct.h"
+      "libpng/include/pngstruct.h")
-)
 
-source_group("" FILES ${PNG_SRC})
+  source_group("" FILES ${PNG_SRC})
-source_group("" FILES ${PNG_HPP})
+  source_group("" FILES ${PNG_HPP})
 
-add_library("png" STATIC ${PNG_SRC} ${PNG_HPP})
+  add_library("png" STATIC ${PNG_SRC} ${PNG_HPP})
 
-set_property(TARGET "png" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "png" PROPERTY FOLDER "External Libraries")
 
-disable_project_warnings("png")
+  disable_project_warnings("png")
 
-if(MSVC)
+  if(MSVC)
     sm_add_compile_definition("png" _CRT_SECURE_NO_WARNINGS)
+  endif()
+
+  target_include_directories("png" PUBLIC "zlib")
 endif()
-
-target_include_directories("png" PUBLIC "zlib")
-

extern/CMakeProject-tomcrypt.cmake

@@ -1,6 +1,9 @@
-set(TOMDIR "${SM_SRC_DIR}/libtomcrypt")
+if(WITH_SYSTEM_TOMCRYPT)
+  find_library(TOMCRYPT_LIBRARY tomcrypt)
+else()
+  set(TOMDIR "${SM_SRC_DIR}/libtomcrypt")
 
-list(APPEND TOMCRYPT_MISC_CRYPT
+  list(APPEND TOMCRYPT_MISC_CRYPT
               "${TOMDIR}/src/misc/crypt/crypt.c"
               "${TOMDIR}/src/misc/crypt/crypt_argchk.c"
               "${TOMDIR}/src/misc/crypt/crypt_cipher_descriptor.c"
@@ -24,122 +27,106 @@ list(APPEND TOMCRYPT_MISC_CRYPT
               "${TOMDIR}/src/misc/crypt/crypt_register_prng.c"
               "${TOMDIR}/src/misc/crypt/crypt_unregister_cipher.c"
               "${TOMDIR}/src/misc/crypt/crypt_unregister_hash.c"
-  "${TOMDIR}/src/misc/crypt/crypt_unregister_prng.c"
+              "${TOMDIR}/src/misc/crypt/crypt_unregister_prng.c")
-)
 
-source_group("src\\\\misc\\\\crypt" FILES ${TOMCRYPT_MISC_CRYPT})
+  source_group("src\\\\misc\\\\crypt" FILES ${TOMCRYPT_MISC_CRYPT})
 
-set(TOMCRYPT_CIPHERS_AES
+  set(TOMCRYPT_CIPHERS_AES "${TOMDIR}/src/ciphers/aes/aes.c")
-  "${TOMDIR}/src/ciphers/aes/aes.c"
-)
 
-source_group("src\\\\ciphers\\\\aes" FILES ${TOMCRYPT_CIPHERS_AES})
+  source_group("src\\\\ciphers\\\\aes" FILES ${TOMCRYPT_CIPHERS_AES})
 
-set(TOMCRYPT_HASHES
+  set(TOMCRYPT_HASHES
       "${TOMDIR}/src/hashes/md5.c"
       "${TOMDIR}/src/hashes/sha1.c"
-  "${TOMDIR}/src/hashes/helper/hash_memory.c"
+      "${TOMDIR}/src/hashes/helper/hash_memory.c")
-)
 
-source_group("src\\\\hashes" FILES ${TOMCRYPT_HASHES})
+  source_group("src\\\\hashes" FILES ${TOMCRYPT_HASHES})
 
-list(APPEND TOMCRYPT_MISC
+  list(APPEND TOMCRYPT_MISC
               "${TOMDIR}/src/misc/burn_stack.c"
               "${TOMDIR}/src/misc/error_to_string.c"
-  "${TOMDIR}/src/misc/zeromem.c"
+              "${TOMDIR}/src/misc/zeromem.c")
-)
 
-source_group("src\\\\misc" FILES ${TOMCRYPT_MISC})
+  source_group("src\\\\misc" FILES ${TOMCRYPT_MISC})
 
-set(TOMCRYPT_MISC_BASE64
+  set(TOMCRYPT_MISC_BASE64 "${TOMDIR}/src/misc/base64/base64_decode.c"
-  "${TOMDIR}/src/misc/base64/base64_decode.c"
+      "${TOMDIR}/src/misc/base64/base64_encode.c")
-  "${TOMDIR}/src/misc/base64/base64_encode.c"
-)
 
-source_group("src\\\\misc\\\\base64" FILES ${TOMCRYPT_MISC_BASE64})
+  source_group("src\\\\misc\\\\base64" FILES ${TOMCRYPT_MISC_BASE64})
 
-set(TOMCRYPT_MISC_PKCS5
+  set(TOMCRYPT_MISC_PKCS5 "${TOMDIR}/src/misc/pkcs5/pkcs_5_1.c"
-  "${TOMDIR}/src/misc/pkcs5/pkcs_5_1.c"
+      "${TOMDIR}/src/misc/pkcs5/pkcs_5_2.c")
-  "${TOMDIR}/src/misc/pkcs5/pkcs_5_2.c"
-)
 
-source_group("src\\\\misc\\\\pkcs5" FILES ${TOMCRYPT_MISC_PKCS5})
+  source_group("src\\\\misc\\\\pkcs5" FILES ${TOMCRYPT_MISC_PKCS5})
 
-set(TOMCRYPT_MATH
+  set(TOMCRYPT_MATH
       "${TOMDIR}/src/math/ltm_desc.c"
       "${TOMDIR}/src/math/fp/ltc_ecc_fp_mulmod.c"
       "${TOMDIR}/src/math/multi.c"
-  "${TOMDIR}/src/math/rand_prime.c"
+      "${TOMDIR}/src/math/rand_prime.c")
-)
 
-source_group("src\\\\math" FILES ${TOMCRYPT_MATH})
+  source_group("src\\\\math" FILES ${TOMCRYPT_MATH})
 
-list(APPEND TOMCRYPT_PRNGS
+  list(APPEND TOMCRYPT_PRNGS
               "${TOMDIR}/src/prngs/fortuna.c"
               "${TOMDIR}/src/prngs/rc4.c"
               "${TOMDIR}/src/prngs/rng_get_bytes.c"
               "${TOMDIR}/src/prngs/rng_make_prng.c"
               "${TOMDIR}/src/prngs/sprng.c"
-  "${TOMDIR}/src/prngs/yarrow.c"
+              "${TOMDIR}/src/prngs/yarrow.c")
-)
 
-source_group("src\\\\prngs" FILES ${TOMCRYPT_PRNGS})
+  source_group("src\\\\prngs" FILES ${TOMCRYPT_PRNGS})
 
-list(APPEND TOMCRYPT_MODES_CBC
+  list(APPEND TOMCRYPT_MODES_CBC
               "${TOMDIR}/src/modes/cbc/cbc_decrypt.c"
               "${TOMDIR}/src/modes/cbc/cbc_done.c"
               "${TOMDIR}/src/modes/cbc/cbc_encrypt.c"
               "${TOMDIR}/src/modes/cbc/cbc_getiv.c"
               "${TOMDIR}/src/modes/cbc/cbc_setiv.c"
-  "${TOMDIR}/src/modes/cbc/cbc_start.c"
+              "${TOMDIR}/src/modes/cbc/cbc_start.c")
-)
 
-source_group("src\\\\modes\\\\cbc" FILES ${TOMCRYPT_MODES_CBC})
+  source_group("src\\\\modes\\\\cbc" FILES ${TOMCRYPT_MODES_CBC})
 
-list(APPEND TOMCRYPT_MODES_CFB
+  list(APPEND TOMCRYPT_MODES_CFB
               "${TOMDIR}/src/modes/cfb/cfb_decrypt.c"
               "${TOMDIR}/src/modes/cfb/cfb_done.c"
               "${TOMDIR}/src/modes/cfb/cfb_encrypt.c"
               "${TOMDIR}/src/modes/cfb/cfb_getiv.c"
               "${TOMDIR}/src/modes/cfb/cfb_setiv.c"
-  "${TOMDIR}/src/modes/cfb/cfb_start.c"
+              "${TOMDIR}/src/modes/cfb/cfb_start.c")
-)
 
-source_group("src\\\\modes\\\\cfb" FILES ${TOMCRYPT_MODES_CFB})
+  source_group("src\\\\modes\\\\cfb" FILES ${TOMCRYPT_MODES_CFB})
 
-list(APPEND TOMCRYPT_MODES_CTR
+  list(APPEND TOMCRYPT_MODES_CTR
               "${TOMDIR}/src/modes/ctr/ctr_decrypt.c"
               "${TOMDIR}/src/modes/ctr/ctr_done.c"
               "${TOMDIR}/src/modes/ctr/ctr_encrypt.c"
               "${TOMDIR}/src/modes/ctr/ctr_getiv.c"
               "${TOMDIR}/src/modes/ctr/ctr_setiv.c"
               "${TOMDIR}/src/modes/ctr/ctr_start.c"
-  "${TOMDIR}/src/modes/ctr/ctr_test.c"
+              "${TOMDIR}/src/modes/ctr/ctr_test.c")
-)
 
-source_group("src\\\\modes\\\\ctr" FILES ${TOMCRYPT_MODES_CTR})
+  source_group("src\\\\modes\\\\ctr" FILES ${TOMCRYPT_MODES_CTR})
 
-list(APPEND TOMCRYPT_MODES_ECB
+  list(APPEND TOMCRYPT_MODES_ECB
               "${TOMDIR}/src/modes/ecb/ecb_decrypt.c"
               "${TOMDIR}/src/modes/ecb/ecb_done.c"
               "${TOMDIR}/src/modes/ecb/ecb_encrypt.c"
-  "${TOMDIR}/src/modes/ecb/ecb_start.c"
+              "${TOMDIR}/src/modes/ecb/ecb_start.c")
-)
 
-source_group("src\\\\modes\\\\ecb" FILES ${TOMCRYPT_MODES_ECB})
+  source_group("src\\\\modes\\\\ecb" FILES ${TOMCRYPT_MODES_ECB})
 
-list(APPEND TOMCRYPT_MODES_OFB
+  list(APPEND TOMCRYPT_MODES_OFB
               "${TOMDIR}/src/modes/ofb/ofb_decrypt.c"
               "${TOMDIR}/src/modes/ofb/ofb_done.c"
               "${TOMDIR}/src/modes/ofb/ofb_encrypt.c"
               "${TOMDIR}/src/modes/ofb/ofb_getiv.c"
               "${TOMDIR}/src/modes/ofb/ofb_setiv.c"
-  "${TOMDIR}/src/modes/ofb/ofb_start.c"
+              "${TOMDIR}/src/modes/ofb/ofb_start.c")
-)
 
-source_group("src\\\\modes\\\\ofb" FILES ${TOMCRYPT_MODES_OFB})
+  source_group("src\\\\modes\\\\ofb" FILES ${TOMCRYPT_MODES_OFB})
 
-list(APPEND TOMCRYPT_PK_RSA
+  list(APPEND TOMCRYPT_PK_RSA
               "${TOMDIR}/src/pk/rsa/rsa_decrypt_key.c"
               "${TOMDIR}/src/pk/rsa/rsa_encrypt_key.c"
               "${TOMDIR}/src/pk/rsa/rsa_export.c"
@@ -148,12 +135,11 @@ list(APPEND TOMCRYPT_PK_RSA
               "${TOMDIR}/src/pk/rsa/rsa_import.c"
               "${TOMDIR}/src/pk/rsa/rsa_make_key.c"
               "${TOMDIR}/src/pk/rsa/rsa_sign_hash.c"
-  "${TOMDIR}/src/pk/rsa/rsa_verify_hash.c"
+              "${TOMDIR}/src/pk/rsa/rsa_verify_hash.c")
-)
 
-source_group("src\\\\pk\\\\rsa" FILES ${TOMCRYPT_PK_RSA})
+  source_group("src\\\\pk\\\\rsa" FILES ${TOMCRYPT_PK_RSA})
 
-list(APPEND TOMCRYPT_PK_PKCS1
+  list(APPEND TOMCRYPT_PK_PKCS1
               "${TOMDIR}/src/pk/pkcs1/pkcs_1_i2osp.c"
               "${TOMDIR}/src/pk/pkcs1/pkcs_1_mgf1.c"
               "${TOMDIR}/src/pk/pkcs1/pkcs_1_oaep_decode.c"
@@ -162,12 +148,11 @@ list(APPEND TOMCRYPT_PK_PKCS1
               "${TOMDIR}/src/pk/pkcs1/pkcs_1_pss_decode.c"
               "${TOMDIR}/src/pk/pkcs1/pkcs_1_pss_encode.c"
               "${TOMDIR}/src/pk/pkcs1/pkcs_1_v1_5_decode.c"
-  "${TOMDIR}/src/pk/pkcs1/pkcs_1_v1_5_encode.c"
+              "${TOMDIR}/src/pk/pkcs1/pkcs_1_v1_5_encode.c")
-)
 
-source_group("src\\\\pk\\\\pkcs1" FILES ${TOMCRYPT_PK_PKCS1})
+  source_group("src\\\\pk\\\\pkcs1" FILES ${TOMCRYPT_PK_PKCS1})
 
-list(APPEND TOMCRYPT_PK_DSA
+  list(APPEND TOMCRYPT_PK_DSA
               "${TOMDIR}/src/pk/dsa/dsa_decrypt_key.c"
               "${TOMDIR}/src/pk/dsa/dsa_encrypt_key.c"
               "${TOMDIR}/src/pk/dsa/dsa_export.c"
@@ -177,12 +162,13 @@ list(APPEND TOMCRYPT_PK_DSA
               "${TOMDIR}/src/pk/dsa/dsa_shared_secret.c"
               "${TOMDIR}/src/pk/dsa/dsa_sign_hash.c"
               "${TOMDIR}/src/pk/dsa/dsa_verify_hash.c"
-  "${TOMDIR}/src/pk/dsa/dsa_verify_key.c"
+              "${TOMDIR}/src/pk/dsa/dsa_verify_key.c")
-)
 
-source_group("src\\\\pk\\\\dsa" FILES ${TOMCRYPT_PK_DSA})
+  source_group("src\\\\pk\\\\dsa" FILES ${TOMCRYPT_PK_DSA})
 
-list(APPEND TOMCRYPT_PK_DER
+  list(
+    APPEND
+      TOMCRYPT_PK_DER
       "${TOMDIR}/src/pk/asn1/der/bit/der_decode_bit_string.c"
       "${TOMDIR}/src/pk/asn1/der/bit/der_encode_bit_string.c"
       "${TOMDIR}/src/pk/asn1/der/bit/der_length_bit_string.c"
@@ -222,12 +208,11 @@ list(APPEND TOMCRYPT_PK_DER
       "${TOMDIR}/src/pk/asn1/der/utctime/der_length_utctime.c"
       "${TOMDIR}/src/pk/asn1/der/utf8/der_decode_utf8_string.c"
       "${TOMDIR}/src/pk/asn1/der/utf8/der_encode_utf8_string.c"
-  "${TOMDIR}/src/pk/asn1/der/utf8/der_length_utf8_string.c"
+      "${TOMDIR}/src/pk/asn1/der/utf8/der_length_utf8_string.c")
-)
 
-source_group("src\\\\pk\\\\ans1" FILES ${TOMCRYPT_PK_DER})
+  source_group("src\\\\pk\\\\ans1" FILES ${TOMCRYPT_PK_DER})
 
-list(APPEND TOMCRYPT_SRC
+  list(APPEND TOMCRYPT_SRC
               ${TOMCRYPT_CIPHERS_AES}
               ${TOMCRYPT_HASHES}
               ${TOMCRYPT_MISC}
@@ -244,10 +229,9 @@ list(APPEND TOMCRYPT_SRC
               ${TOMCRYPT_PK_RSA}
               ${TOMCRYPT_PK_PKCS1}
               ${TOMCRYPT_PK_DSA}
-  ${TOMCRYPT_PK_DER}
+              ${TOMCRYPT_PK_DER})
-)
 
-list(APPEND TOMCRYPT_HPP
+  list(APPEND TOMCRYPT_HPP
               "${TOMDIR}/src/headers/tomcrypt.h"
               "${TOMDIR}/src/headers/tomcrypt_argchk.h"
               "${TOMDIR}/src/headers/tomcrypt_cfg.h"
@@ -260,30 +244,30 @@ list(APPEND TOMCRYPT_HPP
               "${TOMDIR}/src/headers/tomcrypt_misc.h"
               "${TOMDIR}/src/headers/tomcrypt_pk.h"
               "${TOMDIR}/src/headers/tomcrypt_pkcs.h"
-  "${TOMDIR}/src/headers/tomcrypt_prng.h"
+              "${TOMDIR}/src/headers/tomcrypt_prng.h")
-)
 
-source_group("headers" FILES ${TOMCRYPT_HPP})
+  source_group("headers" FILES ${TOMCRYPT_HPP})
 
-add_library("tomcrypt" STATIC ${TOMCRYPT_SRC} ${TOMCRYPT_HPP})
+  add_library("tomcrypt" STATIC ${TOMCRYPT_SRC} ${TOMCRYPT_HPP})
 
-set_property(TARGET "tomcrypt" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "tomcrypt" PROPERTY FOLDER "External Libraries")
 
-if (WITH_PORTABLE_TOMCRYPT)
+  if(WITH_PORTABLE_TOMCRYPT)
     sm_add_compile_definition("tomcrypt" LTC_NO_ASM)
-elseif(WITH_NO_ROLC_TOMCRYPT AND NOT APPLE)
+  endif()
+  if(WITH_NO_ROLC_TOMCRYPT)
     sm_add_compile_definition("tomcrypt" LTC_NO_ROLC)
-endif()
+  endif()
 
-if (APPLE)
+  if(APPLE)
-  sm_add_compile_definition("tomcrypt" LTC_NO_ROLC)
+    sm_append_simple_target_property("tomcrypt"
-  sm_append_simple_target_property("tomcrypt" XCODE_ATTRIBUTE_GCC_NO_COMMON_BLOCKS "YES")
+                                     XCODE_ATTRIBUTE_GCC_NO_COMMON_BLOCKS "YES")
-  sm_append_simple_target_property("tomcrypt" XCODE_ATTRIBUTE_GCC_PREPROCESSOR_DEFINITIONS[variant=Debug]
+  endif()
-  "'CMAKE_INTDIR=\"Debug\"' LTC_NO_ROLC DEBUG=1")
+  if(MSVC)
-elseif (MSVC)
     sm_add_compile_definition("tomcrypt" _CRT_SECURE_NO_WARNINGS)
+  endif()
+
+  disable_project_warnings("tomcrypt")
+
+  target_include_directories("tomcrypt" PUBLIC "${TOMDIR}/src/headers")
 endif()
-
-disable_project_warnings("tomcrypt")
-
-target_include_directories("tomcrypt" PUBLIC "${TOMDIR}/src/headers")

extern/CMakeProject-tommath.cmake

@@ -1,6 +1,12 @@
-set(TOMDIR "${SM_SRC_DIR}/libtommath")
+if(WITH_SYSTEM_TOMMATH)
+  find_library(TOMMATH_LIBRARY tommath)
+  if(TOMMATH_LIBRARY MATCHES "TOMMATH_LIBRARY-NOTFOUND")
+    message(FATAL_ERROR "Need tommath.")
+  endif()
+else()
+  set(TOMDIR "${SM_SRC_DIR}/libtommath")
 
-list(APPEND TOMMATH_SRC
+  list(APPEND TOMMATH_SRC
               "${TOMDIR}/bn_error.c"
               "${TOMDIR}/bn_fast_mp_invmod.c"
               "${TOMDIR}/bn_fast_mp_montgomery_reduce.c"
@@ -119,23 +125,21 @@ list(APPEND TOMMATH_SRC
               "${TOMDIR}/bn_s_mp_mul_high_digs.c"
               "${TOMDIR}/bn_s_mp_sqr.c"
               "${TOMDIR}/bn_s_mp_sub.c"
-  "${TOMDIR}/bncore.c"
+              "${TOMDIR}/bncore.c")
-)
 
-list(APPEND TOMMATH_HPP
+  list(APPEND TOMMATH_HPP
               "${TOMDIR}/tommath.h"
               "${TOMDIR}/tommath_class.h"
-  "${TOMDIR}/tommath_superclass.h"
+              "${TOMDIR}/tommath_superclass.h")
-)
 
-source_group("" FILES ${TOMMATH_SRC})
+  source_group("" FILES ${TOMMATH_SRC})
-source_group("" FILES ${TOMMATH_HPP})
+  source_group("" FILES ${TOMMATH_HPP})
 
-add_library("tommath" STATIC ${TOMMATH_SRC} ${TOMMATH_HPP})
+  add_library("tommath" STATIC ${TOMMATH_SRC} ${TOMMATH_HPP})
 
-set_property(TARGET "tommath" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "tommath" PROPERTY FOLDER "External Libraries")
 
-disable_project_warnings("tommath")
+  disable_project_warnings("tommath")
-
-target_include_directories("tommath" PUBLIC ${TOMDIR})
 
+  target_include_directories("tommath" PUBLIC ${TOMDIR})
+endif()

extern/CMakeProject-vorbis.cmake

@@ -21,8 +21,7 @@ list(APPEND VORBIS_SRC
             "${VORBIS_DIR}/lib/smallft.c"
             "${VORBIS_DIR}/lib/synthesis.c"
             "${VORBIS_DIR}/lib/vorbisenc.c"
-  "${VORBIS_DIR}/lib/window.c"
+            "${VORBIS_DIR}/lib/window.c")
-)
 
 list(APPEND VORBIS_HPP
             "${VORBIS_DIR}/lib/backends.h"
@@ -63,8 +62,7 @@ list(APPEND VORBIS_HPP
             "${VORBIS_DIR}/lib/modes/setup_44u.h"
             "${VORBIS_DIR}/lib/modes/setup_8.h"
             "${VORBIS_DIR}/lib/modes/setup_X.h"
-  "${VORBIS_DIR}/lib/window.h"
+            "${VORBIS_DIR}/lib/window.h")
-)
 
 source_group("Source Files" FILES ${VORBIS_SRC})
 source_group("Header Files" FILES ${VORBIS_HPP})
@@ -78,13 +76,10 @@ disable_project_warnings("vorbis")
 list(APPEND VORBIS_INCLUDE_DIRS
             "${VORBIS_DIR}/lib"
             "${VORBIS_DIR}/include"
-  "${SM_EXTERN_DIR}/newogg/include"
+            "${SM_EXTERN_DIR}/newogg/include")
-)
 
 target_include_directories("vorbis" PUBLIC ${VORBIS_INCLUDE_DIRS})
 
-list(APPEND VORBIS_LINK_LIBS
+list(APPEND VORBIS_LINK_LIBS "ogg")
-  "ogg"
-)
 
 target_link_libraries("vorbis" ${VORBIS_LINK_LIBS})

extern/CMakeProject-vorbisfile.cmake

@@ -1,12 +1,8 @@
 set(VORBISFILE_DIR "${SM_EXTERN_DIR}/newvorbis")
 
-list(APPEND VORBISFILE_SRC
+list(APPEND VORBISFILE_SRC "${VORBISFILE_DIR}/lib/vorbisfile.c")
-  "${VORBISFILE_DIR}/lib/vorbisfile.c"
-)
 
-list(APPEND VORBISFILE_HPP
+list(APPEND VORBISFILE_HPP "${VORBISFILE_DIR}/include/vorbis/vorbisfile.h")
-  "${VORBISFILE_DIR}/include/vorbis/vorbisfile.h"
-)
 
 source_group("Source Files" FILES ${VORBISFILE_SRC})
 source_group("Header Files" FILES ${VORBISFILE_HPP})
@@ -17,14 +13,10 @@ set_property(TARGET "vorbisfile" PROPERTY FOLDER "External Libraries")
 
 disable_project_warnings("vorbisfile")
 
-list(APPEND VORBIS_INCLUDE_DIRS
+list(APPEND VORBIS_INCLUDE_DIRS "${VORBISDIR_DIR}/include")
-  "${VORBISDIR_DIR}/include"
-)
 
 target_include_directories("vorbisfile" PUBLIC ${VORBIS_INCLUDE_DIRS})
 
-list(APPEND VORBISFILE_LINK_LIBS
+list(APPEND VORBISFILE_LINK_LIBS "ogg")
-  "ogg"
-)
 
 target_link_libraries("vorbisfile" ${VORBISFILE_LINK_LIBS})

extern/CMakeProject-zlib.cmake

@@ -1,4 +1,7 @@
-list(APPEND ZLIB_SRC
+if(WITH_SYSTEM_ZLIB)
+  find_package(ZLIB REQUIRED)
+else()
+  list(APPEND ZLIB_SRC
               "zlib/adler32.c"
               "zlib/compress.c"
               "zlib/crc32.c"
@@ -14,10 +17,9 @@ list(APPEND ZLIB_SRC
               "zlib/minigzip.c"
               "zlib/trees.c"
               "zlib/uncompr.c"
-  "zlib/zutil.c"
+              "zlib/zutil.c")
-)
 
-list(APPEND ZLIB_HPP
+  list(APPEND ZLIB_HPP
               "zlib/crc32.h"
               "zlib/deflate.h"
               "zlib/gzguts.h"
@@ -28,17 +30,17 @@ list(APPEND ZLIB_HPP
               "zlib/trees.h"
               "zlib/zconf.h"
               "zlib/zlib.h"
-  "zlib/zutil.h"
+              "zlib/zutil.h")
-)
 
-source_group("" FILES ${ZLIB_SRC} ${ZLIB_HPP})
+  source_group("" FILES ${ZLIB_SRC} ${ZLIB_HPP})
 
-add_library("zlib" ${ZLIB_SRC} ${ZLIB_HPP})
+  add_library("zlib" ${ZLIB_SRC} ${ZLIB_HPP})
 
-set_property(TARGET "zlib" PROPERTY FOLDER "External Libraries")
+  set_property(TARGET "zlib" PROPERTY FOLDER "External Libraries")
 
-disable_project_warnings("zlib")
+  disable_project_warnings("zlib")
 
-if(MSVC)
+  if(MSVC)
     sm_add_compile_definition("zlib" _MBCS)
-endif(MSVC)
+  endif(MSVC)
+endif()

extern/libpng/include/CMakeLists.txt

@@ -2,9 +2,8 @@
 
 # Copyright (C) 2007-2011 Glenn Randers-Pehrson
 
-# This code is released under the libpng license.
+# This code is released under the libpng license. For conditions of distribution
-# For conditions of distribution and use, see the disclaimer
+# and use, see the disclaimer and license in png.h
-# and license in png.h
 
 cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
@@ -12,16 +11,16 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE)
   if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
     # workaround CMake 2.4.x bug
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+    set(CMAKE_BUILD_TYPE "RelWithDebInfo"
-        "Choose the type of build, options are:
+        CACHE STRING "Choose the type of build, options are:
            None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)
            Debug
            Release
            RelWithDebInfo
            MinSizeRel.")
   else()
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+    set(CMAKE_BUILD_TYPE "RelWithDebInfo"
-        "Choose the type of build, options are:
+        CACHE STRING "Choose the type of build, options are:
            None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)
            Debug
            Release
@@ -44,13 +43,10 @@ find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIR})
 
 if(NOT WIN32)
-  find_library(M_LIBRARY
+  find_library(M_LIBRARY NAMES m PATHS /usr/lib /usr/local/lib)
-    NAMES m
-    PATHS /usr/lib /usr/local/lib
-  )
   if(NOT M_LIBRARY)
-    message(STATUS
+    message(
-      "math library 'libm' not found - floating point support disabled")
+      STATUS "math library 'libm' not found - floating point support disabled")
   endif()
 else()
   # not needed on windows
@@ -81,20 +77,16 @@ set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
 # to distinguish between debug and release lib
 set(CMAKE_DEBUG_POSTFIX "d")
 
-# Use the prebuilt pnglibconf.h file from the scripts folder
+# Use the prebuilt pnglibconf.h file from the scripts folder TODO: fix this by
-# TODO: fix this by building with awk; without this no cmake build can be
+# building with awk; without this no cmake build can be configured directly (to
-# configured directly (to do so indirectly use your local awk to build a
+# do so indirectly use your local awk to build a pnglibconf.h in the build
-# pnglibconf.h in the build directory.)
+# directory.)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
                ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # OUR SOURCES
-set(libpng_public_hdrs
+set(libpng_public_hdrs png.h pngconf.h ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
-  png.h
-  pngconf.h
-  ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h
-)
 set(libpng_sources
     ${libpng_public_hdrs}
     pngdebug.h
@@ -115,14 +107,9 @@ set(libpng_sources
     pngwio.c
     pngwrite.c
     pngwtran.c
-  pngwutil.c
+    pngwutil.c)
-)
+set(pngtest_sources pngtest.c)
-set(pngtest_sources
+set(pngvalid_sources contrib/libtests/pngvalid.c)
-  pngtest.c
-)
-set(pngvalid_sources
-  contrib/libtests/pngvalid.c
-)
 # SOME NEEDED DEFINITIONS
 
 add_definitions(-DPNG_CONFIGURE_LIBPNG)
@@ -149,7 +136,7 @@ if(PNG_SHARED)
 endif()
 
 if(PNG_STATIC)
-# does not work without changing name
+  # does not work without changing name
   set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)
   add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})
   if(MSVC)
@@ -175,26 +162,33 @@ if(PNG_TESTS AND PNG_SHARED)
 endif()
 
 # Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set
-IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-  SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib")
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib")
-ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+endif(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
 
-# Set a variable with CMake code which:
+# Set a variable with CMake code which: Creates a symlink from src to dest (if
-# Creates a symlink from src to dest (if possible) or alternatively
+# possible) or alternatively copies if different.
-# copies if different.
 macro(CREATE_SYMLINK SRC_FILE DEST_FILE)
-  FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
+  file(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
   if(WIN32 AND NOT CYGWIN AND NOT MINGW)
-    ADD_CUSTOM_COMMAND(
+    add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
-        OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}   ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
+                              ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
-        COMMAND ${CMAKE_COMMAND} -E copy        ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
+                       COMMAND ${CMAKE_COMMAND} -E copy
-        COMMAND ${CMAKE_COMMAND} -E copy        ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
+                               ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE}
-        DEPENDS ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC}
+                               ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
-        )
+                       COMMAND ${CMAKE_COMMAND} -E copy
-    ADD_CUSTOM_TARGET(${DEST_FILE}_COPY ALL DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
+                               ${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE}
+                               ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE}
+                       DEPENDS ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC})
+    add_custom_target(${DEST_FILE}_COPY ALL
+                      DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE})
   else(WIN32 AND NOT CYGWIN AND NOT MINGW)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE}
-    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE} ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+                            ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC_FILE}
+                            ${DEST_FILE}
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   endif(WIN32 AND NOT CYGWIN AND NOT MINGW)
 endmacro()
 
@@ -203,10 +197,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
   set(CMAKE_INSTALL_LIBDIR lib)
 endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 
-# CREATE PKGCONFIG FILES
+# CREATE PKGCONFIG FILES we use the same files like ./configure, so we have to
-# we use the same files like ./configure, so we have to set its vars
+# set its vars Only do this on Windows for Cygwin - the files don't make much
-# Only do this on Windows for Cygwin - the files don't make much sense outside
+# sense outside a UNIX look alike
-# a UNIX look alike
 if(NOT WIN32 OR CYGWIN OR MINGW)
   set(prefix ${CMAKE_INSTALL_PREFIX})
   set(exec_prefix ${CMAKE_INSTALL_PREFIX})
@@ -215,35 +208,39 @@ if(NOT WIN32 OR CYGWIN OR MINGW)
   set(LIBS "-lz -lm")
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
-  CREATE_SYMLINK(${PNGLIB_NAME}.pc libpng.pc)
+  create_symlink(${PNGLIB_NAME}.pc libpng.pc)
 
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
                  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
-  CREATE_SYMLINK(${PNGLIB_NAME}-config libpng-config)
+  create_symlink(${PNGLIB_NAME}-config libpng-config)
 endif(NOT WIN32 OR CYGWIN OR MINGW)
 
 # SET UP LINKS
 if(PNG_SHARED)
-  set_target_properties(${PNG_LIB_NAME} PROPERTIES
+  set_target_properties(${PNG_LIB_NAME}
-#   VERSION 15.${PNGLIB_RELEASE}.1.5.10
+                        PROPERTIES # VERSION 15.${PNGLIB_RELEASE}.1.5.10
-    VERSION 15.${PNGLIB_RELEASE}.0
+                                   VERSION
-    SOVERSION 15
+                                   15.${PNGLIB_RELEASE}.0
-    CLEAN_DIRECT_OUTPUT 1)
+                                   SOVERSION
+                                   15
+                                   CLEAN_DIRECT_OUTPUT
+                                   1)
 endif()
 if(PNG_STATIC)
-  # MSVC doesn't use a different file extension for shared vs. static
+  # MSVC doesn't use a different file extension for shared vs. static libs.  We
-  # libs.  We are able to change OUTPUT_NAME to remove the _static
+  # are able to change OUTPUT_NAME to remove the _static for all other
-  # for all other platforms.
+  # platforms.
   if(NOT MSVC)
-    set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
+    set_target_properties(${PNG_LIB_NAME_STATIC}
-      OUTPUT_NAME ${PNG_LIB_NAME}
+                          PROPERTIES OUTPUT_NAME
-      CLEAN_DIRECT_OUTPUT 1)
+                                     ${PNG_LIB_NAME}
+                                     CLEAN_DIRECT_OUTPUT
+                                     1)
   endif()
 endif()
 
-# If CMake > 2.4.x, we set a variable used below to export
+# If CMake > 2.4.x, we set a variable used below to export targets to an export
-# targets to an export file.
+# file. TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2
-# TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2
 if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4)
   set(PNG_EXPORT_RULE EXPORT libpng)
 elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof
@@ -251,52 +248,56 @@ elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof
 endif()
 
 # INSTALL
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
   if(PNG_SHARED)
-    install(TARGETS ${PNG_LIB_NAME}
+    install(TARGETS ${PNG_LIB_NAME} ${PNG_EXPORT_RULE}
-        ${PNG_EXPORT_RULE}
             RUNTIME DESTINATION bin
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
     # Create a symlink for libpng.dll.a => libpng15.dll.a on Cygwin
     if(CYGWIN OR MINGW)
-       get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE})
+      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME}
+                          LOCATION_${CMAKE_BUILD_TYPE})
       get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME)
-       CREATE_SYMLINK(${BUILD_TARGET_FILE} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})
+      create_symlink(${BUILD_TARGET_FILE} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})
-       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
+      install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif(CYGWIN OR MINGW)
 
     if(NOT WIN32)
-      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE})
+      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME}
+                          LOCATION_${CMAKE_BUILD_TYPE})
       get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME)
-      CREATE_SYMLINK(${BUILD_TARGET_FILE} libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
+      create_symlink(${BUILD_TARGET_FILE} libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
+      install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif(NOT WIN32)
   endif(PNG_SHARED)
 
   if(PNG_STATIC)
-    install(TARGETS ${PNG_LIB_NAME_STATIC}
+    install(TARGETS ${PNG_LIB_NAME_STATIC} ${PNG_EXPORT_RULE}
-        ${PNG_EXPORT_RULE}
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     if(NOT WIN32 OR CYGWIN OR MINGW)
-      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC} LOCATION_${CMAKE_BUILD_TYPE})
+      get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC}
+                          LOCATION_${CMAKE_BUILD_TYPE})
       get_filename_component(BUILD_TARGET_FILE ${BUILD_TARGET_LOCATION} NAME)
-      CREATE_SYMLINK(${BUILD_TARGET_FILE} libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
+      create_symlink(${BUILD_TARGET_FILE} libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
+      install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
         DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif(NOT WIN32 OR CYGWIN OR MINGW)
   endif()
 endif()
 
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
   install(FILES ${libpng_public_hdrs} DESTINATION include)
   install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME})
 endif()
-if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL)
   if(NOT WIN32 OR CYGWIN OR MINGW)
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
@@ -304,7 +305,7 @@ if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL )
   endif(NOT WIN32 OR CYGWIN OR MINGW)
 endif()
 
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
   # Install man pages
   if(NOT PNG_MAN_DIR)
     set(PNG_MAN_DIR "share/man")
@@ -315,8 +316,7 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
   if(NOT WIN32 OR CYGWIN OR MINGW)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
-            DESTINATION bin)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
@@ -324,21 +324,17 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
   endif(NOT WIN32 OR CYGWIN OR MINGW)
 endif()
 
-# On versions of CMake that support it, create an export file CMake
+# On versions of CMake that support it, create an export file CMake users can
-# users can include() to import our targets
+# include() to import our targets
-if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL )
+if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
   install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
 endif()
 
 # what's with libpng-$VER%.txt and all the extra files?
 
-# UNINSTALL
+# UNINSTALL do we need this?
-# do we need this?
 
-# DIST
+# DIST do we need this?
-# do we need this?
-
-# to create msvc import lib for mingw compiled shared lib
-# pexports libpng.dll > libpng.def
-# lib /def:libpng.def /machine:x86
 
+# to create msvc import lib for mingw compiled shared lib pexports libpng.dll >
+# libpng.def lib /def:libpng.def /machine:x86

extern/zlib/CMakeLists.txt

@@ -21,9 +21,8 @@ check_include_file(stddef.h    HAVE_STDDEF_H)
 # Check to see if we have large file support
 #
 set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
+# We add these other definitions here because CheckTypeSize.cmake in CMake 2.4.x
-# in CMake 2.4.x does not automatically do so and we want
+# does not automatically do so and we want compatibility with CMake 2.4.x.
-# compatibility with CMake 2.4.x.
 if(HAVE_SYS_TYPES_H)
   list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
 endif()
@@ -59,11 +58,11 @@ if(MSVC)
 endif()
 
 if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
+  # If we're doing an out of source build and the user has a zconf.h in their
-    # in their source tree...
+  # source tree...
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-        message(FATAL_ERROR
+    message(
-            "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
+      FATAL_ERROR "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
                   "from the source tree.  This file is included with zlib "
                   "but CMake generates this file for you automatically "
                   "in the build directory.")
@@ -74,15 +73,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
                ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-
+# ============================================================================
-#============================================================================
 # zlib
-#============================================================================
+# ============================================================================
 
-set(ZLIB_PUBLIC_HDRS
+set(ZLIB_PUBLIC_HDRS ${CMAKE_CURRENT_BINARY_DIR}/zconf.h zlib.h)
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-    zlib.h
-)
 set(ZLIB_PRIVATE_HDRS
     crc32.h
     deflate.h
@@ -92,8 +87,7 @@ set(ZLIB_PRIVATE_HDRS
     inflate.h
     inftrees.h
     trees.h
-    zutil.h
+    zutil.h)
-)
 set(ZLIB_SRCS
     adler32.c
     compress.c
@@ -110,23 +104,24 @@ set(ZLIB_SRCS
     trees.c
     uncompr.c
     zutil.c
-    win32/zlib1.rc
+    win32/zlib1.rc)
-)
 
 # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"
+string(REGEX
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+       REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"
+               "\\1"
+               ZLIB_FULL_VERSION
+               ${_zlib_h_contents})
 
 if(MINGW)
   # This gets us DLL resource information when compiling on MinGW.
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                       COMMAND windres.exe
+                     COMMAND windres.exe -D GCC_WINDRES -I
-                            -D GCC_WINDRES
+                             ${CMAKE_CURRENT_SOURCE_DIR} -I
-                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                             ${CMAKE_CURRENT_BINARY_DIR} -O
-                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                             ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj -I
-                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                             ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
   set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
 endif(MINGW)
 
@@ -137,12 +132,12 @@ set_target_properties(zlib PROPERTIES SOVERSION 1)
 
 if(NOT CYGWIN)
   # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
+  # encoded into their final filename.  We disable this on Cygwin because it
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+  # causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll seems to be
-    # seems to be the default.
+  # the default.
   #
-    # This has no effect with MSVC, on that platform the version info for
+  # This has no effect with MSVC, on that platform the version info for the DLL
-    # the DLL comes from the resource file win32/zlib1.rc
+  # comes from the resource file win32/zlib1.rc
   set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
 endif()
 
@@ -154,22 +149,22 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
   set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
 endif()
 
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
   install(TARGETS zlib
           RUNTIME DESTINATION bin
           ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib )
+          LIBRARY DESTINATION lib)
 endif()
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
   install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
 endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
   install(FILES zlib.3 DESTINATION share/man/man3)
 endif()
 
-#============================================================================
+# ============================================================================
 # Example binaries
-#============================================================================
+# ============================================================================
 
 add_executable(example example.c)
 target_link_libraries(example zlib)
@@ -181,10 +176,12 @@ target_link_libraries(minigzip zlib)
 if(HAVE_OFF64_T)
   add_executable(example64 example.c)
   target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+  set_target_properties(example64
+                        PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
   add_test(example64 example64)
 
   add_executable(minigzip64 minigzip.c)
   target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+  set_target_properties(minigzip64
+                        PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
 endif()

src/CMakeData-actor.cmake

@@ -17,8 +17,7 @@ list(APPEND SMDATA_ACTOR_BASE_SRC
             "Quad.cpp"
             "RollingNumbers.cpp"
             "Sprite.cpp"
-  "Tween.cpp"
+            "Tween.cpp")
-)
 list(APPEND SMDATA_ACTOR_BASE_HPP
             "Actor.h"
             "ActorFrame.h"
@@ -38,10 +37,12 @@ list(APPEND SMDATA_ACTOR_BASE_HPP
             "Quad.h"
             "RollingNumbers.h"
             "Sprite.h"
-  "Tween.h"
+            "Tween.h")
-)
 
-source_group("Actors\\\\Base" FILES ${SMDATA_ACTOR_BASE_SRC} ${SMDATA_ACTOR_BASE_HPP})
+source_group("Actors\\\\Base"
+             FILES
+             ${SMDATA_ACTOR_BASE_SRC}
+             ${SMDATA_ACTOR_BASE_HPP})
 
 list(APPEND SMDATA_ACTOR_GAMEPLAY_SRC
             "ActiveAttackList.cpp"
@@ -74,8 +75,7 @@ list(APPEND SMDATA_ACTOR_GAMEPLAY_SRC
             "ScoreDisplayNormal.cpp"
             "ScoreDisplayOni.cpp"
             "ScoreDisplayPercentage.cpp"
-  "ScoreDisplayRave.cpp"
+            "ScoreDisplayRave.cpp")
-)
 
 list(APPEND SMDATA_ACTOR_GAMEPLAY_HPP
             "ActiveAttackList.h"
@@ -109,9 +109,11 @@ list(APPEND SMDATA_ACTOR_GAMEPLAY_HPP
             "ScoreDisplayNormal.h"
             "ScoreDisplayOni.h"
             "ScoreDisplayPercentage.h"
-  "ScoreDisplayRave.h"
+            "ScoreDisplayRave.h")
-)
+source_group("Actors\\\\Gameplay"
-source_group("Actors\\\\Gameplay" FILES ${SMDATA_ACTOR_GAMEPLAY_SRC} ${SMDATA_ACTOR_GAMEPLAY_HPP})
+             FILES
+             ${SMDATA_ACTOR_GAMEPLAY_SRC}
+             ${SMDATA_ACTOR_GAMEPLAY_HPP})
 
 list(APPEND SMDATA_ACTOR_MENU_SRC
             "BPMDisplay.cpp"
@@ -142,8 +144,7 @@ list(APPEND SMDATA_ACTOR_MENU_SRC
             "WheelBase.cpp"
             "WheelItemBase.cpp"
             "WheelNotifyIcon.cpp"
-  "WorkoutGraph.cpp"
+            "WorkoutGraph.cpp")
-)
 list(APPEND SMDATA_ACTOR_MENU_HPP
             "BPMDisplay.h"
             "ComboGraph.h"
@@ -173,19 +174,17 @@ list(APPEND SMDATA_ACTOR_MENU_HPP
             "WheelBase.h"
             "WheelItemBase.h"
             "WheelNotifyIcon.h"
-  "WorkoutGraph.h"
+            "WorkoutGraph.h")
-)
 
 if(WITH_NETWORKING)
-  list(APPEND SMDATA_ACTOR_MENU_SRC
+  list(APPEND SMDATA_ACTOR_MENU_SRC "RoomInfoDisplay.cpp")
-    "RoomInfoDisplay.cpp"
+  list(APPEND SMDATA_ACTOR_MENU_HPP "RoomInfoDisplay.h")
-  )
-  list(APPEND SMDATA_ACTOR_MENU_HPP
-    "RoomInfoDisplay.h"
-  )
 endif()
 
-source_group("Actors\\\\Menus" FILES ${SMDATA_ACTOR_MENU_SRC} ${SMDATA_ACTOR_MENU_HPP})
+source_group("Actors\\\\Menus"
+             FILES
+             ${SMDATA_ACTOR_MENU_SRC}
+             ${SMDATA_ACTOR_MENU_HPP})
 
 list(APPEND SMDATA_ACTOR_GAMEPLAY_MENU_SRC
             "Banner.cpp"
@@ -195,8 +194,7 @@ list(APPEND SMDATA_ACTOR_GAMEPLAY_MENU_SRC
             "MeterDisplay.cpp"
             "StepsDisplay.cpp"
             "StreamDisplay.cpp"
-  "Transition.cpp"
+            "Transition.cpp")
-)
 
 list(APPEND SMDATA_ACTOR_GAMEPLAY_MENU_HPP
             "Banner.h"
@@ -206,20 +204,20 @@ list(APPEND SMDATA_ACTOR_GAMEPLAY_MENU_HPP
             "MeterDisplay.h"
             "StepsDisplay.h"
             "StreamDisplay.h"
-  "Transition.h"
+            "Transition.h")
-)
 
-source_group("Actors\\\\Gameplay and Menus" FILES ${SMDATA_ACTOR_GAMEPLAY_MENU_SRC} ${SMDATA_ACTOR_GAMEPLAY_MENU_HPP})
+source_group("Actors\\\\Gameplay and Menus"
+             FILES
+             ${SMDATA_ACTOR_GAMEPLAY_MENU_SRC}
+             ${SMDATA_ACTOR_GAMEPLAY_MENU_HPP})
 
 list(APPEND SMDATA_ALL_ACTORS_SRC
             ${SMDATA_ACTOR_BASE_SRC}
             ${SMDATA_ACTOR_GAMEPLAY_SRC}
             ${SMDATA_ACTOR_MENU_SRC}
-  ${SMDATA_ACTOR_GAMEPLAY_MENU_SRC}
+            ${SMDATA_ACTOR_GAMEPLAY_MENU_SRC})
-)
 list(APPEND SMDATA_ALL_ACTORS_HPP
             ${SMDATA_ACTOR_BASE_HPP}
             ${SMDATA_ACTOR_GAMEPLAY_HPP}
             ${SMDATA_ACTOR_MENU_HPP}
-  ${SMDATA_ACTOR_GAMEPLAY_MENU_HPP}
+            ${SMDATA_ACTOR_GAMEPLAY_MENU_HPP})
-)

src/CMakeData-arch.cmake

@@ -1,305 +1,227 @@
-list(APPEND SMDATA_ARCH_SRC
+list(APPEND SMDATA_ARCH_SRC "arch/RageDriver.cpp")
-  "arch/RageDriver.cpp"
-)
 
-list(APPEND SMDATA_ARCH_HPP
+list(APPEND SMDATA_ARCH_HPP "arch/arch_default.h" "arch/RageDriver.h")
-  "arch/arch_default.h"
-  "arch/RageDriver.h"
-)
 
 source_group("Arch Specific" FILES ${SMDATA_ARCH_SRC} ${SMDATA_ARCH_HPP})
 
-list(APPEND SMDATA_ARCH_THREADS_HPP
+list(APPEND SMDATA_ARCH_THREADS_HPP "arch/Threads/Threads.h")
-  "arch/Threads/Threads.h"
-)
 
 if(WIN32)
-  list(APPEND SMDATA_ARCH_THREADS_HPP
+  list(APPEND SMDATA_ARCH_THREADS_HPP "arch/Threads/Threads_Win32.h")
-    "arch/Threads/Threads_Win32.h"
+  list(APPEND SMDATA_ARCH_THREADS_SRC "arch/Threads/Threads_Win32.cpp")
-  )
-  list(APPEND SMDATA_ARCH_THREADS_SRC
-    "arch/Threads/Threads_Win32.cpp"
-  )
 elseif(APPLE)
-  list(APPEND SMDATA_ARCH_THREADS_HPP
+  list(APPEND SMDATA_ARCH_THREADS_HPP "arch/Threads/Threads_Pthreads.h")
-    "arch/Threads/Threads_Pthreads.h"
+  list(APPEND SMDATA_ARCH_THREADS_SRC "arch/Threads/Threads_Pthreads.cpp")
-  )
-  list(APPEND SMDATA_ARCH_THREADS_SRC
-    "arch/Threads/Threads_Pthreads.cpp"
-  )
 else()
   if(HAS_PTHREAD)
-    list(APPEND SMDATA_ARCH_THREADS_HPP
+    list(APPEND SMDATA_ARCH_THREADS_HPP "arch/Threads/Threads_Pthreads.h")
-      "arch/Threads/Threads_Pthreads.h"
+    list(APPEND SMDATA_ARCH_THREADS_SRC "arch/Threads/Threads_Pthreads.cpp")
-    )
-    list(APPEND SMDATA_ARCH_THREADS_SRC
-      "arch/Threads/Threads_Pthreads.cpp"
-    )
   endif()
 endif()
 
-source_group("Arch Specific\\\\Threads" FILES ${SMDATA_ARCH_THREADS_SRC} ${SMDATA_ARCH_THREADS_HPP})
+source_group("Arch Specific\\\\Threads"
+             FILES
+             ${SMDATA_ARCH_THREADS_SRC}
+             ${SMDATA_ARCH_THREADS_HPP})
 
 list(APPEND SMDATA_ARCH_SOUND_SRC
             "arch/Sound/RageSoundDriver.cpp"
             "arch/Sound/RageSoundDriver_Generic_Software.cpp"
-  "arch/Sound/RageSoundDriver_Null.cpp"
+            "arch/Sound/RageSoundDriver_Null.cpp")
-)
 
-list(APPEND SMDATA_ARCH_SOUND_HPP
+list(APPEND SMDATA_ARCH_SOUND_HPP "arch/Sound/RageSoundDriver.h"
-  "arch/Sound/RageSoundDriver.h"
+            "arch/Sound/RageSoundDriver_Null.h")
-  "arch/Sound/RageSoundDriver_Null.h"
-)
 
 if(WIN32)
   list(APPEND SMDATA_ARCH_SOUND_SRC
               "arch/Sound/DSoundHelpers.cpp"
               "arch/Sound/RageSoundDriver_DSound_Software.cpp"
               "arch/Sound/RageSoundDriver_WaveOut.cpp"
-    "arch/Sound/RageSoundDriver_WDMKS.cpp"
+              "arch/Sound/RageSoundDriver_WDMKS.cpp")
-  )
   list(APPEND SMDATA_ARCH_SOUND_HPP
               "arch/Sound/DSoundHelpers.h"
               "arch/Sound/RageSoundDriver_DSound_Software.h"
               "arch/Sound/RageSoundDriver_WaveOut.h"
-    "arch/Sound/RageSoundDriver_WDMKS.h"
+              "arch/Sound/RageSoundDriver_WDMKS.h")
-  )
 elseif(APPLE)
-  list(APPEND SMDATA_ARCH_SOUND_SRC
+  list(APPEND SMDATA_ARCH_SOUND_SRC "arch/Sound/RageSoundDriver_AU.cpp")
-    "arch/Sound/RageSoundDriver_AU.cpp"
+  list(APPEND SMDATA_ARCH_SOUND_HPP "arch/Sound/RageSoundDriver_AU.h")
-  )
-  list(APPEND SMDATA_ARCH_SOUND_HPP
-    "arch/Sound/RageSoundDriver_AU.h"
-  )
 else() # Unix
-  if (HAS_PULSE)
+  if(HAS_PULSE)
     list(APPEND SMDATA_ARCH_SOUND_SRC
-      "arch/Sound/RageSoundDriver_PulseAudio.cpp"
+                "arch/Sound/RageSoundDriver_PulseAudio.cpp")
-    )
+    list(APPEND SMDATA_ARCH_SOUND_HPP "arch/Sound/RageSoundDriver_PulseAudio.h")
-    list(APPEND SMDATA_ARCH_SOUND_HPP
-      "arch/Sound/RageSoundDriver_PulseAudio.h"
-    )
   endif()
-  if (HAS_ALSA)
+  if(HAS_ALSA)
     list(APPEND SMDATA_ARCH_SOUND_SRC
                 "arch/Sound/ALSA9Dynamic.cpp"
                 "arch/Sound/ALSA9Helpers.cpp"
-      "arch/Sound/RageSoundDriver_ALSA9_Software.cpp"
+                "arch/Sound/RageSoundDriver_ALSA9_Software.cpp")
-    )
     list(APPEND SMDATA_ARCH_SOUND_HPP
                 "arch/Sound/ALSA9Dynamic.h"
                 "arch/Sound/ALSA9Functions.h"
                 "arch/Sound/ALSA9Helpers.h"
-      "arch/Sound/RageSoundDriver_ALSA9_Software.h"
+                "arch/Sound/RageSoundDriver_ALSA9_Software.h")
-    )
   endif()
-  if (HAS_JACK)
+  if(HAS_JACK)
-    list(APPEND SMDATA_ARCH_SOUND_SRC
+    list(APPEND SMDATA_ARCH_SOUND_SRC "arch/Sound/RageSoundDriver_JACK.cpp")
-      "arch/Sound/RageSoundDriver_JACK.cpp"
+    list(APPEND SMDATA_ARCH_SOUND_HPP "arch/Sound/RageSoundDriver_JACK.h")
-    )
-    list(APPEND SMDATA_ARCH_SOUND_HPP
-      "arch/Sound/RageSoundDriver_JACK.h"
-    )
   endif()
-  if (HAS_OSS)
+  if(HAS_OSS)
-    list(APPEND SMDATA_ARCH_SOUND_SRC
+    list(APPEND SMDATA_ARCH_SOUND_SRC "arch/Sound/RageSoundDriver_OSS.cpp")
-      "arch/Sound/RageSoundDriver_OSS.cpp"
+    list(APPEND SMDATA_ARCH_SOUND_HPP "arch/Sound/RageSoundDriver_OSS.h")
-    )
-    list(APPEND SMDATA_ARCH_SOUND_HPP
-      "arch/Sound/RageSoundDriver_OSS.h"
-    )
   endif()
 endif()
 
-source_group("Arch Specific\\\\Sound" FILES ${SMDATA_ARCH_SOUND_SRC} ${SMDATA_ARCH_SOUND_HPP})
+source_group("Arch Specific\\\\Sound"
+             FILES
+             ${SMDATA_ARCH_SOUND_SRC}
+             ${SMDATA_ARCH_SOUND_HPP})
 
 list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
             "arch/MovieTexture/MovieTexture.cpp"
             "arch/MovieTexture/MovieTexture_Generic.cpp"
-  "arch/MovieTexture/MovieTexture_Null.cpp"
+            "arch/MovieTexture/MovieTexture_Null.cpp")
-)
 list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
             "arch/MovieTexture/MovieTexture.h"
             "arch/MovieTexture/MovieTexture_Generic.h"
-  "arch/MovieTexture/MovieTexture_Null.h"
+            "arch/MovieTexture/MovieTexture_Null.h")
-)
 
 if(APPLE)
-  if (${HAS_FFMPEG})
+  if(${HAS_FFMPEG})
     list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
-      "arch/MovieTexture/MovieTexture_FFMpeg.cpp"
+                "arch/MovieTexture/MovieTexture_FFMpeg.cpp")
-    )
     list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
-      "arch/MovieTexture/MovieTexture_FFMpeg.h"
+                "arch/MovieTexture/MovieTexture_FFMpeg.h")
-    )
   endif()
 elseif(MSVC)
   list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
-    "arch/MovieTexture/MovieTexture_FFMpeg.cpp"
+              "arch/MovieTexture/MovieTexture_FFMpeg.cpp")
-  )
   list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
-    "arch/MovieTexture/MovieTexture_FFMpeg.h"
+              "arch/MovieTexture/MovieTexture_FFMpeg.h")
-  )
 else() # Unix
-  if (${HAS_FFMPEG})
+  if(${HAS_FFMPEG})
     list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_SRC
-      "arch/MovieTexture/MovieTexture_FFMpeg.cpp"
+                "arch/MovieTexture/MovieTexture_FFMpeg.cpp")
-    )
     list(APPEND SMDATA_ARCH_MOVIE_TEXTURE_HPP
-      "arch/MovieTexture/MovieTexture_FFMpeg.h"
+                "arch/MovieTexture/MovieTexture_FFMpeg.h")
-    )
   endif()
 endif()
 
-source_group("Arch Specific\\\\Movie Texture" FILES ${SMDATA_ARCH_MOVIE_TEXTURE_SRC} ${SMDATA_ARCH_MOVIE_TEXTURE_HPP})
+source_group("Arch Specific\\\\Movie Texture"
+             FILES
+             ${SMDATA_ARCH_MOVIE_TEXTURE_SRC}
+             ${SMDATA_ARCH_MOVIE_TEXTURE_HPP})
 
-list(APPEND SMDATA_ARCH_MEMORY_SRC
+list(APPEND SMDATA_ARCH_MEMORY_SRC "arch/MemoryCard/MemoryCardDriver.cpp"
-  "arch/MemoryCard/MemoryCardDriver.cpp"
+            "arch/MemoryCard/MemoryCardDriverThreaded_Folder.cpp")
-  "arch/MemoryCard/MemoryCardDriverThreaded_Folder.cpp"
-)
 list(APPEND SMDATA_ARCH_MEMORY_HPP
             "arch/MemoryCard/MemoryCardDriver.h"
             "arch/MemoryCard/MemoryCardDriver_Null.h"
-  "arch/MemoryCard/MemoryCardDriverThreaded_Folder.h"
+            "arch/MemoryCard/MemoryCardDriverThreaded_Folder.h")
-)
 
 if(WIN32)
   list(APPEND SMDATA_ARCH_MEMORY_SRC
-    "arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp"
+              "arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp")
-  )
   list(APPEND SMDATA_ARCH_MEMORY_HPP
-    "arch/MemoryCard/MemoryCardDriverThreaded_Windows.h"
+              "arch/MemoryCard/MemoryCardDriverThreaded_Windows.h")
-  )
 elseif(APPLE)
   list(APPEND SMDATA_ARCH_MEMORY_SRC
-    "arch/MemoryCard/MemoryCardDriverThreaded_MacOSX.cpp"
+              "arch/MemoryCard/MemoryCardDriverThreaded_MacOSX.cpp")
-  )
   list(APPEND SMDATA_ARCH_MEMORY_HPP
-    "arch/MemoryCard/MemoryCardDriverThreaded_MacOSX.h"
+              "arch/MemoryCard/MemoryCardDriverThreaded_MacOSX.h")
-  )
 elseif(LINUX)
   list(APPEND SMDATA_ARCH_MEMORY_SRC
-    "arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp"
+              "arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp")
-  )
   list(APPEND SMDATA_ARCH_MEMORY_HPP
-    "arch/MemoryCard/MemoryCardDriverThreaded_Linux.h"
+              "arch/MemoryCard/MemoryCardDriverThreaded_Linux.h")
-  )
 endif()
 
-source_group("Arch Specific\\\\Memory Card" FILES ${SMDATA_ARCH_MEMORY_SRC} ${SMDATA_ARCH_MEMORY_HPP})
+source_group("Arch Specific\\\\Memory Card"
+             FILES
+             ${SMDATA_ARCH_MEMORY_SRC}
+             ${SMDATA_ARCH_MEMORY_HPP})
 
-list(APPEND SMDATA_ARCH_LOWLEVEL_SRC
+list(APPEND SMDATA_ARCH_LOWLEVEL_SRC "arch/LowLevelWindow/LowLevelWindow.cpp")
-  "arch/LowLevelWindow/LowLevelWindow.cpp"
+list(APPEND SMDATA_ARCH_LOWLEVEL_HPP "arch/LowLevelWindow/LowLevelWindow.h")
-)
-list(APPEND SMDATA_ARCH_LOWLEVEL_HPP
-  "arch/LowLevelWindow/LowLevelWindow.h"
-)
 
 if(WIN32)
   list(APPEND SMDATA_ARCH_LOWLEVEL_SRC
-    "arch/LowLevelWindow/LowLevelWindow_Win32.cpp"
+              "arch/LowLevelWindow/LowLevelWindow_Win32.cpp")
-  )
   list(APPEND SMDATA_ARCH_LOWLEVEL_HPP
-    "arch/LowLevelWindow/LowLevelWindow_Win32.h"
+              "arch/LowLevelWindow/LowLevelWindow_Win32.h")
-  )
 elseif(APPLE)
   list(APPEND SMDATA_ARCH_LOWLEVEL_SRC
-    "arch/LowLevelWindow/LowLevelWindow_MacOSX.mm"
+              "arch/LowLevelWindow/LowLevelWindow_MacOSX.mm")
-  )
   list(APPEND SMDATA_ARCH_LOWLEVEL_HPP
-    "arch/LowLevelWindow/LowLevelWindow_MacOSX.h"
+              "arch/LowLevelWindow/LowLevelWindow_MacOSX.h")
-  )
 else(UNIX)
-  if (X11_FOUND)
+  if(X11_FOUND)
     list(APPEND SMDATA_ARCH_LOWLEVEL_SRC
-      "arch/LowLevelWindow/LowLevelWindow_X11.cpp"
+                "arch/LowLevelWindow/LowLevelWindow_X11.cpp")
-    )
     list(APPEND SMDATA_ARCH_LOWLEVEL_HPP
-      "arch/LowLevelWindow/LowLevelWindow_X11.h"
+                "arch/LowLevelWindow/LowLevelWindow_X11.h")
-    )
   endif()
 endif(WIN32)
 
-source_group("Arch Specific\\\\Low Level Window" FILES ${SMDATA_ARCH_LOWLEVEL_SRC} ${SMDATA_ARCH_LOWLEVEL_HPP})
+source_group("Arch Specific\\\\Low Level Window"
+             FILES
+             ${SMDATA_ARCH_LOWLEVEL_SRC}
+             ${SMDATA_ARCH_LOWLEVEL_HPP})
 
-list(APPEND SMDATA_ARCH_LOADING_SRC
+list(APPEND SMDATA_ARCH_LOADING_SRC "arch/LoadingWindow/LoadingWindow.cpp")
-  "arch/LoadingWindow/LoadingWindow.cpp"
+list(APPEND SMDATA_ARCH_LOADING_HPP "arch/LoadingWindow/LoadingWindow.h")
-)
-list(APPEND SMDATA_ARCH_LOADING_HPP
-  "arch/LoadingWindow/LoadingWindow.h"
-)
 
 if(WIN32)
   list(APPEND SMDATA_ARCH_LOADING_SRC
-    "arch/LoadingWindow/LoadingWindow_Win32.cpp"
+              "arch/LoadingWindow/LoadingWindow_Win32.cpp")
-  )
+  list(
-  list(APPEND SMDATA_ARCH_LOADING_HPP
+    APPEND SMDATA_ARCH_LOADING_HPP "arch/LoadingWindow/LoadingWindow_Win32.h")
-    "arch/LoadingWindow/LoadingWindow_Win32.h"
-  )
 else()
-  list(APPEND SMDATA_ARCH_LOADING_HPP
+  list(APPEND SMDATA_ARCH_LOADING_HPP "arch/LoadingWindow/LoadingWindow_Null.h")
-    "arch/LoadingWindow/LoadingWindow_Null.h"
-  )
   if(APPLE)
     list(APPEND SMDATA_ARCH_LOADING_SRC
-      "arch/LoadingWindow/LoadingWindow_MacOSX.mm"
+                "arch/LoadingWindow/LoadingWindow_MacOSX.mm")
-    )
     list(APPEND SMDATA_ARCH_LOADING_HPP
-      "arch/LoadingWindow/LoadingWindow_MacOSX.h"
+                "arch/LoadingWindow/LoadingWindow_MacOSX.h")
-    )
   elseif(LINUX)
-    if (GTK2_FOUND)
+    if(GTK2_FOUND)
       list(APPEND SMDATA_ARCH_LOADING_SRC
-        "arch/LoadingWindow/LoadingWindow_Gtk.cpp"
+                  "arch/LoadingWindow/LoadingWindow_Gtk.cpp")
-      )
       list(APPEND SMDATA_ARCH_LOADING_HPP
-        "arch/LoadingWindow/LoadingWindow_Gtk.h"
+                  "arch/LoadingWindow/LoadingWindow_Gtk.h")
-      )
     endif()
   endif()
 endif()
 
-source_group("Arch Specific\\\\Loading Window" FILES ${SMDATA_ARCH_LOADING_SRC} ${SMDATA_ARCH_LOADING_HPP})
+source_group("Arch Specific\\\\Loading Window"
+             FILES
+             ${SMDATA_ARCH_LOADING_SRC}
+             ${SMDATA_ARCH_LOADING_HPP})
 
-list(APPEND SMDATA_ARCH_LIGHTS_SRC
+list(APPEND SMDATA_ARCH_LIGHTS_SRC "arch/Lights/LightsDriver.cpp"
-  "arch/Lights/LightsDriver.cpp"
+            "arch/Lights/LightsDriver_SystemMessage.cpp")
-  "arch/Lights/LightsDriver_SystemMessage.cpp"
+list(APPEND SMDATA_ARCH_LIGHTS_HPP "arch/Lights/LightsDriver.h"
-)
+            "arch/Lights/LightsDriver_SystemMessage.h")
-list(APPEND SMDATA_ARCH_LIGHTS_HPP
-  "arch/Lights/LightsDriver.h"
-  "arch/Lights/LightsDriver_SystemMessage.h"
-)
 
-list(APPEND SMDATA_ARCH_LIGHTS_SRC
+list(APPEND SMDATA_ARCH_LIGHTS_SRC "arch/Lights/LightsDriver_SextetStream.cpp")
-  "arch/Lights/LightsDriver_SextetStream.cpp"
+list(APPEND SMDATA_ARCH_LIGHTS_HPP "arch/Lights/LightsDriver_SextetStream.h")
-)
-list(APPEND SMDATA_ARCH_LIGHTS_HPP
-  "arch/Lights/LightsDriver_SextetStream.h"
-)
 
 # TODO: Confirm if Apple can use the export.
 if(NOT APPLE)
-  list(APPEND SMDATA_ARCH_LIGHTS_SRC
+  list(APPEND SMDATA_ARCH_LIGHTS_SRC "arch/Lights/LightsDriver_Export.cpp")
-    "arch/Lights/LightsDriver_Export.cpp"
+  list(APPEND SMDATA_ARCH_LIGHTS_HPP "arch/Lights/LightsDriver_Export.h")
-  )
-  list(APPEND SMDATA_ARCH_LIGHTS_HPP
-    "arch/Lights/LightsDriver_Export.h"
-  )
 
   if(WIN32)
     list(APPEND SMDATA_ARCH_LIGHTS_SRC
-      "arch/Lights/LightsDriver_Win32Parallel.cpp"
+                "arch/Lights/LightsDriver_Win32Parallel.cpp")
-    )
     list(APPEND SMDATA_ARCH_LIGHTS_HPP
-      "arch/Lights/LightsDriver_Win32Parallel.h"
+                "arch/Lights/LightsDriver_Win32Parallel.h")
-    )
+    if(WITH_MINIMAID)
-    if (WITH_MINIMAID)
       list(APPEND SMDATA_ARCH_LIGHTS_SRC
-        "arch/Lights/LightsDriver_Win32Minimaid.cpp"
+                  "arch/Lights/LightsDriver_Win32Minimaid.cpp")
-      )
       list(APPEND SMDATA_ARCH_LIGHTS_HPP
-        "arch/Lights/LightsDriver_Win32Minimaid.h"
+                  "arch/Lights/LightsDriver_Win32Minimaid.h")
-      )
     endif()
   else() # Unix/Linux TODO: Linux HAVE_PARALLEL_PORT
     if(LINUX)
@@ -307,44 +229,37 @@ if(NOT APPLE)
                   "arch/Lights/LightsDriver_Linux_PIUIO.cpp"
                   "arch/Lights/LightsDriver_Linux_PIUIO_Leds.cpp"
                   "arch/Lights/LightsDriver_LinuxWeedTech.cpp"
-        "arch/Lights/LightsDriver_LinuxParallel.cpp"
+                  "arch/Lights/LightsDriver_LinuxParallel.cpp")
-      )
       list(APPEND SMDATA_ARCH_LIGHTS_HPP
                   "arch/Lights/LightsDriver_Linux_PIUIO.h"
                   "arch/Lights/LightsDriver_Linux_PIUIO_Leds.h"
                   "arch/Lights/LightsDriver_LinuxWeedTech.h"
-        "arch/Lights/LightsDriver_LinuxParallel.h"
+                  "arch/Lights/LightsDriver_LinuxParallel.h")
-      )
+      if(WITH_PARALLEL_PORT)
-      if (WITH_PARALLEL_PORT)
         list(APPEND SMDATA_ARCH_LIGHTS_SRC
-          "arch/Lights/LightsDriver_LinuxParallel.cpp"
+                    "arch/Lights/LightsDriver_LinuxParallel.cpp")
-        )
         list(APPEND SMDATA_ARCH_LIGHTS_HPP
-          "arch/Lights/LightsDriver_LinuxParallel.h"
+                    "arch/Lights/LightsDriver_LinuxParallel.h")
-        )
       endif()
-      if (WITH_MINIMAID)
+      if(WITH_MINIMAID)
         list(APPEND SMDATA_ARCH_LIGHTS_SRC
-          "arch/Lights/LightsDriver_LinuxMinimaid.cpp"
+                    "arch/Lights/LightsDriver_LinuxMinimaid.cpp")
-        )
         list(APPEND SMDATA_ARCH_LIGHTS_HPP
-          "arch/Lights/LightsDriver_LinuxMinimaid.h"
+                    "arch/Lights/LightsDriver_LinuxMinimaid.h")
-        )
       endif()
     endif()
   endif(WIN32)
 endif(NOT APPLE)
 
-source_group("Arch Specific\\\\Lights" FILES ${SMDATA_ARCH_LIGHTS_SRC} ${SMDATA_ARCH_LIGHTS_HPP})
+source_group("Arch Specific\\\\Lights"
+             FILES
+             ${SMDATA_ARCH_LIGHTS_SRC}
+             ${SMDATA_ARCH_LIGHTS_HPP})
 
-list(APPEND SMDATA_ARCH_INPUT_SRC
+list(APPEND SMDATA_ARCH_INPUT_SRC "arch/InputHandler/InputHandler.cpp"
-  "arch/InputHandler/InputHandler.cpp"
+            "arch/InputHandler/InputHandler_MonkeyKeyboard.cpp")
-  "arch/InputHandler/InputHandler_MonkeyKeyboard.cpp"
+list(APPEND SMDATA_ARCH_INPUT_HPP "arch/InputHandler/InputHandler.h"
-)
+            "arch/InputHandler/InputHandler_MonkeyKeyboard.h")
-list(APPEND SMDATA_ARCH_INPUT_HPP
-  "arch/InputHandler/InputHandler.h"
-  "arch/InputHandler/InputHandler_MonkeyKeyboard.h"
-)
 
 if(WIN32)
   list(APPEND SMDATA_ARCH_INPUT_SRC
@@ -352,132 +267,97 @@ if(WIN32)
               "arch/InputHandler/InputHandler_DirectInputHelper.cpp"
               "arch/InputHandler/InputHandler_Win32_MIDI.cpp"
               "arch/InputHandler/InputHandler_Win32_Para.cpp"
-    "arch/InputHandler/InputHandler_Win32_Pump.cpp"
+              "arch/InputHandler/InputHandler_Win32_Pump.cpp")
-  )
   list(APPEND SMDATA_ARCH_INPUT_HPP
               "arch/InputHandler/InputHandler_DirectInput.h"
               "arch/InputHandler/InputHandler_DirectInputHelper.h"
               "arch/InputHandler/InputHandler_Win32_MIDI.h"
               "arch/InputHandler/InputHandler_Win32_Para.h"
-    "arch/InputHandler/InputHandler_Win32_Pump.h"
+              "arch/InputHandler/InputHandler_Win32_Pump.h")
-  )
+  if(NOT MSVC)
-  if (NOT MSVC)
     list(APPEND SMDATA_ARCH_INPUT_SRC
-      "arch/InputHandler/InputHandler_SextetStream.cpp"
+                "arch/InputHandler/InputHandler_SextetStream.cpp")
-    )
     list(APPEND SMDATA_ARCH_INPUT_HPP
-      "arch/InputHandler/InputHandler_SextetStream.h"
+                "arch/InputHandler/InputHandler_SextetStream.h")
-    )
   endif()
 elseif(APPLE)
   list(APPEND SMDATA_ARCH_INPUT_SRC
-    "arch/InputHandler/InputHandler_MacOSX_HID.cpp"
+              "arch/InputHandler/InputHandler_MacOSX_HID.cpp")
-  )
   list(APPEND SMDATA_ARCH_INPUT_HPP
-    "arch/InputHandler/InputHandler_MacOSX_HID.h"
+              "arch/InputHandler/InputHandler_MacOSX_HID.h")
-  )
 else() # Unix/Linux
-  if (LINUX)
+  if(LINUX)
     list(APPEND SMDATA_ARCH_INPUT_SRC
                 "arch/InputHandler/LinuxInputManager.cpp"
                 "arch/InputHandler/InputHandler_Linux_Joystick.cpp"
                 "arch/InputHandler/InputHandler_Linux_Event.cpp"
                 "arch/InputHandler/InputHandler_Linux_PIUIO.cpp"
-      "arch/InputHandler/InputHandler_SextetStream.cpp"
+                "arch/InputHandler/InputHandler_SextetStream.cpp")
-    )
     list(APPEND SMDATA_ARCH_INPUT_SRC
                 "arch/InputHandler/LinuxInputManager.h"
                 "arch/InputHandler/InputHandler_Linux_Joystick.h"
                 "arch/InputHandler/InputHandler_Linux_Event.h"
                 "arch/InputHandler/InputHandler_Linux_PIUIO.h"
-      "arch/InputHandler/InputHandler_SextetStream.h"
+                "arch/InputHandler/InputHandler_SextetStream.h")
-    )
     if(WITH_TTY)
       list(APPEND SMDATA_ARCH_INPUT_SRC
-        "arch/InputHandler/InputHandler_Linux_tty.cpp"
+                  "arch/InputHandler/InputHandler_Linux_tty.cpp")
-      )
       list(APPEND SMDATA_ARCH_INPUT_HPP
                   "arch/InputHandler/InputHandler_Linux_tty.h"
-        "arch/InputHandler/InputHandler_Linux_tty_keys.h"
+                  "arch/InputHandler/InputHandler_Linux_tty_keys.h")
-      )
     endif()
   endif()
   if(X11_FOUND)
-    list(APPEND SMDATA_ARCH_INPUT_SRC
+    list(APPEND SMDATA_ARCH_INPUT_SRC "arch/InputHandler/InputHandler_X11.cpp")
-      "arch/InputHandler/InputHandler_X11.cpp"
+    list(APPEND SMDATA_ARCH_INPUT_HPP "arch/InputHandler/InputHandler_X11.h")
-    )
-    list(APPEND SMDATA_ARCH_INPUT_HPP
-      "arch/InputHandler/InputHandler_X11.h"
-    )
   endif()
 endif()
 
-source_group("Arch Specific\\\\Input Handler" FILES ${SMDATA_ARCH_INPUT_SRC} ${SMDATA_ARCH_INPUT_HPP})
+source_group("Arch Specific\\\\Input Handler"
+             FILES
+             ${SMDATA_ARCH_INPUT_SRC}
+             ${SMDATA_ARCH_INPUT_HPP})
 
-list(APPEND SMDATA_ARCH_DIALOG_SRC
+list(APPEND SMDATA_ARCH_DIALOG_SRC "arch/Dialog/Dialog.cpp"
-  "arch/Dialog/Dialog.cpp"
+            "arch/Dialog/DialogDriver.cpp")
-  "arch/Dialog/DialogDriver.cpp"
+list(APPEND SMDATA_ARCH_DIALOG_HPP "arch/Dialog/Dialog.h"
-)
+            "arch/Dialog/DialogDriver.h")
-list(APPEND SMDATA_ARCH_DIALOG_HPP
-  "arch/Dialog/Dialog.h"
-  "arch/Dialog/DialogDriver.h"
-)
 
 if(WIN32)
-  list(APPEND SMDATA_ARCH_DIALOG_SRC
+  list(APPEND SMDATA_ARCH_DIALOG_SRC "arch/Dialog/DialogDriver_Win32.cpp")
-    "arch/Dialog/DialogDriver_Win32.cpp"
+  list(APPEND SMDATA_ARCH_DIALOG_HPP "arch/Dialog/DialogDriver_Win32.h")
-  )
-  list(APPEND SMDATA_ARCH_DIALOG_HPP
-    "arch/Dialog/DialogDriver_Win32.h"
-  )
 elseif(APPLE)
-  list(APPEND SMDATA_ARCH_DIALOG_SRC
+  list(APPEND SMDATA_ARCH_DIALOG_SRC "arch/Dialog/DialogDriver_MacOSX.cpp")
-    "arch/Dialog/DialogDriver_MacOSX.cpp"
+  list(APPEND SMDATA_ARCH_DIALOG_HPP "arch/Dialog/DialogDriver_MacOSX.h")
-  )
-  list(APPEND SMDATA_ARCH_DIALOG_HPP
-    "arch/Dialog/DialogDriver_MacOSX.h"
-  )
 endif(WIN32)
 
-source_group("Arch Specific\\\\Dialog" FILES ${SMDATA_ARCH_DIALOG_SRC} ${SMDATA_ARCH_DIALOG_HPP})
+source_group("Arch Specific\\\\Dialog"
+             FILES
+             ${SMDATA_ARCH_DIALOG_SRC}
+             ${SMDATA_ARCH_DIALOG_HPP})
 
-list(APPEND SMDATA_ARCH_HOOKS_SRC
+list(APPEND SMDATA_ARCH_HOOKS_SRC "arch/ArchHooks/ArchHooks.cpp")
-  "arch/ArchHooks/ArchHooks.cpp"
+list(APPEND SMDATA_ARCH_HOOKS_HPP "arch/ArchHooks/ArchHooks.h")
-)
-list(APPEND SMDATA_ARCH_HOOKS_HPP
-  "arch/ArchHooks/ArchHooks.h"
-)
 
 if(NOT APPLE)
-  list(APPEND SMDATA_ARCH_HOOKS_SRC
+  list(APPEND SMDATA_ARCH_HOOKS_SRC "arch/ArchHooks/ArchHooksUtil.cpp")
-    "arch/ArchHooks/ArchHooksUtil.cpp"
-  )
   if(WIN32)
-    list(APPEND SMDATA_ARCH_HOOKS_SRC
+    list(APPEND SMDATA_ARCH_HOOKS_SRC "arch/ArchHooks/ArchHooks_Win32.cpp"
-      "arch/ArchHooks/ArchHooks_Win32.cpp"
+                "arch/ArchHooks/ArchHooks_Win32Static.cpp")
-      "arch/ArchHooks/ArchHooks_Win32Static.cpp"
+    list(APPEND SMDATA_ARCH_HOOKS_HPP "arch/ArchHooks/ArchHooks_Win32.h")
-    )
-    list(APPEND SMDATA_ARCH_HOOKS_HPP
-      "arch/ArchHooks/ArchHooks_Win32.h"
-    )
   else(WIN32)
-    list(APPEND SMDATA_ARCH_HOOKS_SRC
+    list(APPEND SMDATA_ARCH_HOOKS_SRC "arch/ArchHooks/ArchHooks_Unix.cpp")
-      "arch/ArchHooks/ArchHooks_Unix.cpp"
+    list(APPEND SMDATA_ARCH_HOOKS_HPP "arch/ArchHooks/ArchHooks_Unix.h")
-    )
-    list(APPEND SMDATA_ARCH_HOOKS_HPP
-      "arch/ArchHooks/ArchHooks_Unix.h"
-  )
   endif(WIN32)
 else(NOT APPLE)
-  list(APPEND SMDATA_ARCH_HOOKS_SRC
+  list(APPEND SMDATA_ARCH_HOOKS_SRC "arch/ArchHooks/ArchHooks_MacOSX.mm")
-    "arch/ArchHooks/ArchHooks_MacOSX.mm"
+  list(APPEND SMDATA_ARCH_HOOKS_HPP "arch/ArchHooks/ArchHooks_MacOSX.h")
-  )
-  list(APPEND SMDATA_ARCH_HOOKS_HPP
-    "arch/ArchHooks/ArchHooks_MacOSX.h"
-  )
 endif(NOT APPLE)
 
-source_group("Arch Specific\\\\Arch Hooks" FILES ${SMDATA_ARCH_HOOKS_SRC} ${SMDATA_ARCH_HOOKS_HPP})
+source_group("Arch Specific\\\\Arch Hooks"
+             FILES
+             ${SMDATA_ARCH_HOOKS_SRC}
+             ${SMDATA_ARCH_HOOKS_HPP})
 
 list(APPEND SMDATA_ALL_ARCH_SRC
             ${SMDATA_ARCH_SRC}
@@ -490,8 +370,7 @@ list(APPEND SMDATA_ALL_ARCH_SRC
             ${SMDATA_ARCH_MEMORY_SRC}
             ${SMDATA_ARCH_MOVIE_TEXTURE_SRC}
             ${SMDATA_ARCH_SOUND_SRC}
-  ${SMDATA_ARCH_THREADS_SRC}
+            ${SMDATA_ARCH_THREADS_SRC})
-)
 list(APPEND SMDATA_ALL_ARCH_HPP
             ${SMDATA_ARCH_HPP}
             ${SMDATA_ARCH_DIALOG_HPP}
@@ -503,5 +382,4 @@ list(APPEND SMDATA_ALL_ARCH_HPP
             ${SMDATA_ARCH_MEMORY_HPP}
             ${SMDATA_ARCH_MOVIE_TEXTURE_HPP}
             ${SMDATA_ARCH_SOUND_HPP}
-  ${SMDATA_ARCH_THREADS_HPP}
+            ${SMDATA_ARCH_THREADS_HPP})
-)

src/CMakeData-data.cmake

@@ -1,30 +1,32 @@
 list(APPEND SM_DATA_LUA_SRC
             "LuaBinding.cpp"
             "LuaExpressionTransform.cpp"
-  "LuaReference.cpp"
+            "LuaReference.cpp")
-)
 
 list(APPEND SM_DATA_LUA_HPP
             "LuaBinding.h"
             "LuaExpressionTransform.h"
-  "LuaReference.h"
+            "LuaReference.h")
-)
 
-source_group("Data Structures\\\\Lua" FILES ${SM_DATA_LUA_SRC} ${SM_DATA_LUA_HPP})
+source_group("Data Structures\\\\Lua"
+             FILES
+             ${SM_DATA_LUA_SRC}
+             ${SM_DATA_LUA_HPP})
 
 list(APPEND SM_DATA_FONT_SRC
             "Font.cpp"
             "FontCharAliases.cpp"
-  "FontCharmaps.cpp"
+            "FontCharmaps.cpp")
-)
 
 list(APPEND SM_DATA_FONT_HPP
             "Font.h"
             "FontCharAliases.h"
-  "FontCharmaps.h"
+            "FontCharmaps.h")
-)
 
-source_group("Data Structures\\\\Fonts" FILES ${SM_DATA_FONT_SRC} ${SM_DATA_FONT_HPP})
+source_group("Data Structures\\\\Fonts"
+             FILES
+             ${SM_DATA_FONT_SRC}
+             ${SM_DATA_FONT_HPP})
 
 list(APPEND SM_DATA_COURSE_SRC
             "Course.cpp"
@@ -32,8 +34,7 @@ list(APPEND SM_DATA_COURSE_SRC
             "CourseUtil.cpp"
             "CourseWriterCRS.cpp"
             "Trail.cpp"
-  "TrailUtil.cpp"
+            "TrailUtil.cpp")
-)
 
 list(APPEND SM_DATA_COURSE_HPP
             "Course.h"
@@ -41,24 +42,27 @@ list(APPEND SM_DATA_COURSE_HPP
             "CourseUtil.h"
             "CourseWriterCRS.h"
             "Trail.h"
-  "TrailUtil.h"
+            "TrailUtil.h")
-)
 
-source_group("Data Structures\\\\Courses and Trails" FILES ${SM_DATA_COURSE_SRC} ${SM_DATA_COURSE_HPP})
+source_group("Data Structures\\\\Courses and Trails"
+             FILES
+             ${SM_DATA_COURSE_SRC}
+             ${SM_DATA_COURSE_HPP})
 
 list(APPEND SM_DATA_NOTEDATA_SRC
             "NoteData.cpp"
             "NoteDataUtil.cpp"
-  "NoteDataWithScoring.cpp"
+            "NoteDataWithScoring.cpp")
-)
 
 list(APPEND SM_DATA_NOTEDATA_HPP
             "NoteData.h"
             "NoteDataUtil.h"
-  "NoteDataWithScoring.h"
+            "NoteDataWithScoring.h")
-)
 
-source_group("Data Structures\\\\Note Data" FILES ${SM_DATA_NOTEDATA_SRC} ${SM_DATA_NOTEDATA_HPP})
+source_group("Data Structures\\\\Note Data"
+             FILES
+             ${SM_DATA_NOTEDATA_SRC}
+             ${SM_DATA_NOTEDATA_HPP})
 
 list(APPEND SM_DATA_NOTELOAD_SRC
             "NotesLoader.cpp"
@@ -68,8 +72,7 @@ list(APPEND SM_DATA_NOTELOAD_SRC
             "NotesLoaderKSF.cpp"
             "NotesLoaderSM.cpp"
             "NotesLoaderSMA.cpp"
-  "NotesLoaderSSC.cpp"
+            "NotesLoaderSSC.cpp")
-)
 
 list(APPEND SM_DATA_NOTELOAD_HPP
             "NotesLoader.h"
@@ -79,76 +82,82 @@ list(APPEND SM_DATA_NOTELOAD_HPP
             "NotesLoaderKSF.h"
             "NotesLoaderSM.h"
             "NotesLoaderSMA.h"
-  "NotesLoaderSSC.h"
+            "NotesLoaderSSC.h")
-)
 
-source_group("Data Structures\\\\Notes Loaders" FILES ${SM_DATA_NOTELOAD_SRC} ${SM_DATA_NOTELOAD_HPP})
+source_group("Data Structures\\\\Notes Loaders"
+             FILES
+             ${SM_DATA_NOTELOAD_SRC}
+             ${SM_DATA_NOTELOAD_HPP})
 
 list(APPEND SM_DATA_NOTEWRITE_SRC
             "NotesWriterDWI.cpp"
             "NotesWriterJson.cpp"
             "NotesWriterSM.cpp"
-  "NotesWriterSSC.cpp"
+            "NotesWriterSSC.cpp")
-)
 
 list(APPEND SM_DATA_NOTEWRITE_HPP
             "NotesWriterDWI.h"
             "NotesWriterJson.h"
             "NotesWriterSM.h"
-  "NotesWriterSSC.h"
+            "NotesWriterSSC.h")
-)
 
-source_group("Data Structures\\\\Notes Writers" FILES ${SM_DATA_NOTEWRITE_SRC} ${SM_DATA_NOTEWRITE_HPP})
+source_group("Data Structures\\\\Notes Writers"
+             FILES
+             ${SM_DATA_NOTEWRITE_SRC}
+             ${SM_DATA_NOTEWRITE_HPP})
 
 list(APPEND SM_DATA_SCORE_SRC
             "ScoreKeeper.cpp"
             "ScoreKeeperNormal.cpp"
             "ScoreKeeperRave.cpp"
-  "ScoreKeeperShared.cpp"
+            "ScoreKeeperShared.cpp")
-)
 
 list(APPEND SM_DATA_SCORE_HPP
             "ScoreKeeper.h"
             "ScoreKeeperNormal.h"
             "ScoreKeeperRave.h"
-  "ScoreKeeperShared.h"
+            "ScoreKeeperShared.h")
-)
 
-source_group("Data Structures\\\\Score Keepers" FILES ${SM_DATA_SCORE_SRC} ${SM_DATA_SCORE_HPP})
+source_group("Data Structures\\\\Score Keepers"
+             FILES
+             ${SM_DATA_SCORE_SRC}
+             ${SM_DATA_SCORE_HPP})
 
 list(APPEND SM_DATA_SONG_SRC
             "Song.cpp"
             "SongCacheIndex.cpp"
             "SongOptions.cpp"
             "SongPosition.cpp"
-  "SongUtil.cpp"
+            "SongUtil.cpp")
-)
 
 list(APPEND SM_DATA_SONG_HPP
             "Song.h"
             "SongCacheIndex.h"
             "SongOptions.h"
             "SongPosition.h"
-  "SongUtil.h"
+            "SongUtil.h")
-)
 
-source_group("Data Structures\\\\Songs" FILES ${SM_DATA_SONG_SRC} ${SM_DATA_SONG_HPP})
+source_group("Data Structures\\\\Songs"
+             FILES
+             ${SM_DATA_SONG_SRC}
+             ${SM_DATA_SONG_HPP})
 
 list(APPEND SM_DATA_STEPS_SRC
             "Steps.cpp"
             "StepsUtil.cpp"
             "Style.cpp"
-  "StyleUtil.cpp"
+            "StyleUtil.cpp")
-)
 
 list(APPEND SM_DATA_STEPS_HPP
             "Steps.h"
             "StepsUtil.h"
             "Style.h"
-  "StyleUtil.h"
+            "StyleUtil.h")
-)
 
-source_group("Data Structures\\\\Steps and Styles" FILES ${SM_DATA_STEPS_SRC} ${SM_DATA_STEPS_HPP})
+source_group("Data Structures\\\\Steps and Styles"
+             FILES
+             ${SM_DATA_STEPS_SRC}
+             ${SM_DATA_STEPS_HPP})
 
 list(APPEND SM_DATA_REST_SRC
             "AdjustSync.cpp"
@@ -200,8 +209,7 @@ list(APPEND SM_DATA_REST_SRC
             "StageStats.cpp"
             "TimingData.cpp"
             "TimingSegments.cpp"
-  "TitleSubstitution.cpp"
+            "TitleSubstitution.cpp")
-)
 
 list(APPEND SM_DATA_REST_HPP
             "AdjustSync.h"
@@ -257,19 +265,17 @@ list(APPEND SM_DATA_REST_HPP
             "ThemeMetric.h"
             "TimingData.h"
             "TimingSegments.h"
-  "TitleSubstitution.h"
+            "TitleSubstitution.h")
-)
 
 if(WITH_NETWORKING)
-  list(APPEND SM_DATA_REST_SRC
+  list(APPEND SM_DATA_REST_SRC "RoomWheel.cpp")
-    "RoomWheel.cpp"
+  list(APPEND SM_DATA_REST_HPP "RoomWheel.h")
-  )
-  list(APPEND SM_DATA_REST_HPP
-    "RoomWheel.h"
-  )
 endif()
 
-source_group("Data Structures\\\\Misc Objects" FILES ${SM_DATA_REST_SRC} ${SM_DATA_REST_HPP})
+source_group("Data Structures\\\\Misc Objects"
+             FILES
+             ${SM_DATA_REST_SRC}
+             ${SM_DATA_REST_HPP})
 
 list(APPEND SMDATA_ALL_DATA_SRC
             ${SM_DATA_COURSE_SRC}
@@ -281,8 +287,7 @@ list(APPEND SMDATA_ALL_DATA_SRC
             ${SM_DATA_SCORE_SRC}
             ${SM_DATA_SONG_SRC}
             ${SM_DATA_STEPS_SRC}
-  ${SM_DATA_REST_SRC}
+            ${SM_DATA_REST_SRC})
-)
 
 list(APPEND SMDATA_ALL_DATA_HPP
             ${SM_DATA_COURSE_HPP}
@@ -294,5 +299,4 @@ list(APPEND SMDATA_ALL_DATA_HPP
             ${SM_DATA_SCORE_HPP}
             ${SM_DATA_SONG_HPP}
             ${SM_DATA_STEPS_HPP}
-  ${SM_DATA_REST_HPP}
+            ${SM_DATA_REST_HPP})
-)

src/CMakeData-file-types.cmake

@@ -4,15 +4,16 @@ list(APPEND SMDATA_FILE_TYPES_SRC
             "MsdFile.cpp"
             "XmlFile.cpp"
             "XmlToLua.cpp"
-  "XmlFileUtil.cpp"
+            "XmlFileUtil.cpp")
-)
 list(APPEND SMDATA_FILE_TYPES_HPP
             "CsvFile.h"
             "IniFile.h"
             "MsdFile.h"
             "XmlFile.h"
             "XmlToLua.h"
-  "XmlFileUtil.h"
+            "XmlFileUtil.h")
-)
 
-source_group("File Types" FILES ${SMDATA_FILE_TYPES_SRC} ${SMDATA_FILE_TYPES_HPP})
+source_group("File Types"
+             FILES
+             ${SMDATA_FILE_TYPES_SRC}
+             ${SMDATA_FILE_TYPES_HPP})

src/CMakeData-globals.cmake

@@ -3,8 +3,7 @@ list(APPEND SMDATA_GLOBAL_FILES_SRC
             "global.cpp"
             "SpecialFiles.cpp"
             "StepMania.cpp" # TODO: Refactor into separate main project.
-  "${SM_SRC_DIR}/generated/verstub.cpp"
+            "${SM_SRC_DIR}/generated/verstub.cpp")
-)
 
 list(APPEND SMDATA_GLOBAL_FILES_HPP
             "generated/config.hpp"
@@ -12,8 +11,12 @@ list(APPEND SMDATA_GLOBAL_FILES_HPP
             "global.h"
             "ProductInfo.h" # TODO: Have this be auto-generated.
             "SpecialFiles.h"
-  "StdString.h" # TODO: Remove the need for this file, transition to std::string.
+            "StdString.h" # TODO: Remove the need for this file, transition to
+                          # std::string.
             "StepMania.h" # TODO: Refactor into separate main project.
-)
+     )
 
-source_group("Global Files" FILES ${SMDATA_GLOBAL_FILES_SRC} ${SMDATA_GLOBAL_FILES_HPP})
+source_group("Global Files"
+             FILES
+             ${SMDATA_GLOBAL_FILES_SRC}
+             ${SMDATA_GLOBAL_FILES_HPP})

src/CMakeData-gtk.cmake

@@ -5,33 +5,40 @@ endif()
 add_library("GtkModule"
             SHARED
             "arch/LoadingWindow/LoadingWindow_GtkModule.cpp"
-  "arch/LoadingWindow/LoadingWindow_GtkModule.h"
+            "arch/LoadingWindow/LoadingWindow_GtkModule.h")
-)
 
 sm_add_compile_flag("GtkModule" "-std=${SM_CPP_STANDARD}")
-if (CMAKE_CXX_COMPILER MATCHES "clang")
+if(CMAKE_CXX_COMPILER MATCHES "clang")
   sm_add_compile_flag("GtkModule" "-stdlib=libc++")
   set_target_properties("GtkModule" PROPERTIES LINK_FLAGS "-stdlib=libc++")
 endif()
 
-# It is normally not appropriate to set the prefix to the empty string.
+# It is normally not appropriate to set the prefix to the empty string. This is
-# This is to maintain compatibility with the current source.
+# to maintain compatibility with the current source. At some point, it may be
-# At some point, it may be worth being more flexible.
+# worth being more flexible.
 set_target_properties("GtkModule" PROPERTIES PREFIX "")
 set_target_properties("GtkModule" PROPERTIES OUTPUT_NAME "GtkModule")
-set_target_properties("GtkModule" PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${SM_ROOT_DIR}")
+set_target_properties("GtkModule"
-set_target_properties("GtkModule" PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${SM_ROOT_DIR}")
+                      PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${SM_ROOT_DIR}")
-set_target_properties("GtkModule" PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${SM_ROOT_DIR}")
+set_target_properties("GtkModule"
-set_target_properties("GtkModule" PROPERTIES LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${SM_ROOT_DIR}")
+                      PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE
-set_target_properties("GtkModule" PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_ROOT_DIR}")
+                                 "${SM_ROOT_DIR}")
+set_target_properties(
+  "GtkModule"
+  PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${SM_ROOT_DIR}")
+set_target_properties("GtkModule"
+                      PROPERTIES LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL
+                                 "${SM_ROOT_DIR}")
+set_target_properties("GtkModule"
+                      PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                                 "${SM_ROOT_DIR}")
 target_link_libraries("GtkModule" ${GTK2_LIBRARIES})
 set_property(TARGET "GtkModule" PROPERTY FOLDER "Internal Libraries")
 list(APPEND SM_GTK_INCLUDE_DIRS
             "${SM_SRC_DIR}"
             "${SM_SRC_DIR}/generated"
             "${SM_SRC_DIR}/arch/LoadingWindow"
-  "${GTK2_INCLUDE_DIRS}"
+            "${GTK2_INCLUDE_DIRS}")
-)
 
 sm_add_compile_definition("GtkModule" CMAKE_POWERED)
 

src/CMakeData-os.cmake

@@ -9,8 +9,7 @@ if(APPLE)
               "archutils/Darwin/PumpDevice.cpp"
               "archutils/Darwin/SMMain.mm"
               "archutils/Darwin/SpecialDirs.cpp"
-    "archutils/Darwin/VectorHelper.cpp"
+              "archutils/Darwin/VectorHelper.cpp")
-  )
   list(APPEND SMDATA_OS_DARWIN_HPP
               "archutils/Darwin/arch_setup.h"
               "archutils/Darwin/Crash.h"
@@ -22,18 +21,15 @@ if(APPLE)
               "archutils/Darwin/PumpDevice.h"
               "archutils/Darwin/SpecialDirs.h"
               "archutils/Darwin/StepMania.pch" # precompiled header.
-    "archutils/Darwin/VectorHelper.h"
+              "archutils/Darwin/VectorHelper.h")
-  )
 
-  source_group("OS Specific\\\\Darwin" FILES ${SMDATA_OS_DARWIN_SRC} ${SMDATA_OS_DARWIN_HPP})
+  source_group("OS Specific\\\\Darwin"
-
+               FILES
-  
-  list(APPEND SMDATA_OS_SRC
                ${SMDATA_OS_DARWIN_SRC}
-  )
+               ${SMDATA_OS_DARWIN_HPP})
-  list(APPEND SMDATA_OS_HPP
+
-    ${SMDATA_OS_DARWIN_HPP}
+  list(APPEND SMDATA_OS_SRC ${SMDATA_OS_DARWIN_SRC})
-  )
+  list(APPEND SMDATA_OS_HPP ${SMDATA_OS_DARWIN_HPP})
 else()
   if(WIN32)
     list(APPEND SMDATA_OS_SRC
@@ -59,8 +55,7 @@ else()
                 "archutils/Win32/VideoDriverInfo.cpp"
                 "archutils/Win32/WindowIcon.cpp"
                 "archutils/Win32/WindowsDialogBox.cpp"
-      "archutils/Win32/WindowsResources.rc"
+                "archutils/Win32/WindowsResources.rc")
-    )
 
     list(APPEND SMDATA_OS_HPP
                 "archutils/Win32/AppInstance.h"
@@ -84,8 +79,7 @@ else()
                 "archutils/Win32/VideoDriverInfo.h"
                 "archutils/Win32/WindowIcon.h"
                 "archutils/Win32/WindowsDialogBox.h"
-      "archutils/Win32/WindowsResources.h"
+                "archutils/Win32/WindowsResources.h")
-    )
   else() # Unix
     list(APPEND SMDATA_OS_SRC # TODO: X11 check, crash handler check
                 "archutils/Unix/AssertionHandler.cpp"
@@ -94,8 +88,7 @@ else()
                 "archutils/Unix/RunningUnderValgrind.cpp"
                 "archutils/Unix/SignalHandler.cpp"
                 "archutils/Unix/SpecialDirs.cpp"
-      "archutils/Unix/StackCheck.cpp"
+                "archutils/Unix/StackCheck.cpp")
-      )
     list(APPEND SMDATA_OS_HPP
                 "archutils/Unix/arch_setup.h"
                 "archutils/Unix/AssertionHandler.h"
@@ -104,52 +97,40 @@ else()
                 "archutils/Unix/RunningUnderValgrind.h"
                 "archutils/Unix/SignalHandler.h"
                 "archutils/Unix/SpecialDirs.h"
-      "archutils/Common/gcc_byte_swaps.h"
+                "archutils/Common/gcc_byte_swaps.h")
-    )
     if(X11_FOUND)
-      list(APPEND SMDATA_OS_SRC
+      list(APPEND SMDATA_OS_SRC "archutils/Unix/X11Helper.cpp")
-        "archutils/Unix/X11Helper.cpp"
+      list(APPEND SMDATA_OS_HPP "archutils/Unix/X11Helper.h")
-      )
-      list(APPEND SMDATA_OS_HPP
-        "archutils/Unix/X11Helper.h"
-      )
     endif()
     if(HAS_PTHREAD)
-      list(APPEND SMDATA_OS_SRC
+      list(APPEND SMDATA_OS_SRC "archutils/Common/PthreadHelpers.cpp")
-        "archutils/Common/PthreadHelpers.cpp"
+      list(APPEND SMDATA_OS_HPP "archutils/Common/PthreadHelpers.h")
-      )
-      list(APPEND SMDATA_OS_HPP
-        "archutils/Common/PthreadHelpers.h"
-      )
     endif()
   endif()
   source_group("OS Specific" FILES ${SMDATA_OS_SRC} ${SMDATA_OS_HPP})
 endif()
 
 if(APPLE OR LINUX)
-  if (WITH_CRASH_HANDLER)
+  if(WITH_CRASH_HANDLER)
     list(APPEND SMDATA_OS_UNIX_CRASH_SRC
                 "archutils/Unix/Backtrace.cpp"
                 "archutils/Unix/BacktraceNames.cpp"
                 "archutils/Unix/CrashHandler.cpp"
                 "archutils/Unix/CrashHandlerChild.cpp"
                 "archutils/Unix/CrashHandlerInternal.cpp"
-      "archutils/Unix/SignalHandler.cpp"
+                "archutils/Unix/SignalHandler.cpp")
-    )
     list(APPEND SMDATA_OS_UNIX_CRASH_HPP
                 "archutils/Unix/Backtrace.h"
                 "archutils/Unix/BacktraceNames.h"
                 "archutils/Unix/CrashHandler.h"
                 "archutils/Unix/CrashHandlerInternal.h"
-      "archutils/Unix/SignalHandler.h"
+                "archutils/Unix/SignalHandler.h")
-    )
+    source_group("OS Specific\\\\Unix"
-    source_group("OS Specific\\\\Unix" FILES ${SMDATA_OS_UNIX_CRASH_SRC} ${SMDATA_OS_UNIX_CRASH_HPP})
+                 FILES
-
-    list(APPEND SMDATA_OS_SRC
                  ${SMDATA_OS_UNIX_CRASH_SRC}
-    )
+                 ${SMDATA_OS_UNIX_CRASH_HPP})
-    list(APPEND SMDATA_OS_HPP
+
-      ${SMDATA_OS_UNIX_CRASH_HPP}
+    list(APPEND SMDATA_OS_SRC ${SMDATA_OS_UNIX_CRASH_SRC})
-    )
+    list(APPEND SMDATA_OS_HPP ${SMDATA_OS_UNIX_CRASH_HPP})
   endif()
 endif()

src/CMakeData-rage.cmake

@@ -6,21 +6,23 @@ list(APPEND SMDATA_RAGE_UTILS_SRC
             "RageUtil_CachedObject.cpp"
             "RageUtil_CharConversions.cpp"
             "RageUtil_FileDB.cpp"
-  "RageUtil_WorkerThread.cpp"
+            "RageUtil_WorkerThread.cpp")
-)
 
 list(APPEND SMDATA_RAGE_UTILS_HPP
             "RageUtil.h"
-  "RageUtil_AutoPtr.h" # TODO: Remove the need for this and replace with c++11 smart pointers
+            "RageUtil_AutoPtr.h" # TODO: Remove the need for this and replace
+                                 # with c++11 smart pointers
             "RageUtil_BackgroundLoader.h"
             "RageUtil_CachedObject.h"
             "RageUtil_CharConversions.h"
             "RageUtil_CircularBuffer.h"
             "RageUtil_FileDB.h"
-  "RageUtil_WorkerThread.h"
+            "RageUtil_WorkerThread.h")
-)
 
-source_group("Rage\\\\Utils" FILES ${SMDATA_RAGE_UTILS_SRC} ${SMDATA_RAGE_UTILS_HPP})
+source_group("Rage\\\\Utils"
+             FILES
+             ${SMDATA_RAGE_UTILS_SRC}
+             ${SMDATA_RAGE_UTILS_HPP})
 
 list(APPEND SMDATA_RAGE_MISC_SRC
             "RageException.cpp"
@@ -30,8 +32,7 @@ list(APPEND SMDATA_RAGE_MISC_SRC
             "RageMath.cpp"
             "RageTypes.cpp"
             "RageThreads.cpp"
-  "RageTimer.cpp"
+            "RageTimer.cpp")
-)
 
 list(APPEND SMDATA_RAGE_MISC_HPP
             "RageException.h"
@@ -41,10 +42,12 @@ list(APPEND SMDATA_RAGE_MISC_HPP
             "RageMath.h"
             "RageTypes.h"
             "RageThreads.h"
-  "RageTimer.h"
+            "RageTimer.h")
-)
 
-source_group("Rage\\\\Misc" FILES ${SMDATA_RAGE_MISC_SRC} ${SMDATA_RAGE_MISC_HPP})
+source_group("Rage\\\\Misc"
+             FILES
+             ${SMDATA_RAGE_MISC_SRC}
+             ${SMDATA_RAGE_MISC_HPP})
 
 list(APPEND SMDATA_RAGE_GRAPHICS_SRC
             "RageBitmapTexture.cpp"
@@ -71,8 +74,7 @@ list(APPEND SMDATA_RAGE_GRAPHICS_SRC
             "RageTextureID.cpp"
             "RageTextureManager.cpp"
             "RageTexturePreloader.cpp"
-  "RageTextureRenderTarget.cpp"
+            "RageTextureRenderTarget.cpp")
-)
 list(APPEND SMDATA_RAGE_GRAPHICS_HPP
             "RageBitmapTexture.h"
             "RageDisplay.h"
@@ -98,20 +100,22 @@ list(APPEND SMDATA_RAGE_GRAPHICS_HPP
             "RageTextureID.h"
             "RageTextureManager.h"
             "RageTexturePreloader.h"
-  "RageTextureRenderTarget.h"
+            "RageTextureRenderTarget.h")
-)
 
 if(WIN32)
   list(APPEND SMDATA_RAGE_GRAPHICS_SRC "RageDisplay_D3D.cpp")
   list(APPEND SMDATA_RAGE_GRAPHICS_HPP "RageDisplay_D3D.h")
 elseif(LINUX)
-  if (WITH_GLES2)
+  if(WITH_GLES2)
     list(APPEND SMDATA_RAGE_GRAPHICS_SRC "RageDisplay_GLES2.cpp")
     list(APPEND SMDATA_RAGE_GRAPHICS_HPP "RageDisplay_GLES2.h")
   endif()
 endif()
 
-source_group("Rage\\\\Graphics" FILES ${SMDATA_RAGE_GRAPHICS_SRC} ${SMDATA_RAGE_GRAPHICS_HPP})
+source_group("Rage\\\\Graphics"
+             FILES
+             ${SMDATA_RAGE_GRAPHICS_SRC}
+             ${SMDATA_RAGE_GRAPHICS_HPP})
 
 list(APPEND SMDATA_RAGE_FILE_SRC
             "RageFile.cpp"
@@ -126,8 +130,7 @@ list(APPEND SMDATA_RAGE_FILE_SRC
             "RageFileDriverTimeout.cpp"
             "RageFileDriverZip.cpp"
             "RageFileManager.cpp"
-  "RageFileManager_ReadAhead.cpp"
+            "RageFileManager_ReadAhead.cpp")
-)
 
 list(APPEND SMDATA_RAGE_FILE_HPP
             "RageFile.h"
@@ -142,10 +145,12 @@ list(APPEND SMDATA_RAGE_FILE_HPP
             "RageFileDriverTimeout.h"
             "RageFileDriverZip.h"
             "RageFileManager.h"
-  "RageFileManager_ReadAhead.h"
+            "RageFileManager_ReadAhead.h")
-)
 
-source_group("Rage\\\\File" FILES ${SMDATA_RAGE_FILE_SRC} ${SMDATA_RAGE_FILE_HPP})
+source_group("Rage\\\\File"
+             FILES
+             ${SMDATA_RAGE_FILE_SRC}
+             ${SMDATA_RAGE_FILE_HPP})
 
 list(APPEND SMDATA_RAGE_SOUND_SRC
             "RageSound.cpp"
@@ -166,8 +171,7 @@ list(APPEND SMDATA_RAGE_SOUND_SRC
             "RageSoundReader_SpeedChange.cpp"
             "RageSoundReader_ThreadedBuffer.cpp"
             "RageSoundReader_WAV.cpp"
-  "RageSoundUtil.cpp"
+            "RageSoundUtil.cpp")
-)
 list(APPEND SMDATA_RAGE_SOUND_HPP
             "RageSound.h"
             "RageSoundManager.h"
@@ -188,33 +192,33 @@ list(APPEND SMDATA_RAGE_SOUND_HPP
             "RageSoundReader_SpeedChange.h"
             "RageSoundReader_ThreadedBuffer.h"
             "RageSoundReader_WAV.h"
-  "RageSoundUtil.h"
+            "RageSoundUtil.h")
-)
 
-if (HAS_OGG)
+if(HAS_OGG)
   list(APPEND SMDATA_RAGE_SOUND_SRC "RageSoundReader_Vorbisfile.cpp")
   list(APPEND SMDATA_RAGE_SOUND_HPP "RageSoundReader_Vorbisfile.h")
 endif()
 
-if (HAS_MP3)
+if(HAS_MP3)
   list(APPEND SMDATA_RAGE_SOUND_SRC "RageSoundReader_MP3.cpp")
   list(APPEND SMDATA_RAGE_SOUND_HPP "RageSoundReader_MP3.h")
 endif()
 
-source_group("Rage\\\\Sound" FILES ${SMDATA_RAGE_SOUND_SRC} ${SMDATA_RAGE_SOUND_HPP})
+source_group("Rage\\\\Sound"
+             FILES
+             ${SMDATA_RAGE_SOUND_SRC}
+             ${SMDATA_RAGE_SOUND_HPP})
 
 list(APPEND SMDATA_ALL_RAGE_SRC
             ${SMDATA_RAGE_FILE_SRC}
             ${SMDATA_RAGE_GRAPHICS_SRC}
             ${SMDATA_RAGE_MISC_SRC}
             ${SMDATA_RAGE_SOUND_SRC}
-  ${SMDATA_RAGE_UTILS_SRC}
+            ${SMDATA_RAGE_UTILS_SRC})
-)
 
 list(APPEND SMDATA_ALL_RAGE_HPP
             ${SMDATA_RAGE_FILE_HPP}
             ${SMDATA_RAGE_GRAPHICS_HPP}
             ${SMDATA_RAGE_MISC_HPP}
             ${SMDATA_RAGE_SOUND_HPP}
-  ${SMDATA_RAGE_UTILS_HPP}
+            ${SMDATA_RAGE_UTILS_HPP})
-)

src/CMakeData-screen.cmake

@@ -3,17 +3,18 @@ list(APPEND SMDATA_SCREEN_GAMEPLAY_SRC
             "ScreenGameplayLesson.cpp"
             "ScreenGameplayNormal.cpp"
             "ScreenGameplayShared.cpp"
-  "ScreenGameplaySyncMachine.cpp"
+            "ScreenGameplaySyncMachine.cpp")
-)
 
 list(APPEND SMDATA_SCREEN_GAMEPLAY_HPP
             "ScreenGameplay.h"
             "ScreenGameplayNormal.h"
             "ScreenGameplayShared.h"
-  "ScreenGameplaySyncMachine.h"
+            "ScreenGameplaySyncMachine.h")
-)
 
-source_group("Screens\\\\Gameplay" FILES ${SMDATA_SCREEN_GAMEPLAY_SRC} ${SMDATA_SCREEN_GAMEPLAY_HPP})
+source_group("Screens\\\\Gameplay"
+             FILES
+             ${SMDATA_SCREEN_GAMEPLAY_SRC}
+             ${SMDATA_SCREEN_GAMEPLAY_HPP})
 
 list(APPEND SMDATA_SCREEN_OPTION_SRC
             "ScreenOptions.cpp"
@@ -27,8 +28,7 @@ list(APPEND SMDATA_SCREEN_OPTION_SRC
             "ScreenOptionsMaster.cpp"
             "ScreenOptionsMasterPrefs.cpp"
             "ScreenOptionsMemoryCard.cpp"
-  "ScreenOptionsToggleSongs.cpp"
+            "ScreenOptionsToggleSongs.cpp")
-)
 list(APPEND SMDATA_SCREEN_OPTION_HPP
             "ScreenOptions.h"
             "ScreenOptionsCourseOverview.h"
@@ -41,10 +41,12 @@ list(APPEND SMDATA_SCREEN_OPTION_HPP
             "ScreenOptionsMaster.h"
             "ScreenOptionsMasterPrefs.h"
             "ScreenOptionsMemoryCard.h"
-  "ScreenOptionsToggleSongs.h"
+            "ScreenOptionsToggleSongs.h")
-)
 
-source_group("Screens\\\\Options" FILES ${SMDATA_SCREEN_OPTION_SRC} ${SMDATA_SCREEN_OPTION_HPP})
+source_group("Screens\\\\Options"
+             FILES
+             ${SMDATA_SCREEN_OPTION_SRC}
+             ${SMDATA_SCREEN_OPTION_HPP})
 
 list(APPEND SMDATA_SCREEN_REST_SRC
             "Screen.cpp"
@@ -98,8 +100,7 @@ list(APPEND SMDATA_SCREEN_REST_SRC
             "ScreenUnlockBrowse.cpp"
             "ScreenUnlockCelebrate.cpp"
             "ScreenUnlockStatus.cpp"
-  "ScreenWithMenuElements.cpp"
+            "ScreenWithMenuElements.cpp")
-)
 list(APPEND SMDATA_SCREEN_REST_HPP
             "Screen.h"
             "ScreenAttract.h"
@@ -152,48 +153,45 @@ list(APPEND SMDATA_SCREEN_REST_HPP
             "ScreenUnlockBrowse.h"
             "ScreenUnlockCelebrate.h"
             "ScreenUnlockStatus.h"
-  "ScreenWithMenuElements.h"
+            "ScreenWithMenuElements.h")
-)
 
-source_group("Screens\\\\Others" FILES ${SMDATA_SCREEN_REST_SRC} ${SMDATA_SCREEN_REST_HPP})
+source_group("Screens\\\\Others"
+             FILES
+             ${SMDATA_SCREEN_REST_SRC}
+             ${SMDATA_SCREEN_REST_HPP})
 
 list(APPEND SMDATA_SCREEN_NET_SRC
             "ScreenNetEvaluation.cpp"
             "ScreenNetRoom.cpp"
             "ScreenNetSelectBase.cpp"
             "ScreenNetSelectMusic.cpp"
-  "ScreenNetworkOptions.cpp"
+            "ScreenNetworkOptions.cpp")
-)
 
 list(APPEND SMDATA_SCREEN_NET_HPP
             "ScreenNetEvaluation.h"
             "ScreenNetRoom.h"
             "ScreenNetSelectBase.h"
             "ScreenNetSelectMusic.h"
-  "ScreenNetworkOptions.h"
+            "ScreenNetworkOptions.h")
-)
 
-if (WITH_NETWORKING)
+if(WITH_NETWORKING)
-  list(APPEND SMDATA_SCREEN_NET_SRC
+  list(APPEND SMDATA_SCREEN_NET_SRC "ScreenSMOnlineLogin.cpp")
-    "ScreenSMOnlineLogin.cpp"
+  list(APPEND SMDATA_SCREEN_NET_HPP "ScreenSMOnlineLogin.h")
-  )
-  list(APPEND SMDATA_SCREEN_NET_HPP
-    "ScreenSMOnlineLogin.h"
-  )
 endif()
 
-source_group("Screens\\\\Network" FILES ${SMDATA_SCREEN_NET_SRC} ${SMDATA_SCREEN_NET_HPP})
+source_group("Screens\\\\Network"
+             FILES
+             ${SMDATA_SCREEN_NET_SRC}
+             ${SMDATA_SCREEN_NET_HPP})
 
 list(APPEND SMDATA_ALL_SCREENS_SRC
             ${SMDATA_SCREEN_GAMEPLAY_SRC}
             ${SMDATA_SCREEN_OPTION_SRC}
             ${SMDATA_SCREEN_NET_SRC}
-  ${SMDATA_SCREEN_REST_SRC}
+            ${SMDATA_SCREEN_REST_SRC})
-)
 
 list(APPEND SMDATA_ALL_SCREENS_HPP
             ${SMDATA_SCREEN_GAMEPLAY_HPP}
             ${SMDATA_SCREEN_OPTION_HPP}
             ${SMDATA_SCREEN_NET_HPP}
-  ${SMDATA_SCREEN_REST_HPP}
+            ${SMDATA_SCREEN_REST_HPP})
-)

src/CMakeData-singletons.cmake

@@ -23,8 +23,7 @@ list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
             "SongManager.cpp"
             "StatsManager.cpp"
             "ThemeManager.cpp"
-  "UnlockManager.cpp"
+            "UnlockManager.cpp")
-)
 list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
             "AnnouncerManager.h"
             "Bookkeeper.h"
@@ -50,16 +49,14 @@ list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
             "SongManager.h"
             "StatsManager.h"
             "ThemeManager.h"
-  "UnlockManager.h"
+            "UnlockManager.h")
-)
 
 if(WITH_NETWORKING)
-  list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
+  list(APPEND SMDATA_GLOBAL_SINGLETON_SRC "ezsockets.cpp")
-    "ezsockets.cpp"
+  list(APPEND SMDATA_GLOBAL_SINGLETON_HPP "ezsockets.h")
-  )
-  list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
-    "ezsockets.h"
-  )
 endif()
 
-source_group("Global Singletons" FILES ${SMDATA_GLOBAL_SINGLETON_SRC} ${SMDATA_GLOBAL_SINGLETON_HPP})
+source_group("Global Singletons"
+             FILES
+             ${SMDATA_GLOBAL_SINGLETON_SRC}
+             ${SMDATA_GLOBAL_SINGLETON_HPP})

src/CMakeLists.txt

@@ -3,10 +3,10 @@ file(MAKE_DIRECTORY "${SM_SRC_DIR}/generated")
 if(MSVC)
   # Add the mapconv program of the past to allow for debugging information.
   include("CMakeProject-mapconv.cmake")
-  if (WITH_IRC_POST_HOOK)
+  if(WITH_IRC_POST_HOOK)
     include("CMakeProject-irc.cmake")
   endif()
-  if (WITH_TEXTURE_GENERATOR OR WITH_FULL_RELEASE)
+  if(WITH_TEXTURE_GENERATOR OR WITH_FULL_RELEASE)
     include("CMakeProject-texture.cmake")
   endif()
 endif()
@@ -36,8 +36,7 @@ list(APPEND SMDATA_ALL_FILES_SRC
             ${SMDATA_ALL_RAGE_SRC}
             ${SMDATA_ALL_SCREENS_SRC}
             ${SMDATA_OS_SRC}
-  ${SMDATA_FILE_TYPES_SRC}
+            ${SMDATA_FILE_TYPES_SRC})
-)
 list(APPEND SMDATA_ALL_FILES_HPP
             ${SMDATA_GLOBAL_FILES_HPP}
             ${SMDATA_GLOBAL_SINGLETON_HPP}
@@ -47,8 +46,7 @@ list(APPEND SMDATA_ALL_FILES_HPP
             ${SMDATA_ALL_RAGE_HPP}
             ${SMDATA_ALL_SCREENS_HPP}
             ${SMDATA_OS_HPP}
-  ${SMDATA_FILE_TYPES_HPP}
+            ${SMDATA_FILE_TYPES_HPP})
-)
 
 if(NOT APPLE)
   list(APPEND SMDATA_ALL_FILES_SRC "Main.cpp")
@@ -68,47 +66,62 @@ else()
 endif()
 
 # Configure generated files here.
-configure_file("${SM_XCODE_DIR}/Info.plist.in.xml" "${SM_XCODE_DIR}/Info.StepMania.plist")
+configure_file("${SM_XCODE_DIR}/Info.plist.in.xml"
-configure_file("${SM_XCODE_DIR}/plistHelper.in.hpp" "${SM_XCODE_DIR}/plistHelper.hpp")
+               "${SM_XCODE_DIR}/Info.StepMania.plist")
+configure_file("${SM_XCODE_DIR}/plistHelper.in.hpp"
+               "${SM_XCODE_DIR}/plistHelper.hpp")
 
 # TODO: Make this actually be data and not an executable.
 if(APPLE)
   set(MACOSX_BUNDLE_BUNDLE_NAME ${SM_EXE_NAME})
-  add_executable("${SM_EXE_NAME}" MACOSX_BUNDLE ${SMDATA_ALL_FILES_SRC} ${SMDATA_ALL_FILES_HPP})
+  add_executable("${SM_EXE_NAME}"
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES
+                 MACOSX_BUNDLE
-    MACOSX_BUNDLE TRUE
+                 ${SMDATA_ALL_FILES_SRC}
-  )
+                 ${SMDATA_ALL_FILES_HPP})
+  set_target_properties("${SM_EXE_NAME}" PROPERTIES MACOSX_BUNDLE TRUE)
 else()
-  if (MSVC)
+  if(MSVC)
-    foreach ( sm_src_file ${SMDATA_ALL_FILES_SRC} )
+    foreach(sm_src_file ${SMDATA_ALL_FILES_SRC})
       get_filename_component(sm_src_raw "${sm_src_file}" NAME_WE)
-      if( ${sm_src_raw} MATCHES "global" )
+      if(${sm_src_raw} MATCHES "global")
-        set_source_files_properties("${sm_src_raw}.cpp" PROPERTIES COMPILE_FLAGS "/Ycglobal.h")
+        set_source_files_properties("${sm_src_raw}.cpp"
+                                    PROPERTIES
+                                    COMPILE_FLAGS
+                                    "/Ycglobal.h")
       elseif(NOT (${sm_src_raw} MATCHES "verstub"))
-        set_source_files_properties("${sm_src_raw}.cpp" PROPERTIES COMPILE_FLAGS "/Yuglobal.h")
+        set_source_files_properties("${sm_src_raw}.cpp"
+                                    PROPERTIES
+                                    COMPILE_FLAGS
+                                    "/Yuglobal.h")
       endif()
     endforeach()
   endif()
-  add_executable("${SM_EXE_NAME}" ${SMDATA_ALL_FILES_SRC} ${SMDATA_ALL_FILES_HPP})
+  add_executable("${SM_EXE_NAME}" ${SMDATA_ALL_FILES_SRC}
+                 ${SMDATA_ALL_FILES_HPP})
 endif()
 
-set_target_properties("${SM_EXE_NAME}" PROPERTIES
+set_target_properties("${SM_EXE_NAME}"
-  OUTPUT_NAME "${SM_NAME_RELEASE}"
+                      PROPERTIES OUTPUT_NAME
-  RELEASE_OUTPUT_NAME "${SM_NAME_RELEASE}"
+                                 "${SM_NAME_RELEASE}"
-  DEBUG_OUTPUT_NAME "${SM_NAME_DEBUG}"
+                                 RELEASE_OUTPUT_NAME
-  MINSIZEREL_OUTPUT_NAME "${SM_NAME_MINSIZEREL}"
+                                 "${SM_NAME_RELEASE}"
-  RELWITHDEBINFO_OUTPUT_NAME "${SM_NAME_RELWITHDEBINFO}"
+                                 DEBUG_OUTPUT_NAME
-)
+                                 "${SM_NAME_DEBUG}"
+                                 MINSIZEREL_OUTPUT_NAME
+                                 "${SM_NAME_MINSIZEREL}"
+                                 RELWITHDEBINFO_OUTPUT_NAME
+                                 "${SM_NAME_RELWITHDEBINFO}")
 
-if (WITH_PORTABLE_TOMCRYPT)
+if(WITH_PORTABLE_TOMCRYPT)
   sm_add_compile_definition("${SM_EXE_NAME}" LTC_NO_ASM)
-elseif (WITH_NO_ROLC_TOMCRYPT OR APPLE)
+endif()
+if(WITH_NO_ROLC_TOMCRYPT)
   sm_add_compile_definition("${SM_EXE_NAME}" LTC_NO_ROLC)
 endif()
 
 sm_add_compile_definition("${SM_EXE_NAME}" CMAKE_POWERED)
 
-if (NOT WITH_NETWORKING)
+if(NOT WITH_NETWORKING)
   sm_add_compile_definition("${SM_EXE_NAME}" WITHOUT_NETWORKING)
 endif()
 
@@ -116,7 +129,8 @@ endif()
 sm_add_compile_definition("${SM_EXE_NAME}" $<$<CONFIG:Debug>:DEBUG>)
 sm_add_compile_definition("${SM_EXE_NAME}" $<$<CONFIG:Release>:RELEASE>)
 sm_add_compile_definition("${SM_EXE_NAME}" $<$<CONFIG:MinSizeRel>:MINSIZEREL>)
-sm_add_compile_definition("${SM_EXE_NAME}" $<$<CONFIG:RelWithDebInfo>:RELWITHDEBINFO>)
+sm_add_compile_definition("${SM_EXE_NAME}"
+                          $<$<CONFIG:RelWithDebInfo>:RELWITHDEBINFO>)
 
 set(SM_COMPILE_FLAGS "")
 
@@ -141,77 +155,105 @@ if(MSVC)
   set(SM_COMPILE_FLAGS "${SM_COMPILE_FLAGS} /MP2")
 endif()
 
-set_target_properties("${SM_EXE_NAME}" PROPERTIES
+set_target_properties("${SM_EXE_NAME}"
-  COMPILE_FLAGS "${SM_COMPILE_FLAGS}"
+                      PROPERTIES COMPILE_FLAGS "${SM_COMPILE_FLAGS}")
-)
 
-set_target_properties("${SM_EXE_NAME}" PROPERTIES
+set_target_properties("${SM_EXE_NAME}"
-  OUTPUT_NAME_DEBUG "${SM_NAME_DEBUG}"
+                      PROPERTIES OUTPUT_NAME_DEBUG
-  OUTPUT_NAME_MINSIZEREL "${SM_NAME_MINSIZEREL}"
+                                 "${SM_NAME_DEBUG}"
-  OUTPUT_NAME_RELWITHDEBINFO "${SM_NAME_RELWITHDEBINFO}"
+                                 OUTPUT_NAME_MINSIZEREL
-)
+                                 "${SM_NAME_MINSIZEREL}"
+                                 OUTPUT_NAME_RELWITHDEBINFO
+                                 "${SM_NAME_RELWITHDEBINFO}")
 
 list(APPEND SM_WINDOWS_PROGRAM_DLLS
             "${SM_PROGRAM_DIR}/avcodec-55.dll"
             "${SM_PROGRAM_DIR}/avformat-55.dll"
             "${SM_PROGRAM_DIR}/avutil-52.dll"
             "${SM_PROGRAM_DIR}/parallel_lights_io.dll"
-  "${SM_PROGRAM_DIR}/swscale-2.dll"
+            "${SM_PROGRAM_DIR}/swscale-2.dll")
-)
 
 if(WIN32)
   sm_add_compile_definition("${SM_EXE_NAME}" WINDOWS)
-  sm_add_compile_definition("${SM_EXE_NAME}" _WINDOWS) # TODO: Remove this potential duplicate.
+  sm_add_compile_definition("${SM_EXE_NAME}" _WINDOWS) # TODO: Remove this
+                                                       # potential duplicate.
   sm_add_compile_definition("${SM_EXE_NAME}" _CRT_SECURE_NO_WARNINGS)
   sm_add_compile_definition("${SM_EXE_NAME}" _WINSOCK_DEPRECATED_NO_WARNINGS)
   sm_add_compile_definition("${SM_EXE_NAME}" GLEW_STATIC)
 
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES
+  set_target_properties("${SM_EXE_NAME}"
-    RUNTIME_OUTPUT_DIRECTORY "${SM_PROGRAM_DIR}"
+                        PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${SM_PROGRAM_DIR}"
+                                   "${SM_PROGRAM_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${SM_PROGRAM_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_RELEASE
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${SM_PROGRAM_DIR}"
+                                   "${SM_PROGRAM_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_PROGRAM_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_DEBUG
-  )
+                                   "${SM_PROGRAM_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
+                                   "${SM_PROGRAM_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                                   "${SM_PROGRAM_DIR}")
 
   if(MSVC)
     # Allow for getting a virtualdub stack trace.
-    add_custom_command(TARGET "${SM_EXE_NAME}"
+    add_custom_command(
-      POST_BUILD
+      TARGET "${SM_EXE_NAME}" POST_BUILD
-      COMMAND "mapconv" "${SM_PROGRAM_DIR}/$<$<CONFIG:DEBUG>:${SM_NAME_DEBUG}>$<$<CONFIG:MINSIZEREL>:${SM_NAME_MINSIZEREL}>$<$<CONFIG:RELWITHDEBINFO>:${SM_NAME_RELWITHDEBINFO}>$<$<CONFIG:RELEASE>:${SM_NAME_RELEASE}>.map" "${SM_PROGRAM_DIR}/$<$<CONFIG:DEBUG>:${SM_NAME_DEBUG}>$<$<CONFIG:MINSIZEREL>:${SM_NAME_MINSIZEREL}>$<$<CONFIG:RELWITHDEBINFO>:${SM_NAME_RELWITHDEBINFO}>$<$<CONFIG:RELEASE>:${SM_NAME_RELEASE}>.vdi"
+      COMMAND
-      COMMENT "Generating file to allow for easier stack traces."
+        "mapconv"
-    )
+        "${SM_PROGRAM_DIR}/$<$<CONFIG:DEBUG>:${SM_NAME_DEBUG}>$<$<CONFIG:MINSIZEREL>:${SM_NAME_MINSIZEREL}>$<$<CONFIG:RELWITHDEBINFO>:${SM_NAME_RELWITHDEBINFO}>$<$<CONFIG:RELEASE>:${SM_NAME_RELEASE}>.map"
+        "${SM_PROGRAM_DIR}/$<$<CONFIG:DEBUG>:${SM_NAME_DEBUG}>$<$<CONFIG:MINSIZEREL>:${SM_NAME_MINSIZEREL}>$<$<CONFIG:RELWITHDEBINFO>:${SM_NAME_RELWITHDEBINFO}>$<$<CONFIG:RELEASE>:${SM_NAME_RELEASE}>.vdi"
+      COMMENT "Generating file to allow for easier stack traces.")
   endif()
 elseif(APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -stdlib=libc++ -DMACOSX")
+  sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_X86_DARWIN)
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES
+  sm_add_compile_definition("${SM_EXE_NAME}" MACOSX)
-    RUNTIME_OUTPUT_DIRECTORY "${SM_ROOT_DIR}"
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -stdlib=libc++")
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${SM_ROOT_DIR}"
+  set_target_properties(
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${SM_ROOT_DIR}"
+    "${SM_EXE_NAME}"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${SM_ROOT_DIR}"
+    PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_ROOT_DIR}"
+      RUNTIME_OUTPUT_DIRECTORY
-    MACOSX_BUNDLE_INFO_PLIST "${SM_XCODE_DIR}/Info.StepMania.plist"
+      "${SM_ROOT_DIR}"
-    XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "${SM_CPP_STANDARD}"
+      RUNTIME_OUTPUT_DIRECTORY_RELEASE
-    XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"
+      "${SM_ROOT_DIR}"
-    XCODE_ATTRIBUTE_INFOPLIST_FILE "${SM_XCODE_DIR}/Info.StepMania.plist"
+      RUNTIME_OUTPUT_DIRECTORY_DEBUG
-    XCODE_ATTRIBUTE_INFOPLIST_PREPROCESS "YES"
+      "${SM_ROOT_DIR}"
-    XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Release] "RELEASE"
+      RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
-    XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Debug] "DEBUG"
+      "${SM_ROOT_DIR}"
-    XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=MinSizeRel] "MINSIZEREL"
+      RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
-    XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=RelWithDebInfo] "RELWITHDEBINFO"
+      "${SM_ROOT_DIR}"
-    XCODE_ATTRIBUTE_INFOPLIST_PREFIX_HEADER "${SM_XCODE_DIR}/plistHelper.hpp"
+      MACOSX_BUNDLE_INFO_PLIST
-    XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch"
+      "${SM_XCODE_DIR}/Info.StepMania.plist"
-    XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS "NO"
+      XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD
-    XCODE_ATTRIBUTE_LIBRARY_SEARCH_PATHS "${SM_XCODE_DIR}/Libraries"
+      "${SM_CPP_STANDARD}"
-  )
+      XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY
+      "libc++"
+      XCODE_ATTRIBUTE_INFOPLIST_FILE
+      "${SM_XCODE_DIR}/Info.StepMania.plist"
+      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESS
+      "YES"
+      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Release]
+      "RELEASE"
+      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Debug]
+      "DEBUG"
+      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=MinSizeRel]
+      "MINSIZEREL"
+      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=RelWithDebInfo]
+      "RELWITHDEBINFO"
+      XCODE_ATTRIBUTE_INFOPLIST_PREFIX_HEADER
+      "${SM_XCODE_DIR}/plistHelper.hpp"
+      XCODE_ATTRIBUTE_GCC_PREFIX_HEADER
+      "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch"
+      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS
+      "NO"
+      XCODE_ATTRIBUTE_LIBRARY_SEARCH_PATHS
+      "${SM_XCODE_DIR}/Libraries")
 
   sm_add_compile_definition("${SM_EXE_NAME}" _XOPEN_SOURCE)
 
-  if (${HAS_FFMPEG})
+  if(${HAS_FFMPEG})
     sm_add_compile_definition("${SM_EXE_NAME}" HAVE_FFMPEG)
   endif()
 
-  if (CMAKE_BUILD_TYPE EQUAL "Debug")
+  if(CMAKE_BUILD_TYPE EQUAL "Debug")
     set(SM_APP_RELEASE_NAME "${SM_NAME_DEBUG}")
   elseif(CMAKE_BUILD_TYPE EQUAL "MinSizeRel")
     set(SM_APP_RELEASE_NAME "${SM_NAME_MINSIZEREL}")
@@ -220,106 +262,117 @@ elseif(APPLE)
   else()
     set(SM_APP_RELEASE_NAME "${SM_NAME_RELEASE}")
   endif()
-  if (WITH_FULL_RELEASE)
+  if(WITH_FULL_RELEASE)
-    string(CONCAT SM_NAME_VERSION "${SM_EXE_NAME}" "-" "${SM_VERSION_TRADITIONAL}")
+    string(CONCAT SM_NAME_VERSION
+                  "${SM_EXE_NAME}"
+                  "-"
+                  "${SM_VERSION_TRADITIONAL}")
     set(SM_DMG_VERSION "${SM_VERSION_TRADITIONAL}")
   else()
-    string(CONCAT SM_NAME_VERSION "${SM_EXE_NAME}" "-" "${SM_VERSION_FULL}")
+    string(CONCAT SM_NAME_VERSION
+                  "${SM_EXE_NAME}"
+                  "-"
+                  "${SM_VERSION_FULL}")
     set(SM_DMG_VERSION "${SM_VERSION_FULL}")
   endif()
   set(SM_DMG_RELEASE_NAME "${SM_NAME_VERSION}-mac.dmg")
 
   add_custom_target(dmg
-    COMMAND
+                    COMMAND pushd ${SM_ROOT_DIR}\; mkdir -p dmgtmpdir\; cd
-      pushd ${SM_ROOT_DIR}\;
+                            dmgtmpdir\; mkdir -p ${SM_NAME_VERSION}\; cd
-      mkdir dmgtmpdir\;
+                            ${SM_NAME_VERSION}\; mkdir -p ${SM_NAME_VERSION}\; cd
-      cd dmgtmpdir\;
+                            ${SM_NAME_VERSION}\; cp -R
-      mkdir ${SM_NAME_VERSION}\;
+                            "${SM_ROOT_DIR}/Announcers" .\; cp -R
-      cd ${SM_NAME_VERSION}\;
+                            "${SM_ROOT_DIR}/BackgroundEffects" .\; cp -R
-      mkdir ${SM_NAME_VERSION}\;
+                            "${SM_ROOT_DIR}/BackgroundTransitions" .\; cp -R
-      cd ${SM_NAME_VERSION}\;
+                            "${SM_ROOT_DIR}/BGAnimations" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/Announcers" .\;
+                            "${SM_ROOT_DIR}/Characters" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/BackgroundEffects" .\;
+                            "${SM_ROOT_DIR}/Courses" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/BackgroundTransitions" .\;
+                            "${SM_ROOT_DIR}/Data" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/BGAnimations" .\;
+                            "${SM_ROOT_DIR}/Docs" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/Characters" .\;
+                            "${SM_ROOT_DIR}/Manual" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/Courses" .\;
+                            "${SM_ROOT_DIR}/NoteSkins" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/Data" .\;
+                            "${SM_ROOT_DIR}/Scripts" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/Docs" .\;
+                            "${SM_ROOT_DIR}/Songs" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/Manual" .\;
+                            "${SM_ROOT_DIR}/Themes" .\; cp -R
-      cp -r "${SM_ROOT_DIR}/NoteSkins" .\;
+                            "${SM_ROOT_DIR}/${SM_APP_RELEASE_NAME}.app" .\; cd
-      cp -r "${SM_ROOT_DIR}/Scripts" .\;
+                            ${SM_ROOT_DIR}\; hdiutil create
-      cp -r "${SM_ROOT_DIR}/Songs" .\;
+                            "${SM_DMG_RELEASE_NAME}" -VOLNAME
-      cp -r "${SM_ROOT_DIR}/Themes" .\;
+                            "StepMania ${SM_DMG_VERSION}" -SRCFOLDER
-      cp -r "${SM_ROOT_DIR}/${SM_APP_RELEASE_NAME}.app" .\;
+                            "dmgtmpdir/${SM_NAME_VERSION}/" -OV\; rm -fR
-      cd ${SM_ROOT_DIR}\;
+                            dmgtmpdir\; popd\;)
-      hdiutil create "${SM_DMG_RELEASE_NAME}"
-        -volname "StepMania ${SM_DMG_VERSION}"
-        -srcfolder "dmgtmpdir/${SM_NAME_VERSION}/"
-        -ov\;
-      rm -rf dmgtmpdir\;
-      popd\;
-  )
 
   # Add the ability to copy the resource file.
-  add_custom_command(TARGET "${SM_EXE_NAME}"
+  add_custom_command(TARGET "${SM_EXE_NAME}" POST_BUILD
-    POST_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E make_directory
-    COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:StepMania>/../Resources"
+                             "$<TARGET_FILE_DIR:StepMania>/../Resources"
-    COMMAND ${CMAKE_COMMAND} -E copy "${SM_XCODE_DIR}/smicon.icns" "$<TARGET_FILE_DIR:StepMania>/../Resources/"
+                     COMMAND ${CMAKE_COMMAND} -E copy
-    COMMAND ${CMAKE_COMMAND} -E copy "${SM_XCODE_DIR}/Hardware.plist" "$<TARGET_FILE_DIR:StepMania>/../Resources/"
+                             "${SM_XCODE_DIR}/smicon.icns"
-  )
+                             "$<TARGET_FILE_DIR:StepMania>/../Resources/"
+                     COMMAND ${CMAKE_COMMAND} -E copy
+                             "${SM_XCODE_DIR}/Hardware.plist"
+                             "$<TARGET_FILE_DIR:StepMania>/../Resources/")
 else() # Linux
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES
+  set_target_properties("${SM_EXE_NAME}"
-    RUNTIME_OUTPUT_DIRECTORY "${SM_ROOT_DIR}"
+                        PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${SM_ROOT_DIR}"
+                                   "${SM_ROOT_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${SM_ROOT_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_RELEASE
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${SM_ROOT_DIR}"
+                                   "${SM_ROOT_DIR}"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_ROOT_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_DEBUG
-  )
+                                   "${SM_ROOT_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
+                                   "${SM_ROOT_DIR}"
+                                   RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                                   "${SM_ROOT_DIR}")
 
   if(${WITH_CRASH_HANDLER})
     sm_add_compile_definition("${SM_EXE_NAME}" CRASH_HANDLER)
     if(LINUX)
       # used only in the ArchHooks_Unix.cpp file
       sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_X86_LINUX)
-      sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_TEXT="x86 custom backtrace")
+      sm_add_compile_definition("${SM_EXE_NAME}"
-      sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_TEXT="backtrace_symbols")
+                                BACKTRACE_METHOD_TEXT="x86 custom backtrace")
-      if (${DL_FOUND})
+      sm_add_compile_definition(
-        sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_DLADDR)
+        "${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_TEXT="backtrace_symbols")
+      if(${DL_FOUND})
+        sm_add_compile_definition("${SM_EXE_NAME}"
+                                  BACKTRACE_LOOKUP_METHOD_DLADDR)
       else()
-        sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS)
+        sm_add_compile_definition("${SM_EXE_NAME}"
+                                  BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS)
       endif()
     endif()
   endif()
-  if (${HAS_PTHREAD})
+  if(${HAS_PTHREAD})
     sm_add_compile_definition("${SM_EXE_NAME}" HAVE_LIBPTHREAD)
 
     message("Host processor is ${CMAKE_SYSTEM_PROCESSOR}")
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
       message("Host processor is 64bit")
       sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86_64)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86"
+           OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686")
       message("Host processor is 32bit")
       sm_add_compile_definition("${SM_EXE_NAME}" CPU_X86)
     else()
       message("Unrecognized host processor type")
     endif()
   endif()
-  if (${HAS_FFMPEG})
+  if(${HAS_FFMPEG})
     sm_add_compile_definition("${SM_EXE_NAME}" HAVE_FFMPEG)
   endif()
-  if (${HAS_XRANDR})
+  if(${HAS_XRANDR})
     sm_add_compile_definition("${SM_EXE_NAME}" HAVE_XRANDR)
   endif()
-  if (${HAS_XINERAMA} AND WITH_XINERAMA)
+  if(${HAS_XINERAMA})
     sm_add_compile_definition("${SM_EXE_NAME}" HAVE_XINERAMA)
   endif()
 
-  if (BSD)
+  if(BSD)
     sm_add_compile_definition("${SM_EXE_NAME}" BSD)
   endif()
 
-  if (GTK2_FOUND)
+  if(GTK2_FOUND)
     sm_add_compile_definition("${SM_EXE_NAME}" HAVE_GTK)
   endif()
 
@@ -329,68 +382,109 @@ else() # Linux
   endif()
 
   sm_add_compile_flag("${SM_EXE_NAME}" "-std=${SM_CPP_STANDARD}")
-  if (CMAKE_CXX_COMPILER MATCHES "clang")
+  if(CMAKE_CXX_COMPILER MATCHES "clang")
     sm_add_compile_flag("${SM_EXE_NAME}" "-stdlib=libc++")
-    set_target_properties("${SM_EXE_NAME}" PROPERTIES LINK_FLAGS "-stdlib=libc++")
+    set_target_properties("${SM_EXE_NAME}"
+                          PROPERTIES LINK_FLAGS "-stdlib=libc++")
   endif()
 endif()
 
 set_property(TARGET "${SM_EXE_NAME}" PROPERTY FOLDER "Internal Libraries")
 
-list(APPEND SMDATA_LINK_LIB
+list(APPEND SMDATA_LINK_LIB "lua-5.1")
-  "lua-5.1"
-  "tomcrypt"
-  "tommath"
-  "zlib"
-  "jsoncpp"
-  "png"
-  "glew"
-  "jpeg"
-)
 include(../extern/CMakeProject-mmmagic.cmake)
 
-if (HAS_MP3)
+if(HAS_MP3)
-  list(FIND SMDATA_LINK_LIB "jsoncpp" JSON_INDEX)
+  if(WITH_SYSTEM_MAD)
-  if (WIN32 OR MACOSX)
+    list(APPEND SMDATA_LINK_LIB ${LIBMAD_LIBRARY})
-    list(INSERT SMDATA_LINK_LIB ${JSON_INDEX} "mad")
   else()
-    list(INSERT SMDATA_LINK_LIB ${JSON_INDEX} ${LIBMAD_LIBRARY})
+    list(APPEND SMDATA_LINK_LIB "mad")
   endif()
 endif()
 
-if (NOT SYSTEM_PCRE_FOUND)
+if(WITH_SYSTEM_PCRE)
+  list(APPEND SMDATA_LINK_LIB ${PCRE_LIBRARY})
+else()
   list(APPEND SMDATA_LINK_LIB "pcre")
 endif()
 
-if (WIN32)
+if(WITH_SYSTEM_GLEW)
+  list(APPEND SMDATA_LINK_LIB ${GLEW_LIBRARIES} ${GLEW_LIBRARY_RELEASE})
+  list(APPEND SM_INCLUDE_DIRS ${GLEW_INCLUDE_DIRS})
+else()
+  list(APPEND SMDATA_LINK_LIB "glew")
+endif()
 
+if(WITH_SYSTEM_TOMCRYPT)
+  list(APPEND SMDATA_LINK_LIB ${TOMCRYPT_LIBRARY})
+else()
+  list(APPEND SMDATA_LINK_LIB "tomcrypt")
+endif()
+
+if(WITH_SYSTEM_TOMMATH)
+  list(APPEND SMDATA_LINK_LIB ${TOMMATH_LIBRARY})
+else()
+  list(APPEND SMDATA_LINK_LIB "tommath")
+endif()
+
+if(WITH_SYSTEM_JPEG)
+  sm_add_compile_definition("${SM_EXE_NAME}" SYSTEM_JPEGLIB)
+  list(APPEND SMDATA_LINK_LIB ${JPEG_LIBRARIES})
+else()
+  list(APPEND SMDATA_LINK_LIB "jpeg")
+endif()
+
+if(WITH_SYSTEM_ZLIB)
+  list(APPEND SMDATA_LINK_LIB ${ZLIB_LIBRARIES} ${ZLIB_LIBRARY_RELEASE})
+else()
+  list(APPEND SMDATA_LINK_LIB "zlib")
+endif()
+
+if(WITH_SYSTEM_PNG)
+  list(APPEND SMDATA_LINK_LIB ${PNG_LIBRARIES})
+else()
+  list(APPEND SMDATA_LINK_LIB "png")
+endif()
+
+if(WITH_SYSTEM_JSONCPP)
+  list(APPEND SMDATA_LINK_LIB ${JSONCPP_LIBRARY})
+else()
+  list(APPEND SMDATA_LINK_LIB "jsoncpp")
+endif()
+
+if(WITH_OGG)
+  if(WITH_SYSTEM_OGG)
+    list(APPEND SMDATA_LINK_LIB
+                "${VORBISFILE_LIBRARY}"
+                "${VORBIS_LIBRARY}"
+                "${OGG_LIBRARY}")
+  else()
+    list(APPEND SMDATA_LINK_LIB
+                "vorbisfile"
+                "vorbis"
+                "ogg")
+  endif()
+endif()
+
+if(WIN32)
   list(APPEND SMDATA_LINK_LIB
               # The misc libraries are here.
               "${LIB_SWSCALE}"
               "${LIB_AVCODEC}"
               "${LIB_AVFORMAT}"
-    "${LIB_AVUTIL}"
+              "${LIB_AVUTIL}")
-  )
-
-  if (WITH_OGG)
-    list(APPEND SMDATA_LINK_LIB
-      "ogg"
-      "vorbis"
-      "vorbisfile"
-    )
-  endif()
 
   list(APPEND SMDATA_LINK_LIB
               "dbghelp.lib"
               "setupapi.lib"
-    "hid.lib"
+              "hid.lib")
-  )
 
   get_filename_component(DIRECTX_LIBRARY_DIR "${DIRECTX_LIBRARIES}" DIRECTORY)
 
   sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${DIRECTX_LIBRARY_DIR}\"")
   sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_EXTERN_DIR}/ffmpeg/lib\"")
-  sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk\"")
+  sm_add_link_flag("${SM_EXE_NAME}"
+                   "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk\"")
   sm_add_link_flag("${SM_EXE_NAME}" "/ERRORREPORT:SEND")
   sm_add_link_flag("${SM_EXE_NAME}" "/MAPINFO:EXPORTS")
   sm_add_link_flag("${SM_EXE_NAME}" "/SAFESEH:NO")
@@ -399,73 +493,60 @@ if (WIN32)
   sm_add_link_flag("${SM_EXE_NAME}" "/NODEFAULTLIB:wininet.lib")
   sm_add_link_flag("${SM_EXE_NAME}" "/NODEFAULTLIB:msimg32.lib")
   sm_add_link_flag("${SM_EXE_NAME}" "/NODEFAULTLIB:libci.lib")
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt.lib")
+  set_target_properties("${SM_EXE_NAME}"
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+                        PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt.lib")
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
+  set_target_properties("${SM_EXE_NAME}"
+                        PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+  set_target_properties("${SM_EXE_NAME}"
+                        PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
 
 elseif(APPLE)
-  # The following were removed from SMDATA_LINK_LIB to "match" StepMania's pbxproj.
+  # The following were removed from SMDATA_LINK_LIB to "match" StepMania's
-#    ${MAC_FRAME_APPKIT}
+  # pbxproj. ${MAC_FRAME_APPKIT} ${MAC_FRAME_FOUNDATION} "ffmpeg"
-#    ${MAC_FRAME_FOUNDATION}
-#    "ffmpeg"
 
-  list(INSERT SMDATA_LINK_LIB 0
+  list(INSERT SMDATA_LINK_LIB
+              0
               ${MAC_FRAME_ACCELERATE}
               ${MAC_FRAME_CARBON}
               ${MAC_FRAME_COCOA}
               ${MAC_FRAME_IOKIT}
-    ${MAC_FRAME_QUICKTIME}
               ${MAC_FRAME_OPENGL}
               ${MAC_FRAME_COREFOUNDATION}
               ${MAC_FRAME_AUDIOTOOLBOX}
               ${MAC_FRAME_AUDIOUNIT}
               ${MAC_FRAME_COREAUDIO}
               ${MAC_FRAME_CORESERVICES}
-    "ogg"
+              ${MAC_FRAME_SYSTEM})
-    "theora"
-    "vorbis"
-  )
   list(APPEND SMDATA_LINK_LIB
               "${BZIP2_LIBRARY_RELEASE}"
-    "${ICONV_LIBRARIES}"
+              "${ICONV_LIBRARIES}")
-    "pcre"
-  )
-
-  if (HAS_OGG)
-    list(APPEND SMDATA_LINK_LIB
-      "${SM_OGG_ROOT}/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>/libogg.a"
-      "${SM_VORBIS_ROOT}/lib/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>/libvorbis.a"
-      "${SM_VORBIS_ROOT}/lib/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>/libvorbisfile.a"
-    )
-  endif()
 
   if(HAS_FFMPEG)
     list(APPEND SMDATA_LINK_LIB
                 "${SM_FFMPEG_ROOT}/libavformat/libavformat.a"
                 "${SM_FFMPEG_ROOT}/libavcodec/libavcodec.a"
                 "${SM_FFMPEG_ROOT}/libswscale/libswscale.a"
-      "${SM_FFMPEG_ROOT}/libavutil/libavutil.a"
+                "${SM_FFMPEG_ROOT}/libavutil/libavutil.a")
-    )
   endif()
-else() # Unix / Linux
+else() # Unix / Linux TODO: Remember to find and locate the zip archive files.
-  # TODO: Remember to find and locate the zip archive files.
+  if(HAS_FFMPEG)
-  list(FIND SMDATA_LINK_LIB "jpeg" JPEG_INDEX)
-  sm_list_replace(SMDATA_LINK_LIB ${JPEG_INDEX} "${JPEG_LIBRARY}")
-  if (HAS_FFMPEG)
     if(WITH_SYSTEM_FFMPEG)
       list(APPEND SMDATA_LINK_LIB
                   "${FFMPEG_avformat_LIBRARY}"
                   "${FFMPEG_avcodec_LIBRARY}"
                   "${FFMPEG_swscale_LIBRARY}"
-        "${FFMPEG_avutil_LIBRARY}"
+                  "${FFMPEG_avutil_LIBRARY}")
-      )
     else()
       list(APPEND SMDATA_LINK_LIB
                   "${SM_FFMPEG_ROOT}/libavformat/libavformat.a"
                   "${SM_FFMPEG_ROOT}/libavcodec/libavcodec.a"
                   "${SM_FFMPEG_ROOT}/libswscale/libswscale.a"
-        "${SM_FFMPEG_ROOT}/libavutil/libavutil.a"
+                  "${SM_FFMPEG_ROOT}/libavutil/libavutil.a")
-      )
+    endif()
+
+    if(NOT WITH_SYSTEM_ZLIB)
+      list(REMOVE_ITEM SMDATA_LINK_LIB "zlib")
+      list(APPEND SMDATA_LINK_LIB "zlib")
     endif()
 
     if(VA_FOUND)
@@ -473,54 +554,39 @@ else() # Unix / Linux
     endif()
   endif()
 
-  if (${DL_FOUND})
+  if(${DL_FOUND})
     list(APPEND SMDATA_LINK_LIB ${DL_LIBRARIES})
   endif()
 
-  if(HAS_OGG)
+  list(APPEND SMDATA_LINK_LIB "${OPENGL_LIBRARY}")
-    list(APPEND SMDATA_LINK_LIB
-      "${VORBISFILE_LIBRARY}"
-      "${VORBIS_LIBRARY}"
-      "${OGG_LIBRARY}"
-    )
-  endif()
-
-  list(APPEND SMDATA_LINK_LIB
-    "${OPENGL_LIBRARY}"
-  )
 
   if(GTK2_FOUND)
-    list(APPEND SMDATA_LINK_LIB
+    list(APPEND SMDATA_LINK_LIB "${GTK2_LIBRARIES}")
-      "${GTK2_LIBRARIES}"
-    )
   endif()
 
-  list(APPEND SMDATA_LINK_LIB
+  list(APPEND SMDATA_LINK_LIB "${BZIP2_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
-    "${BZIP2_LIBRARIES}"
-    "${ZLIB_LIBRARIES}"
-    "${CMAKE_THREAD_LIBS_INIT}"
-  )
 
-  if (HAS_ALSA)
+  if(HAS_ALSA)
     list(APPEND SMDATA_LINK_LIB ${ALSA_LIBRARIES})
   endif()
 
-  if (HAS_JACK)
+  if(HAS_JACK)
     list(APPEND SMDATA_LINK_LIB ${JACK_LIBRARIES})
   endif()
 
-  if (HAS_OSS)
+  if(HAS_OSS)
     # No mention of OSS libraries.
     sm_add_compile_definition("${SM_EXE_NAME}" "HAVE_OSS_VERSION=1")
   endif()
 
-  if (HAS_PULSE)
+  if(HAS_PULSE)
     list(APPEND SMDATA_LINK_LIB ${PULSEAUDIO_LIBRARY})
-    # PACKAGE_NAME and PACKAGE_VERSION are only used in this scenario. Why is not clear.
+    # PACKAGE_NAME and PACKAGE_VERSION are only used in this scenario. Why is
-    # TODO: Remove this silliness.
+    # not clear. TODO: Remove this silliness.
     sm_add_compile_definition("${SM_EXE_NAME}" PACKAGE_NAME="StepMania")
     set(PACKAGE_VERSION "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
-    sm_add_compile_definition("${SM_EXE_NAME}" PACKAGE_VERSION="${PACKAGE_VERSION}")
+    sm_add_compile_definition("${SM_EXE_NAME}"
+                              PACKAGE_VERSION="${PACKAGE_VERSION}")
   endif()
 
   if(X11_FOUND)
@@ -536,97 +602,70 @@ else() # Unix / Linux
     list(APPEND SMDATA_LINK_LIB ${PCRE_LIBRARY})
   endif()
 
-  list(APPEND SMDATA_LINK_LIB
+  list(APPEND SMDATA_LINK_LIB ${XRANDR_LIBRARIES} ${XINERAMA_LIBRARIES})
-    ${XRANDR_LIBRARIES}
-    ${XINERAMA_LIBRARIES}
-  )
 
-  list(REMOVE_ITEM SMDATA_LINK_LIB "zlib")
+  list(REMOVE_DUPLICATES SMDATA_LINK_LIB)
 endif()
 
 target_link_libraries("${SM_EXE_NAME}" ${SMDATA_LINK_LIB})
 
-list(APPEND SM_INCLUDE_DIRS
+list(APPEND SM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
+            "${SM_SRC_DIR}/generated")
-  "${SM_SRC_DIR}/generated"
-)
 if(NOT APPLE)
   list(APPEND SM_INCLUDE_DIRS
               "${SM_EXTERN_DIR}/glew-1.5.8/include"
               "${SM_EXTERN_DIR}/jsoncpp/include"
-    "${SM_EXTERN_DIR}/zlib"
+              "${SM_EXTERN_DIR}/zlib")
-  )
   if(MSVC)
-    if (WITH_OGG)
+    if(WITH_OGG)
       list(APPEND SM_INCLUDE_DIRS
                   "${SM_EXTERN_DIR}/newogg/include"
                   "${SM_EXTERN_DIR}/newvorbis/lib"
-        "${SM_EXTERN_DIR}/newvorbis/include"
+                  "${SM_EXTERN_DIR}/newvorbis/include")
-      )
     endif()
-    list(APPEND SM_INCLUDE_DIRS
+    list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/ffmpeg/include")
-      "${SM_EXTERN_DIR}/ffmpeg/include"
-    )
   else()
     if(WITH_OGG)
-      list(APPEND SM_INCLUDE_DIRS
+      list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/vorbis")
-        "${SM_EXTERN_DIR}/vorbis"
-      )
     endif()
-    list(APPEND SM_INCLUDE_DIRS
+    list(APPEND SM_INCLUDE_DIRS "${JPEG_INCLUDE_DIR}")
-      "${JPEG_INCLUDE_DIR}"
+    if(HAS_FFMPEG)
-    )
+      if(WITH_SYSTEM_FFMPEG)
-    if (HAS_FFMPEG)
-      if (WITH_SYSTEM_FFMPEG)
         list(APPEND SM_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIR}")
       else()
         add_dependencies("${SM_EXE_NAME}" "ffmpeg")
-        list(APPEND SM_INCLUDE_DIRS
+        list(APPEND SM_INCLUDE_DIRS "${SM_FFMPEG_SRC_DIR}" "${SM_FFMPEG_ROOT}")
-          "${SM_FFMPEG_SRC_DIR}"
-          "${SM_FFMPEG_ROOT}"
-        )
       endif()
     endif()
-    if (HAS_GTK2)
+    if(HAS_GTK2)
       list(APPEND SM_INCLUDE_DIRS "${GTK2_INCLUDE_DIRS}")
     endif()
-    if (X11_FOUND)
+    if(X11_FOUND)
       list(APPEND SM_INCLUDE_DIRS "${X11_INCLUDE_DIR}")
     endif()
-    if (PCRE_FOUND)
+    if(PCRE_FOUND)
       list(APPEND SM_INCLUDE_DIRS "${PCRE_INCLUDE_DIR}")
     endif()
-    if (DL_FOUND)
+    if(DL_FOUND)
       list(APPEND SM_INCLUDE_DIRS "${DL_INCLUDE_DIR}")
     endif()
   endif()
 else()
   if(WITH_OGG)
-    list(APPEND SM_INCLUDE_DIRS
+    list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/newogg/include"
-      "${SM_EXTERN_DIR}/newogg/include"
+                "${SM_EXTERN_DIR}/newvorbis/include")
-      "${SM_EXTERN_DIR}/newvorbis/include"
-    )
   endif()
-  list(APPEND SM_INCLUDE_DIRS
+  list(APPEND SM_INCLUDE_DIRS "archutils/Unix")
-    "archutils/Unix"
-  )
   if(HAS_FFMPEG)
     add_dependencies("${SM_EXE_NAME}" "ffmpeg")
-    list(APPEND SM_INCLUDE_DIRS
+    list(APPEND SM_INCLUDE_DIRS "${SM_FFMPEG_SRC_DIR}" "${SM_FFMPEG_ROOT}")
-      "${SM_FFMPEG_SRC_DIR}"
-      "${SM_FFMPEG_ROOT}"
-    )
   endif()
 endif()
 
 if(WIN32)
-  list(APPEND SM_INCLUDE_DIRS
+  list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR})
-    ${DIRECTX_INCLUDE_DIR}
-  )
 else()
-  list(APPEND SM_INCLUDE_DIRS
+  list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include")
-    "${SM_EXTERN_DIR}/libpng/include"
-  )
 endif()
 
 target_include_directories("${SM_EXE_NAME}" PUBLIC ${SM_INCLUDE_DIRS})
@@ -641,44 +680,64 @@ if(NOT APPLE)
   if(WIN32)
     set(SM_FULL_INSTALLATION_PATH_LIST "${SM_INSTALL_DESTINATION}" "Program")
     sm_join("${SM_FULL_INSTALLATION_PATH_LIST}" "/" SM_FULL_INSTALLATION_PATH)
-    # Hardcoding the values for now since the foreach loop is not working as intended.
+    # Hardcoding the values for now since the foreach loop is not working as
+    # intended.
     install(TARGETS "${SM_EXE_NAME}" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
-    if (WITH_FULL_RELEASE OR WITH_TEXTURE_GENERATOR)
+    if(WITH_FULL_RELEASE OR WITH_TEXTURE_GENERATOR)
-      install(FILES "${SM_PROGRAM_DIR}/Texture Font Generator.exe" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+      install(FILES "${SM_PROGRAM_DIR}/Texture Font Generator.exe"
+              DESTINATION "${SM_FULL_INSTALLATION_PATH}")
     endif()
-    install(FILES "${SM_PROGRAM_DIR}/avcodec-55.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+    install(FILES "${SM_PROGRAM_DIR}/avcodec-55.dll"
-    install(FILES "${SM_PROGRAM_DIR}/avformat-55.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+            DESTINATION "${SM_FULL_INSTALLATION_PATH}")
-    install(FILES "${SM_PROGRAM_DIR}/avutil-52.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+    install(FILES "${SM_PROGRAM_DIR}/avformat-55.dll"
-    install(FILES "${SM_PROGRAM_DIR}/parallel_lights_io.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+            DESTINATION "${SM_FULL_INSTALLATION_PATH}")
-    install(FILES "${SM_PROGRAM_DIR}/swscale-2.dll" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+    install(FILES "${SM_PROGRAM_DIR}/avutil-52.dll"
-    install(FILES "${SM_PROGRAM_DIR}/StepMania.vdi" DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+            DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+    install(FILES "${SM_PROGRAM_DIR}/parallel_lights_io.dll"
+            DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+    install(FILES "${SM_PROGRAM_DIR}/swscale-2.dll"
+            DESTINATION "${SM_FULL_INSTALLATION_PATH}")
+    install(FILES "${SM_PROGRAM_DIR}/StepMania.vdi"
+            DESTINATION "${SM_FULL_INSTALLATION_PATH}")
 
-    # foreach(SM_WINDOW_DLL "${SM_WINDOWS_PROGRAM_DLLS}")
+    # foreach(SM_WINDOW_DLL "${SM_WINDOWS_PROGRAM_DLLS}") install(FILES
-    #   install(FILES "${SM_WINDOW_DLL}" DESTINATION "${SM_INSTALL_DESTINATION}")
+    # "${SM_WINDOW_DLL}" DESTINATION "${SM_INSTALL_DESTINATION}") endforeach()
-    # endforeach()
   else()
     install(TARGETS "${SM_EXE_NAME}" DESTINATION "${SM_INSTALL_DESTINATION}")
   endif()
-  if (UNIX OR LINUX)
+  if(UNIX OR LINUX)
-    install(FILES "${SM_ROOT_DIR}/GtkModule.so" LIBRARY DESTINATION "${SM_INSTALL_DESTINATION}" OPTIONAL)
+    install(FILES "${SM_ROOT_DIR}/GtkModule.so"
+            LIBRARY DESTINATION "${SM_INSTALL_DESTINATION}" OPTIONAL)
   endif()
-  install(DIRECTORY "${SM_ROOT_DIR}/Announcers" DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Announcers"
-  install(DIRECTORY "${SM_ROOT_DIR}/BGAnimations" DESTINATION "${SM_INSTALL_DESTINATION}")
+          DESTINATION "${SM_INSTALL_DESTINATION}")
-  install(DIRECTORY "${SM_ROOT_DIR}/Themes" DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/BGAnimations"
-  install(DIRECTORY "${SM_ROOT_DIR}/Characters" DESTINATION "${SM_INSTALL_DESTINATION}")
+          DESTINATION "${SM_INSTALL_DESTINATION}")
-  install(DIRECTORY "${SM_ROOT_DIR}/Scripts" DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Themes"
-  install(DIRECTORY "${SM_ROOT_DIR}/Courses" DESTINATION "${SM_INSTALL_DESTINATION}")
+          DESTINATION "${SM_INSTALL_DESTINATION}")
-  install(DIRECTORY "${SM_ROOT_DIR}/BackgroundEffects" DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Characters"
-  install(DIRECTORY "${SM_ROOT_DIR}/Data" DESTINATION "${SM_INSTALL_DESTINATION}")
+          DESTINATION "${SM_INSTALL_DESTINATION}")
-  install(DIRECTORY "${SM_ROOT_DIR}/BackgroundTransitions" DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Scripts"
-  install(DIRECTORY "${SM_ROOT_DIR}/Docs" DESTINATION "${SM_INSTALL_DESTINATION}")
+          DESTINATION "${SM_INSTALL_DESTINATION}")
-  install(DIRECTORY "${SM_ROOT_DIR}/NoteSkins" DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Courses"
-  if (NOT SM_INSTALL_DESTINATION)
+          DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/BackgroundEffects"
+          DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Data"
+          DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/BackgroundTransitions"
+          DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/Docs"
+          DESTINATION "${SM_INSTALL_DESTINATION}")
+  install(DIRECTORY "${SM_ROOT_DIR}/NoteSkins"
+          DESTINATION "${SM_INSTALL_DESTINATION}")
+  if(NOT SM_INSTALL_DESTINATION)
     install(DIRECTORY "${SM_ROOT_DIR}/Songs/StepMania 5" DESTINATION "Songs")
     install(FILES "${SM_ROOT_DIR}/Songs/instructions.txt" DESTINATION "Songs")
   else()
-    install(DIRECTORY "${SM_ROOT_DIR}/Songs/StepMania 5" DESTINATION "${SM_INSTALL_DESTINATION}/Songs")
+    install(DIRECTORY "${SM_ROOT_DIR}/Songs/StepMania 5"
-    install(FILES "${SM_ROOT_DIR}/Songs/instructions.txt" DESTINATION "${SM_INSTALL_DESTINATION}/Songs")
+            DESTINATION "${SM_INSTALL_DESTINATION}/Songs")
+    install(FILES "${SM_ROOT_DIR}/Songs/instructions.txt"
+            DESTINATION "${SM_INSTALL_DESTINATION}/Songs")
   endif()
 endif()
-

src/CMakeProject-irc.cmake

@@ -1,12 +1,10 @@
-if (NOT MSVC)
+if(NOT MSVC)
   return()
 endif()
 
 set(IRC_DIR "${SM_SRC_DIR}/irc")
 
-list(APPEND IRC_SRC
+list(APPEND IRC_SRC "${IRC_DIR}/appveyor.cpp")
-  "${IRC_DIR}/appveyor.cpp"
-)
 
 source_group("" FILES ${IRC_SRC})
 
@@ -16,18 +14,26 @@ set_property(TARGET "irc-reporter" PROPERTY FOLDER "Internal Libraries")
 
 disable_project_warnings("irc-reporter")
 
-set_target_properties("irc-reporter" PROPERTIES
+set_target_properties("irc-reporter"
-  RUNTIME_OUTPUT_DIRECTORY "${SM_PROGRAM_DIR}"
+                      PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-  RUNTIME_OUTPUT_DIRECTORY_RELEASE "${SM_PROGRAM_DIR}"
+                                 "${SM_PROGRAM_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY_DEBUG "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_RELEASE
-  RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${SM_PROGRAM_DIR}"
+                                 "${SM_PROGRAM_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_DEBUG
-)
+                                 "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
+                                 "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                                 "${SM_PROGRAM_DIR}")
 
-set_target_properties("irc-reporter" PROPERTIES
+set_target_properties("irc-reporter"
-  OUTPUT_NAME "irc-reporter"
+                      PROPERTIES OUTPUT_NAME
-  RELEASE_OUTPUT_NAME "irc-reporter"
+                                 "irc-reporter"
-  DEBUG_OUTPUT_NAME "irc-reporter"
+                                 RELEASE_OUTPUT_NAME
-  MINSIZEREL_OUTPUT_NAME "irc-reporter"
+                                 "irc-reporter"
-  RELWITHDEBINFO_OUTPUT_NAME "irc-reporter"
+                                 DEBUG_OUTPUT_NAME
-)
+                                 "irc-reporter"
+                                 MINSIZEREL_OUTPUT_NAME
+                                 "irc-reporter"
+                                 RELWITHDEBINFO_OUTPUT_NAME
+                                 "irc-reporter")

src/CMakeProject-mapconv.cmake

@@ -1,12 +1,10 @@
-if (NOT MSVC)
+if(NOT MSVC)
   return()
 endif()
 
 set(MAPCONV_DIR "${SM_SRC_DIR}/archutils/Win32")
 
-list(APPEND MAPCONV_SRC
+list(APPEND MAPCONV_SRC "${MAPCONV_DIR}/mapconv.cpp")
-  "${MAPCONV_DIR}/mapconv.cpp"
-)
 
 source_group("" FILES ${MAPCONV_SRC})
 
@@ -16,18 +14,26 @@ set_property(TARGET "mapconv" PROPERTY FOLDER "Internal Libraries")
 
 disable_project_warnings("mapconv")
 
-set_target_properties("mapconv" PROPERTIES
+set_target_properties("mapconv"
-  RUNTIME_OUTPUT_DIRECTORY "${SM_PROGRAM_DIR}"
+                      PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-  RUNTIME_OUTPUT_DIRECTORY_RELEASE "${SM_PROGRAM_DIR}"
+                                 "${SM_PROGRAM_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY_DEBUG "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_RELEASE
-  RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${SM_PROGRAM_DIR}"
+                                 "${SM_PROGRAM_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_DEBUG
-)
+                                 "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
+                                 "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                                 "${SM_PROGRAM_DIR}")
 
-set_target_properties("mapconv" PROPERTIES
+set_target_properties("mapconv"
-  OUTPUT_NAME "mapconv"
+                      PROPERTIES OUTPUT_NAME
-  RELEASE_OUTPUT_NAME "mapconv"
+                                 "mapconv"
-  DEBUG_OUTPUT_NAME "mapconv"
+                                 RELEASE_OUTPUT_NAME
-  MINSIZEREL_OUTPUT_NAME "mapconv"
+                                 "mapconv"
-  RELWITHDEBINFO_OUTPUT_NAME "mapconv"
+                                 DEBUG_OUTPUT_NAME
-)
+                                 "mapconv"
+                                 MINSIZEREL_OUTPUT_NAME
+                                 "mapconv"
+                                 RELWITHDEBINFO_OUTPUT_NAME
+                                 "mapconv")

src/CMakeProject-texture.cmake

@@ -1,4 +1,4 @@
-if (NOT MSVC)
+if(NOT MSVC)
   return()
 endif()
 
@@ -9,8 +9,7 @@ list(APPEND TEXTURE_SRC
             "${TEXTURE_DIR}/Texture Font Generator.cpp"
             "${TEXTURE_DIR}/Texture Font GeneratorDlg.cpp"
             "${TEXTURE_DIR}/TextureFont.cpp"
-  "${TEXTURE_DIR}/Utils.cpp"
+            "${TEXTURE_DIR}/Utils.cpp")
-)
 
 list(APPEND TEXTURE_HPP
             "${TEXTURE_DIR}/Resource.h"
@@ -18,32 +17,31 @@ list(APPEND TEXTURE_HPP
             "${TEXTURE_DIR}/Texture Font Generator.h"
             "${TEXTURE_DIR}/Texture Font GeneratorDlg.h"
             "${TEXTURE_DIR}/TextureFont.h"
-  "${TEXTURE_DIR}/Utils.h"
+            "${TEXTURE_DIR}/Utils.h")
-)
 
 list(APPEND TEXTURE_DAT
             "${TEXTURE_DIR}/res/Texture Font Generator.ico"
             "${TEXTURE_DIR}/Texture Font Generator.rc"
-  "${TEXTURE_DIR}/res/Texture Font Generator.rc2"
+            "${TEXTURE_DIR}/res/Texture Font Generator.rc2")
-)
 
 source_group("Source Files" FILES ${TEXTURE_SRC} ${TEXTURE_HPP})
 source_group("Resource Files" FILES ${TEXTURE_DAT})
 set(CMAKE_MFC_FLAG 2)
-add_executable("TextureFontGenerator" WIN32 ${TEXTURE_SRC} ${TEXTURE_HPP} ${TEXTURE_DAT}) 
+add_executable("TextureFontGenerator"
+               WIN32
+               ${TEXTURE_SRC}
+               ${TEXTURE_HPP}
+               ${TEXTURE_DAT})
 unset(CMAKE_MFC_FLAG)
 set_property(TARGET "TextureFontGenerator" PROPERTY FOLDER "Internal Libraries")
 
 disable_project_warnings("TextureFontGenerator")
 
-if (NOT WITH_STATIC_LINKING)
+if(NOT WITH_STATIC_LINKING)
   sm_add_compile_definition("TextureFontGenerator" _AFXDLL)
 endif()
 
-list(APPEND TEXTURE_LINK_LIB
+list(APPEND TEXTURE_LINK_LIB "zlib" "png")
-  "zlib"
-  "png"
-)
 
 target_link_libraries("TextureFontGenerator" ${TEXTURE_LINK_LIB})
 
@@ -51,23 +49,31 @@ list(APPEND TEXTURE_INCLUDE_DIRS
             "${TEXTURE_DIR}"
             "${TEXTURE_DIR}/res"
             "${SM_EXTERN_DIR}/zlib"
-  "${SM_EXTERN_DIR}/libpng/include"
+            "${SM_EXTERN_DIR}/libpng/include")
-)
 
-target_include_directories("TextureFontGenerator" PUBLIC ${TEXTURE_INCLUDE_DIRS})
+target_include_directories("TextureFontGenerator"
+                           PUBLIC ${TEXTURE_INCLUDE_DIRS})
 
-set_target_properties("TextureFontGenerator" PROPERTIES
+set_target_properties("TextureFontGenerator"
-  RUNTIME_OUTPUT_DIRECTORY "${SM_PROGRAM_DIR}"
+                      PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-  RUNTIME_OUTPUT_DIRECTORY_RELEASE "${SM_PROGRAM_DIR}"
+                                 "${SM_PROGRAM_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY_DEBUG "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_RELEASE
-  RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${SM_PROGRAM_DIR}"
+                                 "${SM_PROGRAM_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_DEBUG
-)
+                                 "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
+                                 "${SM_PROGRAM_DIR}"
+                                 RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
+                                 "${SM_PROGRAM_DIR}")
 
-set_target_properties("TextureFontGenerator" PROPERTIES
+set_target_properties("TextureFontGenerator"
-  OUTPUT_NAME "Texture Font Generator"
+                      PROPERTIES OUTPUT_NAME
-  RELEASE_OUTPUT_NAME "Texture Font Generator"
+                                 "Texture Font Generator"
-  DEBUG_OUTPUT_NAME "Texture Font Generator"
+                                 RELEASE_OUTPUT_NAME
-  MINSIZEREL_OUTPUT_NAME "Texture Font Generator"
+                                 "Texture Font Generator"
-  RELWITHDEBINFO_OUTPUT_NAME "Texture Font Generator"
+                                 DEBUG_OUTPUT_NAME
-)
+                                 "Texture Font Generator"
+                                 MINSIZEREL_OUTPUT_NAME
+                                 "Texture Font Generator"
+                                 RELWITHDEBINFO_OUTPUT_NAME
+                                 "Texture Font Generator")

src/CryptManager.cpp

@@ -80,7 +80,7 @@ static const int KEY_LENGTH = 1024;
  */
 
 static PRNGWrapper *g_pPRNG = NULL;
-
+ltc_math_descriptor ltc_mp = ltm_desc;
 
 CryptManager::CryptManager()
 {
@@ -93,8 +93,6 @@ CryptManager::CryptManager()
 		LUA->Release( L );
 	}
 
-	ltc_mp = ltm_desc;
-
 	g_pPRNG = new PRNGWrapper( &yarrow_desc );
 }
 

src/NoteData.h

@@ -382,7 +382,8 @@ public:
 /** @brief Allow a quick way to swap notedata. */
 namespace std
 {
-	template<> inline void swap<NoteData>( NoteData &nd1, NoteData &nd2 ) { nd1.swap( nd2 ); }
+	template<> inline void swap<NoteData>( NoteData &nd1, NoteData &nd2 ) noexcept(is_nothrow_move_constructible<NoteData>::value &&
+      is_nothrow_move_assignable<NoteData>::value) { nd1.swap( nd2 ); }
 }
 
 #endif

src/RageDisplay_OGL.h

@@ -3,6 +3,10 @@
 #ifndef RAGE_DISPLAY_OGL_H
 #define RAGE_DISPLAY_OGL_H
 
+#ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION 1
+#endif
+
 #include "RageDisplay.h"
 #include "RageTextureRenderTarget.h"
 #include "Sprite.h"

src/RageSurface_Save_JPEG.cpp

@@ -16,6 +16,12 @@ namespace jpeg
 	}
 }
 
+// Only Xcode wants this. FIXME
+#if defined(PBBUILD) && defined(SYSTEM_JPEGLIB)
+#define TRUE jpeg::TRUE
+#define FALSE jpeg::FALSE
+#endif
+
 #define OUTPUT_BUFFER_SIZE	4096
 typedef struct
 {

src/RageUtil.h

@@ -6,6 +6,7 @@
 #include <map>
 #include <vector>
 #include <sstream>
+#include "global.h"
 class RageFileDriver;
 
 /** @brief Safely delete pointers. */

src/arch/InputHandler/InputHandler_MacOSX_HID.cpp

@@ -452,6 +452,7 @@ wchar_t InputHandler_MacOSX_HID::DeviceButtonToChar( DeviceButton button, bool b
 	{
 		CGEventRef event = CGEventCreate(NULL);
 		CGEventFlags mods = CGEventGetFlags(event);
+        CFRelease(event);
 		UInt32 nModifiers = bUseCurrentKeyModifiers ? (UInt32)mods : 0;
 		wchar_t sCharCode = KeyCodeToChar( iMacVirtualKey, nModifiers );
 		if( sCharCode != 0 )

src/arch/LoadingWindow/LoadingWindow.h

@@ -2,6 +2,7 @@
 #define LOADING_WINDOW_H
 
 #include <string>
+#include "global.h"
 
 struct RageSurface;
 /** @brief Opens and displays the loading banner. */

src/arch/LoadingWindow/LoadingWindow_MacOSX.h

@@ -2,6 +2,7 @@
 #define LOADING_WINDOW_MACOSX_H
 
 #include "LoadingWindow.h"
+#include "global.h"
 /** @brief Loading window for Mac OS X. */
 class LoadingWindow_MacOSX : public LoadingWindow
 {

src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm

@@ -517,6 +517,9 @@ static size_t GetDisplayBitsPerPixel( CGDirectDisplayID displayId )
 	else if(CFStringCompare(pixEnc, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
 		depth = 8;
 
+    CFRelease(pixEnc);
+    CGDisplayModeRelease(mode);
+	
 	return depth;
 
 }

src/arch/MovieTexture/MovieTexture_FFMpeg.cpp

@@ -140,6 +140,12 @@ MovieDecoder_FFMpeg::~MovieDecoder_FFMpeg()
     {
         avcodec::av_free(m_buffer);
     }
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	if ( m_pStreamCodec != NULL)
+	{
+		avcodec::avcodec_free_context(&m_pStreamCodec);
+	}
+#endif
 }
 
 void MovieDecoder_FFMpeg::Init()
@@ -265,16 +271,23 @@ int MovieDecoder_FFMpeg::DecodePacket( float fTargetTime )
 		bool bSkipThisFrame =
 			fTargetTime != -1 &&
 			GetTimestamp() + GetFrameDuration() < fTargetTime &&
-			(m_pStream->codec->frame_number % 2) == 0;
+			(m_pStreamCodec->frame_number % 2) == 0;
 
 		int iGotFrame;
+		int len;
 		/* Hack: we need to send size = 0 to flush frames at the end, but we have
 		 * to give it a buffer to read from since it tries to read anyway. */
 		m_Packet.data = m_Packet.size ? m_Packet.data : NULL;
-		int len = avcodec::avcodec_decode_video2(
+#if LIBAVCODEC_VERSION_MAJOR < 58
-				m_pStream->codec, 
+		len = avcodec::avcodec_decode_video2(
+				m_pStreamCodec,
 				m_Frame, &iGotFrame,
 				&m_Packet );
+#else
+		len = m_Packet.size;
+		avcodec::avcodec_send_packet(m_pStreamCodec, &m_Packet);
+		iGotFrame = !avcodec::avcodec_receive_frame(m_pStreamCodec, m_Frame);
+#endif
 
 		if( len < 0 )
 		{
@@ -333,9 +346,15 @@ int MovieDecoder_FFMpeg::DecodePacket( float fTargetTime )
 
 void MovieDecoder_FFMpeg::GetFrame( RageSurface *pSurface )
 {
+#if LIBAVCODEC_VERSION_MAJOR < 58
 	avcodec::AVPicture pict;
 	pict.data[0] = (unsigned char *) pSurface->pixels;
 	pict.linesize[0] = pSurface->pitch;
+#else
+	avcodec::AVFrame pict;
+	pict.data[0] = (unsigned char *) pSurface->pixels;
+	pict.linesize[0] = pSurface->pitch;
+#endif
 
 	/* XXX 1: Do this in one of the Open() methods instead?
 	 * XXX 2: The problem of doing this in Open() is that m_AVTexfmt is not
@@ -344,12 +363,12 @@ void MovieDecoder_FFMpeg::GetFrame( RageSurface *pSurface )
 	if( m_swsctx == NULL )
 	{
 		m_swsctx = avcodec::sws_getCachedContext( m_swsctx,
-				GetWidth(), GetHeight(), m_pStream->codec->pix_fmt,
+				GetWidth(), GetHeight(), m_pStreamCodec->pix_fmt,
 				GetWidth(), GetHeight(), m_AVTexfmt,
 				sws_flags, NULL, NULL, NULL );
 		if( m_swsctx == NULL )
 		{
-			LOG->Warn("Cannot initialize sws conversion context for (%d,%d) %d->%d", GetWidth(), GetHeight(), m_pStream->codec->pix_fmt, m_AVTexfmt);
+			LOG->Warn("Cannot initialize sws conversion context for (%d,%d) %d->%d", GetWidth(), GetHeight(), m_pStreamCodec->pix_fmt, m_AVTexfmt);
 			return;
 		}
 	}
@@ -384,8 +403,10 @@ void MovieTexture_FFMpeg::RegisterProtocols()
 		return;
 	Done = true;
 
+#if !FF_API_NEXT
 	avcodec::avcodec_register_all();
 	avcodec::av_register_all();
+#endif
 }
 
 static int AVIORageFile_ReadPacket( void *opaque, uint8_t *buf, int buf_size )
@@ -444,16 +465,23 @@ RString MovieDecoder_FFMpeg::Open( RString sFile )
 		m_fctx->streams[stream_idx] == NULL )
 		return "Couldn't find any video streams";
 	m_pStream = m_fctx->streams[stream_idx];
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	m_pStreamCodec = avcodec::avcodec_alloc_context3(NULL);
+	if (avcodec::avcodec_parameters_to_context(m_pStreamCodec, m_pStream->codecpar) < 0)
+		return ssprintf("Could not get context from parameters");
+#else
+	m_pStreamCodec = m_pStream->codec;
+#endif
 
-	if( m_pStream->codec->codec_id == avcodec::CODEC_ID_NONE )
+	if( m_pStreamCodec->codec_id == avcodec::CODEC_ID_NONE )
-		return ssprintf( "Unsupported codec %08x", m_pStream->codec->codec_tag );
+		return ssprintf( "Unsupported codec %08x", m_pStreamCodec->codec_tag );
 
 	RString sError = OpenCodec();
 	if( !sError.empty() )
 		return ssprintf( "AVCodec (%s): %s", sFile.c_str(), sError.c_str() );
 
-	LOG->Trace( "Bitrate: %i", m_pStream->codec->bit_rate );
+	LOG->Trace( "Bitrate: %i", static_cast<int>(m_pStreamCodec->bit_rate) );
-	LOG->Trace( "Codec pixel format: %s", avcodec::av_get_pix_fmt_name(m_pStream->codec->pix_fmt) );
+	LOG->Trace( "Codec pixel format: %s", avcodec::av_get_pix_fmt_name(m_pStreamCodec->pix_fmt) );
 
 	return RString();
 }
@@ -463,35 +491,37 @@ RString MovieDecoder_FFMpeg::OpenCodec()
 	Init();
 
 	ASSERT( m_pStream != NULL );
-	if( m_pStream->codec->codec )
+	if( m_pStreamCodec->codec )
-		avcodec::avcodec_close( m_pStream->codec );
+		avcodec::avcodec_close( m_pStreamCodec );
 
-	avcodec::AVCodec *pCodec = avcodec::avcodec_find_decoder( m_pStream->codec->codec_id );
+	avcodec::AVCodec *pCodec = avcodec::avcodec_find_decoder( m_pStreamCodec->codec_id );
 	if( pCodec == NULL )
-		return ssprintf( "Couldn't find decoder %i", m_pStream->codec->codec_id );
+		return ssprintf( "Couldn't find decoder %i", m_pStreamCodec->codec_id );
 
-	m_pStream->codec->workaround_bugs   = 1;
+	m_pStreamCodec->workaround_bugs   = 1;
-	m_pStream->codec->idct_algo         = FF_IDCT_AUTO;
+	m_pStreamCodec->idct_algo         = FF_IDCT_AUTO;
-	m_pStream->codec->error_concealment = 3;
+	m_pStreamCodec->error_concealment = 3;
 
+#if LIBAVCODEC_VERSION_MAJOR < 58
 	if( pCodec->capabilities & CODEC_CAP_DR1 )
-		m_pStream->codec->flags |= CODEC_FLAG_EMU_EDGE;
+		m_pStreamCodec->flags |= CODEC_FLAG_EMU_EDGE;
+#endif
 
 	LOG->Trace("Opening codec %s", pCodec->name );
 
-	int ret = avcodec::avcodec_open2( m_pStream->codec, pCodec, NULL );
+	int ret = avcodec::avcodec_open2( m_pStreamCodec, pCodec, NULL );
 	if( ret < 0 )
 		return RString( averr_ssprintf(ret, "Couldn't open codec \"%s\"", pCodec->name) );
-	ASSERT( m_pStream->codec->codec != NULL );
+	ASSERT( m_pStreamCodec->codec != NULL );
 
 	return RString();
 }
 
 void MovieDecoder_FFMpeg::Close()
 {
-	if( m_pStream && m_pStream->codec->codec )
+	if( m_pStream && m_pStreamCodec->codec )
 	{
-		avcodec::avcodec_close( m_pStream->codec );
+		avcodec::avcodec_close( m_pStreamCodec );
 		m_pStream = NULL;
 	}
 

src/arch/MovieTexture/MovieTexture_FFMpeg.h

@@ -13,6 +13,21 @@ namespace avcodec
 		#include <libavformat/avformat.h>
 		#include <libswscale/swscale.h>
 		#include <libavutil/pixdesc.h>
+
+		#if LIBAVCODEC_VERSION_MAJOR >= 58
+		#define av_free_packet av_packet_unref
+		#define PixelFormat AVPixelFormat
+		#define PIX_FMT_YUYV422 AV_PIX_FMT_YUYV422
+		#define PIX_FMT_BGRA    AV_PIX_FMT_BGRA
+		#define PIX_FMT_ARGB	AV_PIX_FMT_ARGB
+		#define PIX_FMT_ABGR	AV_PIX_FMT_ABGR
+		#define PIX_FMT_RGBA	AV_PIX_FMT_RGBA
+		#define PIX_FMT_RGB24	AV_PIX_FMT_RGB24
+		#define PIX_FMT_BGR24	AV_PIX_FMT_BGR24
+		#define PIX_FMT_RGB555	AV_PIX_FMT_RGB555
+		#define PIX_FMT_NB		AV_PIX_FMT_NB
+		#define CODEC_ID_NONE   AV_CODEC_ID_NONE
+		#endif
 	}
 };
 
@@ -48,8 +63,8 @@ public:
 	void GetFrame( RageSurface *pOut );
 	int DecodeFrame( float fTargetTime );
 
-	int GetWidth() const { return m_pStream->codec->width; }
+	int GetWidth() const { return m_pStreamCodec->width; }
-	int GetHeight() const { return m_pStream->codec->height; }
+	int GetHeight() const { return m_pStreamCodec->height; }
 
 	RageSurface *CreateCompatibleSurface( int iTextureWidth, int iTextureHeight, bool bPreferHighColor, MovieDecoderPixelFormatYCbCr &fmtout );
 
@@ -66,6 +81,7 @@ private:
 	avcodec::AVFrame *m_Frame;
 	avcodec::PixelFormat m_AVTexfmt; /* PixelFormat of output surface */
 	avcodec::SwsContext *m_swsctx;
+	avcodec::AVCodecContext *m_pStreamCodec;
 
 	avcodec::AVFormatContext *m_fctx;
 	float m_fTimestamp;

src/arch/Threads/Threads_Pthreads.cpp

@@ -1,6 +1,8 @@
 #include "global.h"
 #include "Threads_Pthreads.h"
+#include "RageLog.h"
 #include "RageTimer.h"
+#include "RageThreads.h"
 #include "RageUtil.h"
 #include <sys/time.h>
 #include <errno.h>
@@ -17,6 +19,7 @@
 
 void ThreadImpl_Pthreads::Halt( bool Kill )
 {
+	(void)Kill;
 	/* Linux:
 	 * Send a SIGSTOP to the thread. If we send a SIGKILL, pthreads will
 	 * "helpfully" propagate it to the other threads, and we'll get killed, too.
@@ -105,7 +108,7 @@ ThreadImpl *MakeThread( int (*pFunc)(void *pData), void *pData, uint64_t *piThre
 		} else {
 			// Abbreviate the name by taking the first 6, last 7
 			// characters and adding '..' in the middle.
-			LOG->Trace( "Truncated thread name due to size limit of %d: %s",
+			LOG->Trace( "Truncated thread name due to size limit of %zu: %s",
 				maxNameLen, rawname );
 			snprintf( thread->name, maxNameLen, "%.6s..%s",
 				rawname, &rawname[strlen(rawname) - 7] );

src/arch/Threads/Threads_Pthreads.h

@@ -10,6 +10,7 @@ class ThreadImpl_Pthreads: public ThreadImpl
 {
 public:
 	pthread_t thread;
+	mutable char name[16];
 
 	/* Linux:
 	 * Keep a list of child PIDs, so we can send them SIGKILL. This has

src/archutils/Darwin/DarwinThreadHelpers.cpp

@@ -3,7 +3,7 @@
 #include <mach/mach_init.h>
 #include <mach/mach_error.h>
 #include "global.h"
-#include "Backtrace.hpp"
+#include "Backtrace.h"
 
 bool SuspendThread( uint64_t threadHandle )
 {

src/archutils/Darwin/SMMain.mm

@@ -56,7 +56,7 @@
 
 - (id) initWithArgc:(int)argc argv:(char **)argv
 {
-	[super init];
+	self = [super init];
 	if( argc == 2 && !strncmp(argv[1], "-psn_", 5) )
 		argc = 1;
 	m_iArgc = argc;

src/archutils/Darwin/arch_setup.h

@@ -17,7 +17,9 @@ extern "C" int sm_main( int argc, char *argv[] );
 #define NO_GL_FLUSH
 
 #define CPU_X86
+#ifndef BACKTRACE_METHOD_X86_DARWIN
 #define BACKTRACE_METHOD_X86_DARWIN
+#endif
 #define BACKTRACE_LOOKUP_METHOD_DLADDR
 
 #ifndef MACOSX

src/archutils/Unix/Backtrace.cpp

@@ -441,7 +441,7 @@ static bool GetRegionInfo( mach_port_t self, const void *address, vm_address_t &
 	mach_port_t unused;
 	vm_size_t size = 0;
 	vm_address_t start = vm_address_t( address );
-	kern_return_t ret = vm_region( self, &start, &size, VM_REGION_BASIC_INFO_64,
+	kern_return_t ret = vm_region_64( self, &start, &size, VM_REGION_BASIC_INFO_64,
 				       (vm_region_info_t)&info, &infoCnt, &unused );
 	
 	if( ret != KERN_SUCCESS ||

src/archutils/Unix/Backtrace.h

@@ -9,7 +9,7 @@ struct Frame;
 /* This contains the information necessary to backtrace a thread. */
 struct BacktraceContext
 {
-#if defined(CPU_X86) || defined(CPU_X86_64)
+#if defined(CPU_X86) || defined(CPU_X86_64) || defined(__APPLE__)
 	const void *ip, *bp, *sp;
 #endif
 

src/libtomcrypt/src/headers/tomcrypt_macros.h

@@ -262,21 +262,23 @@ static inline __attribute__((always_inline)) unsigned ROR(unsigned word, int i)
 
 #ifndef LTC_NO_ROLC
 
-static inline __attribute__((always_inline)) unsigned ROLc(unsigned word, const int i)
+#define ROLc(word,i) ({ \
-{
+   ulong32 __ROLc_tmp = word; \
-   asm ("roll %2,%0"
+   __asm__ ("roll %2, %0" : \
-      :"=r" (word)
+            "=r" (__ROLc_tmp) : \
-      :"0" (word),"I" (i));
+            "0" (__ROLc_tmp), \
-   return word;
+            "I" (i)); \
-}
+            __ROLc_tmp; \
+   })
+#define RORc(word,i) ({ \
+   ulong32 __RORc_tmp = word; \
+   __asm__ ("rorl %2, %0" : \
+            "=r" (__RORc_tmp) : \
+            "0" (__RORc_tmp), \
+            "I" (i)); \
+            __RORc_tmp; \
+   })
 
-static inline __attribute__((always_inline)) unsigned RORc(unsigned word, const int i)
-{
-   asm ("rorl %2,%0"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
-}
 
 #else
 
@@ -361,21 +363,22 @@ static inline __attribute__((always_inline)) unsigned long ROR64(unsigned long w
 
 #ifndef LTC_NO_ROLC
 
-static inline __attribute__((always_inline)) unsigned long ROL64c(unsigned long word, const int i)
+#define ROL64c(word,i) ({ \
-{
+   ulong64 __ROL64c_tmp = word; \
-   asm("rolq %2,%0"
+   __asm__ ("rolq %2, %0" : \
-      :"=r" (word)
+            "=r" (__ROL64c_tmp) : \
-      :"0" (word),"J" (i));
+            "0" (__ROL64c_tmp), \
-   return word;
+            "J" (i)); \
-}
+            __ROL64c_tmp; \
-
+   })
-static inline __attribute__((always_inline)) unsigned long ROR64c(unsigned long word, const int i)
+#define ROR64c(word,i) ({ \
-{
+   ulong64 __ROR64c_tmp = word; \
-   asm("rorq %2,%0"
+   __asm__ ("rorq %2, %0" : \
-      :"=r" (word)
+            "=r" (__ROR64c_tmp) : \
-      :"0" (word),"J" (i));
+            "0" (__ROR64c_tmp), \
-   return word;
+            "J" (i)); \
-}
+            __ROR64c_tmp; \
+   })
 
 #else /* LTC_NO_ROLC */