Merge remote-tracking branch 'upstream/SDL2' into MorphOS

BeWorld2018 · Oct 3, 2023 · 514f589 · 514f589
2 parents bf29d46 + b19288c
commit 514f589
Show file tree

Hide file tree

Showing 35 changed files with 1,198 additions and 793 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,15 +25,16 @@
 [submodule "external/mpg123"]
 	path = external/mpg123
 	url = https://github.com/libsdl-org/mpg123.git
-	branch = v1.29.3-SDL
+	branch = v1.31.3-SDL
 [submodule "libxmp"]
 	path = external/libxmp
 	url = https://github.com/libsdl-org/libxmp.git
-	branch = 4.6.0-SDL
+	branch = 4.6.x-SDL
 [submodule "external/wavpack"]
 	path = external/wavpack
 	url = https://github.com/libsdl-org/wavpack.git
 	branch = 5.6.0-sdl
 [submodule "external/libgme"]
 	path = external/libgme
 	url = https://github.com/libsdl-org/game-music-emu.git
+	branch = v0.6.3-SDL
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,10 @@ if(ANDROID)
     set(SDL2MIXER_SAMPLES_DEFAULT OFF)
 endif()
 
+# option() honors normal variables.
+cmake_policy(SET CMP0077 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+
 if(POLICY CMP0112)
     # Target file component generator expressions do not add target dependencies.
     cmake_policy(SET CMP0112 NEW)
@@ -99,7 +103,7 @@ option(SDL2MIXER_CMD "Support an external music player" ${sdl2mixer_cmd_default}
 
 option(SDL2MIXER_FLAC "Enable FLAC music" ON)
 
-cmake_dependent_option(SDL2MIXER_FLAC_LIBFLAC "Enable FLAC music using libFLAC" ON SDL2MIXER_FLAC OFF)
+cmake_dependent_option(SDL2MIXER_FLAC_LIBFLAC "Enable FLAC music using libFLAC" OFF SDL2MIXER_FLAC OFF)
 cmake_dependent_option(SDL2MIXER_FLAC_LIBFLAC_SHARED "Dynamically load LIBFLAC" "${SDL2MIXER_DEPS_SHARED}" SDL2MIXER_FLAC_LIBFLAC OFF)
 
 cmake_dependent_option(SDL2MIXER_FLAC_DRFLAC "Enable FLAC music using drflac" ON SDL2MIXER_FLAC OFF)
@@ -356,8 +360,8 @@ if(SDL2MIXER_OGG)
     if(SDL2MIXER_VENDORED)
         message(STATUS "Using vendored libogg")
         set(BUILD_SHARED_LIBS ${SDL2MIXER_OGG_SHARED})
-        set(INSTALL_CMAKE_PACKAGE_MODULE FALSE CACHE BOOL "Don't install cmake module for libogg")
-        set(BUILD_TESTING OFF CACHE BOOL "Build tests")
+        set(INSTALL_CMAKE_PACKAGE_MODULE FALSE)
+        set(BUILD_TESTING OFF)
         sdl_check_project_in_subfolder(external/ogg ogg SDL2MIXER_VENDORED)
         add_subdirectory(external/ogg EXCLUDE_FROM_ALL)
         if(SDL2MIXER_OGG_install)
@@ -375,13 +379,13 @@ if(SDL2MIXER_OPUS)
         endif()
         message(STATUS "Using vendored opus")
         set(BUILD_SHARED_LIBS ${SDL2MIXER_OPUS_SHARED})
-        set(BUILD_PROGRAMS OFF CACHE BOOL "Build programs")
+        set(BUILD_PROGRAMS OFF)
         sdl_check_project_in_subfolder(external/opus opus SDL2MIXER_VENDORED)
         add_subdirectory(external/opus EXCLUDE_FROM_ALL)
 
-        set(OP_DISABLE_DOCS TRUE CACHE BOOL "Disable opusfile documentation")
-        set(OP_DISABLE_EXAMPLES TRUE CACHE BOOL "Disable opusfile examples")
-        set(OP_DISABLE_HTTP TRUE CACHE BOOL "Disable opusfile HTTP SUPPORT")
+        set(OP_DISABLE_DOCS TRUE)
+        set(OP_DISABLE_EXAMPLES TRUE)
+        set(OP_DISABLE_HTTP TRUE)
         message(STATUS "Using vendored opusfile")
         set(BUILD_SHARED_LIBS ${SDL2MIXER_OPUS_SHARED})
         sdl_check_project_in_subfolder(external/opusfile opusfile SDL2MIXER_VENDORED)
@@ -539,13 +543,13 @@ if(SDL2MIXER_FLAC_LIBFLAC)
             message(FATAL_ERROR "ogg target not present")
         endif()
         set(BUILD_SHARED_LIBS "${SDL2MIXER_FLAC_LIBFLAC_SHARED}")
-        set(INSTALL_CMAKE_CONFIG_MODULE OFF CACHE BOOL "Disable libflac installation")
-        set(WITH_OGG OFF CACHE BOOL "Disable finding ogg using `find_package` (we have vendored it)")
-        set(BUILD_CXXLIBS OFF CACHE BOOL "Build FLAC++")
-        set(BUILD_EXAMPLES OFF CACHE BOOL "Build FLAC examples")
-        set(BUILD_PROGRAMS OFF CACHE BOOL "Build programs")
-        set(BUILD_TESTING OFF CACHE BOOL "Build tests")
-        set(INSTALL_MANPAGES OFF CACHE BOOL "Install FLAC manpages")
+        set(INSTALL_CMAKE_CONFIG_MODULE OFF)
+        set(WITH_OGG OFF)
+        set(BUILD_CXXLIBS OFF)
+        set(BUILD_EXAMPLES OFF)
+        set(BUILD_PROGRAMS OFF)
+        set(BUILD_TESTING OFF)
+        set(INSTALL_MANPAGES OFF)
         message(STATUS "Using vendored libflac")
         sdl_check_project_in_subfolder(external/flac libflac SDL2MIXER_VENDORED)
         add_subdirectory(external/flac EXCLUDE_FROM_ALL)
@@ -587,9 +591,9 @@ if(SDL2MIXER_GME)
     target_compile_definitions(SDL2_mixer PRIVATE MUSIC_GME)
     if(SDL2MIXER_VENDORED)
         set(BUILD_SHARED_LIBS "${SDL2MIXER_GME_SHARED}")
-        set(ENABLE_UBSAN OFF CACHE BOOL "UB sanitizer")
-        set(BUILD_FRAMEWORK OFF CACHE BOOL "macos framework")
-        set(GME_ZLIB OFF CACHE BOOL "GME supports compressed formats")
+        set(ENABLE_UBSAN OFF)
+        set(BUILD_FRAMEWORK OFF)
+        set(GME_ZLIB OFF)
         message(STATUS "Using vendored libgme")
         sdl_check_project_in_subfolder(external/libgme libgme SDL2MIXER_VENDORED)
         add_subdirectory(external/libgme EXCLUDE_FROM_ALL)
@@ -658,6 +662,8 @@ if(SDL2MIXER_MOD_XMP)
     if(SDL2MIXER_VENDORED)
         message(STATUS "Using vendored libxmp")
         sdl_check_project_in_subfolder(external/libxmp libxmp SDL2MIXER_VENDORED)
+        set(LIBXMP_DISABLE_DEPACKERS ON)
+        set(LIBXMP_DISABLE_PROWIZARD ON)
         if(SDL2MIXER_MOD_XMP_SHARED)
             set(BUILD_STATIC OFF)
             set(BUILD_SHARED ON)
@@ -687,7 +693,13 @@ if(SDL2MIXER_MOD_XMP)
         else()
             message(STATUS "Using system libxmp")
             find_package(libxmp REQUIRED)
-            set(tgt_xmp libxmp::libxmp)
+            if(TARGET libxmp::xmp_shared AND SDL2MIXER_MOD_XMP_SHARED)
+                set(tgt_xmp libxmp::xmp_shared)
+            elseif(TARGET libxmp::xmp_static)
+                set(tgt_xmp libxmp::xmp_static)
+            else()
+                set(tgt_xmp libxmp::libxmp)
+            endif()
             set(xmp_name libxmp)
             if(NOT SDL2MIXER_MOD_XMP_SHARED)
                 list(APPEND PC_REQUIRES libxmp)
@@ -720,8 +732,8 @@ if(SDL2MIXER_MP3_MPG123)
     if(SDL2MIXER_VENDORED)
         message(STATUS "Using vendored mpg123")
         sdl_check_project_in_subfolder(external/mpg123/ports/cmake mpg123 SDL2MIXER_VENDORED)
-        set(BUILD_LIBOUT123 FALSE CACHE BOOL "Don't configure libout123")
-        set(BUILD_PROGRAMS OFF CACHE BOOL "Build programs")
+        set(BUILD_LIBOUT123 FALSE)
+        set(BUILD_PROGRAMS OFF)
         set(BUILD_SHARED_LIBS "${SDL2MIXER_MP3_MPG123_SHARED}")
         add_subdirectory(external/mpg123/ports/cmake EXCLUDE_FROM_ALL)
         if(NOT TARGET MPG123::libmpg123)
@@ -827,12 +839,12 @@ endif()
 if(SDL2MIXER_WAVPACK)
     target_compile_definitions(SDL2_mixer PRIVATE MUSIC_WAVPACK)
     if(SDL2MIXER_VENDORED)
-        message(STATUS "Using vendored WevPack")
+        message(STATUS "Using vendored WavPack")
         sdl_check_project_in_subfolder(external/wavpack WavPack SDL2MIXER_VENDORED)
-        set(WAVPACK_BUILD_PROGRAMS FALSE CACHE BOOL "Don't build WavPack programs")
-        set(WAVPACK_BUILD_COOLEDIT_PLUGIN OFF CACHE BOOL "Don't build WavPack CoolEdit plugin")
-        set(WAVPACK_BUILD_WINAMP_PLUGIN OFF CACHE BOOL "Don't build WavPack WinAMP plugin")
-        set(WAVPACK_BUILD_DOCS OFF CACHE BOOL "Don't build WavPack documentation")
+        set(WAVPACK_BUILD_PROGRAMS FALSE)
+        set(WAVPACK_BUILD_COOLEDIT_PLUGIN OFF)
+        set(WAVPACK_BUILD_WINAMP_PLUGIN OFF)
+        set(WAVPACK_BUILD_DOCS OFF)
         set(BUILD_SHARED_LIBS "${SDL2MIXER_WAVPACK_SHARED}")
         add_subdirectory(external/wavpack EXCLUDE_FROM_ALL)
         if(SDL2MIXER_WAVPACK_SHARED OR NOT SDL2MIXER_BUILD_SHARED_LIBS)

diff --git a/VisualC/SDL_mixer.vcxproj b/VisualC/SDL_mixer.vcxproj
@@ -109,7 +109,7 @@
       <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\src;..\src\codecs;..\src\codecs\timidity;..\src\codecs\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp-lite.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
@@ -139,7 +139,7 @@
       <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\src;..\src\codecs;..\src\codecs\timidity;..\src\codecs\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp-lite.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
@@ -168,7 +168,7 @@
     <ClCompile>
       <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>..\include;..\src;..\src\codecs;..\src\codecs\timidity;..\src\codecs\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp-lite.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -195,7 +195,7 @@
     <ClCompile>
       <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>..\include;..\src;..\src\codecs;..\src\codecs\timidity;..\src\codecs\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp-lite.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_FLAC_DRFLAC;MUSIC_MOD_XMP;XMP_DYNAMIC="libxmp.dll";MUSIC_MP3_DRMP3;MUSIC_OGG;OGG_USE_STB;MUSIC_OPUS;OPUS_DYNAMIC="libopusfile-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
@@ -259,7 +259,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="external\optional\x64\libxmp-lite.dll">
+    <CustomBuild Include="external\optional\x64\libxmp.dll">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename)%(Extension)</Message>
@@ -295,7 +295,7 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename)%(Extension)</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="external\optional\x64\LICENSE.xmp-lite.txt">
+    <CustomBuild Include="external\optional\x64\LICENSE.xmp.txt">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename)%(Extension)</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
@@ -327,7 +327,7 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename)%(Extension)</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="external\optional\x86\libxmp-lite.dll">
+    <CustomBuild Include="external\optional\x86\libxmp.dll">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
@@ -363,7 +363,7 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename)%(Extension)</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="external\optional\x86\LICENSE.xmp-lite.txt">
+    <CustomBuild Include="external\optional\x86\LICENSE.xmp.txt">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(SolutionDir)\$(Platform)\$(Configuration)\</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>

