Fix cmake and lower version to 2.6.2

Author: electricbrass

cmake/modules/OdamexCopyLibs.cmake

@@ -14,14 +14,10 @@ function(odamex_copy_libs TARGET)
     list(APPEND ODAMEX_DLLS "${SDL2_DLL_DIR}/SDL2.dll")
 
     # SDL2_mixer
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libFLAC-8.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libmodplug-1.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libmpg123-0.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libogg-0.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libopus-0.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libopusfile-0.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libvorbis-0.dll")
-    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/libvorbisfile-3.dll")
+    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/optional/libmodplug-1.dll")
+    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/optional/libogg-0.dll")
+    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/optional/libopus-0.dll")
+    list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/optional/libopusfile-0.dll")
     list(APPEND ODAMEX_DLLS "${SDL2_MIXER_DLL_DIR}/SDL2_mixer.dll")
   endif()
 

libraries/SDL-lib.cmake

@@ -85,14 +85,14 @@ if(BUILD_CLIENT)
     if(WIN32)
       if(MSVC)
         file(DOWNLOAD
-          "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.6.3-VC.zip"
+          "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.6.2-VC.zip"
           "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-VC.zip"
           EXPECTED_HASH SHA256=5d711b50e83a26e7a3cd221a0ba44828fdbe8d001869b64c3da6c8e73729bca4)
         execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xf
           "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-VC.zip"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
-        set(SDL2_MIXER_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-2.6.3")
+        set(SDL2_MIXER_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-2.6.2")
         set(SDL2_MIXER_INCLUDE_DIR "${SDL2_MIXER_DIR}/include" CACHE PATH "")
         if(CMAKE_SIZEOF_VOID_P EQUAL 8)
           set(SDL2_MIXER_LIBRARY "${SDL2_MIXER_DIR}/lib/x64/SDL2_mixer.lib" CACHE FILEPATH "")
@@ -101,17 +101,17 @@ if(BUILD_CLIENT)
         endif()
       else()
         file(DOWNLOAD
-          "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.6.3-mingw.tar.gz"
+          "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.6.2-mingw.tar.gz"
           "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-mingw.tar.gz"
-          EXPECTED_HASH SHA256=b827158b2ea820fd9ebd53c58b033aa48b2a11ca4679599399cc0f0f72f7f859)
+          EXPECTED_HASH SHA256=6c414d05a3b867e0d59e0f9b28ea7e5e64527e612ccf961735dc2478391315b3)
         execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xf
           "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-mingw.tar.gz"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
         if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-          set(SDL2_MIXER_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-2.6.3/x86_64-w64-mingw32")
+          set(SDL2_MIXER_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-2.6.2/x86_64-w64-mingw32")
         else()
-          set(SDL2_MIXER_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-2.6.3/i686-w64-mingw32")
+          set(SDL2_MIXER_DIR "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-2.6.2/i686-w64-mingw32")
         endif()
         set(SDL2_MIXER_INCLUDE_DIR "${SDL2_MIXER_DIR}/include/SDL2" CACHE PATH "")
         set(SDL2_MIXER_LIBRARY "${SDL2_MIXER_DIR}/lib/libSDL2_mixer.dll.a" CACHE FILEPATH "")