diff --git a/VisualC/external/include/xmp.h b/VisualC/external/include/xmp.h
@@ -1,39 +1,56 @@
 #ifndef XMP_H
 #define XMP_H
 
+#if defined(EMSCRIPTEN)
+# include <emscripten.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define XMP_VERSION "4.5.0"
-#define XMP_VERCODE 0x040500
+#define XMP_VERSION "4.6.0"
+#define XMP_VERCODE 0x040600
 #define XMP_VER_MAJOR 4
-#define XMP_VER_MINOR 5
+#define XMP_VER_MINOR 6
 #define XMP_VER_RELEASE 0
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
-# if defined(BUILDING_STATIC)
+# if defined(LIBXMP_STATIC)
 #  define LIBXMP_EXPORT
 # elif defined(BUILDING_DLL)
 #  define LIBXMP_EXPORT __declspec(dllexport)
 # else
 #  define LIBXMP_EXPORT __declspec(dllimport)
 # endif
-#elif defined(__OS2__) && defined(__WATCOMC__) && defined(__SW_BD)
+#elif defined(__OS2__) && defined(__WATCOMC__)
+# if defined(LIBXMP_STATIC)
+#  define LIBXMP_EXPORT
+# elif defined(BUILDING_DLL)
 #  define LIBXMP_EXPORT __declspec(dllexport)
+# else
+#  define LIBXMP_EXPORT
+# endif
 #elif (defined(__GNUC__) || defined(__clang__) || defined(__HP_cc)) && defined(XMP_SYM_VISIBILITY)
-# define LIBXMP_EXPORT __attribute__((visibility ("default")))
+# if defined(LIBXMP_STATIC)
+#  define LIBXMP_EXPORT
+# else
+#  define LIBXMP_EXPORT __attribute__((visibility("default")))
+# endif
 #elif defined(__SUNPRO_C) && defined(XMP_LDSCOPE_GLOBAL)
-# define LIBXMP_EXPORT __global
+# if defined(LIBXMP_STATIC)
+#  define LIBXMP_EXPORT
+# else
+#  define LIBXMP_EXPORT __global
+# endif
 #elif defined(EMSCRIPTEN)
-# include <emscripten.h>
 # define LIBXMP_EXPORT EMSCRIPTEN_KEEPALIVE
 # define LIBXMP_EXPORT_VAR
 #else
 # define LIBXMP_EXPORT
 #endif
 
-#if !defined (LIBXMP_EXPORT_VAR)
+#if !defined(LIBXMP_EXPORT_VAR)
 # define LIBXMP_EXPORT_VAR LIBXMP_EXPORT
 #endif
 
@@ -238,6 +255,7 @@ struct xmp_sample {
 #define XMP_SAMPLE_LOOP_FULL	(1 << 4)  /* Play full sample before looping */
 #define XMP_SAMPLE_SLOOP	(1 << 5)  /* Sample has sustain loop */
 #define XMP_SAMPLE_SLOOP_BIDIR	(1 << 6)  /* Bidirectional sustain loop */
+#define XMP_SAMPLE_STEREO	(1 << 7)  /* Interlaced stereo sample */
 #define XMP_SAMPLE_SYNTH	(1 << 15) /* Data contains synth patch */
 	int flg;			/* Flags */
 	unsigned char *data;		/* Sample data */

diff --git a/...xternal/optional/x64/LICENSE.xmp-lite.txt → ...alC/external/optional/x64/LICENSE.xmp.txt b/...xternal/optional/x64/LICENSE.xmp-lite.txt → ...alC/external/optional/x64/LICENSE.xmp.txt
@@ -1,26 +1,5 @@
-   __   _ __                       ___ __     
-  / /  (_) / __ __ __ _  ___  ____/ (_) /____ 
- / /__/ / _ \\ \ //  ' \/ _ \/___/ / / __/ -_)
-/____/_/_.__/_\_\/_/_/_/ .__/   /_/_/\__/\__/ 
-                      /_/                     
-
-Libxmp-lite is a lean and lightweight subset of Libxmp that plays MOD, S3M,
-XM, and IT modules and retains full compatibility with the original API.
-It's intended for games and small or embedded applications where module
-format diversity and file depacking are not required.
-
-Library size can be further reduced by disabling Impulse Tracker format
-support (configure with --disable-it). This option will also disable IT
-effects and lowpass filtering.
-
-Please refer to http://xmp.sf.net/libxmp.html for details on the current
-Libxmp API.
-
-
-LICENSE
-
-Extended Module Player Lite
-Copyright (C) 1996-2021 Claudio Matsuoka and Hipolito Carraro Jr
+Extended Module Player
+Copyright (C) 1996-2023 Claudio Matsuoka and Hipolito Carraro Jr
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -39,4 +18,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
diff --git a/VisualC/external/optional/x64/libxmp-lite.dll b/VisualC/external/optional/x64/libxmp-lite.dll
diff --git a/VisualC/external/optional/x64/libxmp.dll b/VisualC/external/optional/x64/libxmp.dll
diff --git a/...xternal/optional/x86/LICENSE.xmp-lite.txt → ...alC/external/optional/x86/LICENSE.xmp.txt b/...xternal/optional/x86/LICENSE.xmp-lite.txt → ...alC/external/optional/x86/LICENSE.xmp.txt
@@ -1,26 +1,5 @@
-   __   _ __                       ___ __     
-  / /  (_) / __ __ __ _  ___  ____/ (_) /____ 
- / /__/ / _ \\ \ //  ' \/ _ \/___/ / / __/ -_)
-/____/_/_.__/_\_\/_/_/_/ .__/   /_/_/\__/\__/ 
-                      /_/                     
-
-Libxmp-lite is a lean and lightweight subset of Libxmp that plays MOD, S3M,
-XM, and IT modules and retains full compatibility with the original API.
-It's intended for games and small or embedded applications where module
-format diversity and file depacking are not required.
-
-Library size can be further reduced by disabling Impulse Tracker format
-support (configure with --disable-it). This option will also disable IT
-effects and lowpass filtering.
-
-Please refer to http://xmp.sf.net/libxmp.html for details on the current
-Libxmp API.
-
-
-LICENSE
-
-Extended Module Player Lite
-Copyright (C) 1996-2021 Claudio Matsuoka and Hipolito Carraro Jr
+Extended Module Player
+Copyright (C) 1996-2023 Claudio Matsuoka and Hipolito Carraro Jr
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -39,4 +18,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
diff --git a/VisualC/external/optional/x86/libxmp-lite.dll b/VisualC/external/optional/x86/libxmp-lite.dll
diff --git a/VisualC/external/optional/x86/libxmp.dll b/VisualC/external/optional/x86/libxmp.dll