diff --git a/Android.mk b/Android.mk index a00d5c6..9ceb328 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,5 @@ # Save the local path -MY_LOCAL_PATH := $(call my-dir) +SDL_MIXER_LOCAL_PATH := $(call my-dir) # Enable this if you want to support loading FLAC music with libFLAC @@ -20,39 +20,39 @@ MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0 # Enable this if you want to support TiMidity -SUPPORT_TIMIDITY ?= true +SUPPORT_MID_TIMIDITY ?= true TIMIDITY_LIBRARY_PATH := timidity # Build the library ifeq ($(SUPPORT_FLAC),true) - include $(MY_LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/Android.mk + include $(SDL_MIXER_LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/Android.mk endif # Build the library ifeq ($(SUPPORT_OGG),true) - include $(MY_LOCAL_PATH)/$(OGG_LIBRARY_PATH)/Android.mk - include $(MY_LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)/Android.mk + include $(SDL_MIXER_LOCAL_PATH)/$(OGG_LIBRARY_PATH)/Android.mk + include $(SDL_MIXER_LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)/Android.mk endif # Build the library ifeq ($(SUPPORT_MP3_MPG123),true) - include $(MY_LOCAL_PATH)/$(MPG123_LIBRARY_PATH)/Android.mk + include $(SDL_MIXER_LOCAL_PATH)/$(MPG123_LIBRARY_PATH)/Android.mk endif # Build the library ifeq ($(SUPPORT_MOD_MODPLUG),true) - include $(MY_LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/Android.mk + include $(SDL_MIXER_LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/Android.mk endif # Build the library -ifeq ($(SUPPORT_TIMIDITY),true) - include $(MY_LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)/Android.mk +ifeq ($(SUPPORT_MID_TIMIDITY),true) + include $(SDL_MIXER_LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)/Android.mk endif # Restore local path -LOCAL_PATH := $(MY_LOCAL_PATH) +LOCAL_PATH := $(SDL_MIXER_LOCAL_PATH) include $(CLEAR_VARS) @@ -92,7 +92,7 @@ LOCAL_STATIC_LIBRARIES += modplug endif -ifeq ($(SUPPORT_TIMIDITY),true) +ifeq ($(SUPPORT_MID_TIMIDITY),true) LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH) LOCAL_CFLAGS += -DMUSIC_MID_TIMIDITY LOCAL_STATIC_LIBRARIES += timidity diff --git a/CHANGES.txt b/CHANGES.txt index bdd4a88..58ffd27 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,15 @@ +2.0.4: +Ozkan Sezer - Wed, 10 Oct 2018 14:56:10 + * Removed smpeg support for mp3 music, now that it's replaced by libmpg123 +Ozkan Sezer - Sun, 07 Oct 2018 08:50:02 + * Fixed mp3 mad decoder to skip tags, which otherwise would lead to crashes +Ozkan Sezer - Fri, 15 Jun 2018 05:32:56 + * Added support for Opus music playback using opusfile library + +2.0.3: +Sam Lantinga - Thu, Mar 1, 2018 9:06:58 AM + * Fixed regression where Mix_Init() would return 0 for available music formats + 2.0.2: Sam Lantinga - Fri Oct 20 22:04:50 PDT 2017 * Implemented 24-bit and surround sound support for FLAC audio files diff --git a/COPYING.txt b/COPYING.txt index 79c8276..c59f77f 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Makefile.in b/Makefile.in index fe85165..2ff24b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,7 +38,7 @@ PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@ PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@ -DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_smpeg.c music_smpeg.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc +DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_opus.c music_opus.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ diff --git a/README.txt b/README.txt index 523fcf1..3f7330f 100644 --- a/README.txt +++ b/README.txt @@ -14,7 +14,7 @@ The mixer can currently load Microsoft WAVE files and Creative Labs VOC files as audio samples, it can load FLAC files with libFLAC, it can load Ogg Vorbis files with Ogg Vorbis or Tremor libraries, it can load MP3 files -using mpg123, SMPEG or libmad, and it can load MIDI files with Timidity, +using mpg123 or libmad, and it can load MIDI files with Timidity, FluidSynth, and natively on Windows, Mac OSX, and Linux, and finally it can load the following file formats via ModPlug or MikMod: .MOD .S3M .IT .XM. diff --git a/SDL2_mixer.spec.in b/SDL2_mixer.spec.in index 1d7ca98..bccf2bd 100644 --- a/SDL2_mixer.spec.in +++ b/SDL2_mixer.spec.in @@ -16,7 +16,7 @@ Due to popular demand, here is a simple multi-channel audio mixer. It supports 4 channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis, -Tremor, SMPEG MP3, and libmad MP3 libraries. +Tremor, libmpg123 and libmad MP3 libraries. %package devel Summary: Libraries, includes and more to develop SDL applications. @@ -27,7 +27,7 @@ Due to popular demand, here is a simple multi-channel audio mixer. It supports 4 channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis, -Tremor, SMPEG MP3, and libmad MP3 libraries. +Tremor, libmpg123 and libmad MP3 libraries. %prep %setup diff --git a/SDL_mixer.h b/SDL_mixer.h index cbb8ae6..009d8a2 100644 --- a/SDL_mixer.h +++ b/SDL_mixer.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -38,7 +38,7 @@ */ #define SDL_MIXER_MAJOR_VERSION 2 #define SDL_MIXER_MINOR_VERSION 0 -#define SDL_MIXER_PATCHLEVEL 2 +#define SDL_MIXER_PATCHLEVEL 4 /* This macro can be used to fill a version structure with the compile-time * version of the SDL_mixer library. @@ -80,7 +80,8 @@ MIX_INIT_MOD = 0x00000002, MIX_INIT_MP3 = 0x00000008, MIX_INIT_OGG = 0x00000010, - MIX_INIT_MID = 0x00000020 + MIX_INIT_MID = 0x00000020, + MIX_INIT_OPUS = 0x00000040 } MIX_InitFlags; /* Loads dynamic libraries and prepares them for use. Flags should be @@ -134,7 +135,8 @@ MUS_MP3, MUS_MP3_MAD_UNUSED, MUS_FLAC, - MUS_MODPLUG_UNUSED + MUS_MODPLUG_UNUSED, + MUS_OPUS } Mix_MusicType; /* The internal format for a music chunk interpreted via mikmod */ diff --git a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.sln b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.sln deleted file mode 100644 index a469b26..0000000 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.sln +++ /dev/null @@ -1,76 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-UWP", "SDL_mixer-UWP.vcxproj", "{18665277-E558-4484-93F4-E4DC7BB614CB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-UWP", "libogg_dynamic-UWP.vcxproj", "{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-UWP", "libvorbis_dynamic-UWP.vcxproj", "{6B6C1F59-6A82-4097-8907-04DF5C95D014}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-UWP", "libvorbisfile_dynamic-UWP.vcxproj", "{70EF3B8F-6AAF-401B-9818-3371E950E73C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|ARM.ActiveCfg = Debug|ARM - {18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|ARM.Build.0 = Debug|ARM - {18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x64.ActiveCfg = Debug|x64 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x64.Build.0 = Debug|x64 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x86.ActiveCfg = Debug|Win32 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x86.Build.0 = Debug|Win32 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Release|ARM.ActiveCfg = Release|ARM - {18665277-E558-4484-93F4-E4DC7BB614CB}.Release|ARM.Build.0 = Release|ARM - {18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x64.ActiveCfg = Release|x64 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x64.Build.0 = Release|x64 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x86.ActiveCfg = Release|Win32 - {18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x86.Build.0 = Release|Win32 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|ARM.ActiveCfg = Debug|ARM - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|ARM.Build.0 = Debug|ARM - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x64.ActiveCfg = Debug|x64 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x64.Build.0 = Debug|x64 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x86.ActiveCfg = Debug|Win32 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x86.Build.0 = Debug|Win32 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|ARM.ActiveCfg = Release|ARM - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|ARM.Build.0 = Release|ARM - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x64.ActiveCfg = Release|x64 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x64.Build.0 = Release|x64 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x86.ActiveCfg = Release|Win32 - {B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x86.Build.0 = Release|Win32 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|ARM.ActiveCfg = Debug|ARM - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|ARM.Build.0 = Debug|ARM - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x64.ActiveCfg = Debug|x64 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x64.Build.0 = Debug|x64 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x86.ActiveCfg = Debug|Win32 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x86.Build.0 = Debug|Win32 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|ARM.ActiveCfg = Release|ARM - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|ARM.Build.0 = Release|ARM - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x64.ActiveCfg = Release|x64 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x64.Build.0 = Release|x64 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x86.ActiveCfg = Release|Win32 - {6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x86.Build.0 = Release|Win32 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|ARM.ActiveCfg = Debug|ARM - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|ARM.Build.0 = Debug|ARM - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x64.ActiveCfg = Debug|x64 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x64.Build.0 = Debug|x64 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x86.ActiveCfg = Debug|Win32 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x86.Build.0 = Debug|Win32 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|ARM.ActiveCfg = Release|ARM - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|ARM.Build.0 = Release|ARM - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x64.ActiveCfg = Release|x64 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x64.Build.0 = Release|x64 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x86.ActiveCfg = Release|Win32 - {70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj deleted file mode 100644 index a2384d1..0000000 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj +++ /dev/null @@ -1,273 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {89e9b32e-a86a-47c3-a948-d2b1622925ce} - - - {b14f8b7f-c9ff-4fd3-b328-7c68ab801e85} - - - {70ef3b8f-6aaf-401b-9818-3371e950e73c} - - - {6b6c1f59-6a82-4097-8907-04df5c95d014} - - - - {18665277-e558-4484-93f4-e4dc7bb614cb} - DynamicLibrary - SDL2_mixer-UWP - SDL2_mixer_UWP - en-US - 14.0 - true - Windows Store - 8.2 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - - NotUsing - false - ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters deleted file mode 100644 index 344db2d..0000000 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - {660dbe57-4c07-417e-9609-12b312726942} - - - \ No newline at end of file diff --git a/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj b/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj deleted file mode 100644 index 5677b18..0000000 --- a/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj +++ /dev/null @@ -1,239 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - {b14f8b7f-c9ff-4fd3-b328-7c68ab801e85} - DynamicLibrary - libogg_dynamic-UWP - libogg_dynamic_UWP - en-US - 14.0 - true - Windows Store - 8.2 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - - diff --git a/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj.filters b/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj.filters deleted file mode 100644 index edaf205..0000000 --- a/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj b/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj deleted file mode 100644 index 6ae3555..0000000 --- a/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj +++ /dev/null @@ -1,303 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {b14f8b7f-c9ff-4fd3-b328-7c68ab801e85} - - - - {6b6c1f59-6a82-4097-8907-04df5c95d014} - Win32Proj - libvorbis_dynamic-UWP - libvorbis_dynamic_UWP - en-US - 12.0 - true - Windows Store - 8.1 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - - diff --git a/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj.filters b/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj.filters deleted file mode 100644 index 2101a47..0000000 --- a/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj.filters +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj b/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj deleted file mode 100644 index 8b4ef73..0000000 --- a/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj +++ /dev/null @@ -1,242 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - {b14f8b7f-c9ff-4fd3-b328-7c68ab801e85} - - - {6b6c1f59-6a82-4097-8907-04df5c95d014} - - - - {70ef3b8f-6aaf-401b-9818-3371e950e73c} - DynamicLibrary - libvorbisfile_dynamic-UWP - libvorbisfile_dynamic_UWP - en-US - 14.0 - true - Windows Store - 8.2 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - 10.0.10240.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;_WINDLL;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - - diff --git a/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj.filters b/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj.filters deleted file mode 100644 index 74d0fac..0000000 --- a/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln deleted file mode 100644 index 2cfb685..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln +++ /dev/null @@ -1,56 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinPhone80", "SDL_mixer-WinPhone80.vcxproj", "{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinPhone80", "libogg_dynamic-WinPhone80.vcxproj", "{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinPhone80", "libvorbis_dynamic-WinPhone80.vcxproj", "{8859E555-5684-436D-AD14-4E8CEB11EAD1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinPhone80", "libvorbisfile_dynamic-WinPhone80.vcxproj", "{E1553EFC-2C62-41AE-ABA3-D933D66D435D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|ARM.ActiveCfg = Debug|ARM - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|ARM.Build.0 = Debug|ARM - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|Win32.Build.0 = Debug|Win32 - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|ARM.ActiveCfg = Release|ARM - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|ARM.Build.0 = Release|ARM - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|Win32.ActiveCfg = Release|Win32 - {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|Win32.Build.0 = Release|Win32 - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|ARM.ActiveCfg = Debug|ARM - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|ARM.Build.0 = Debug|ARM - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|Win32.Build.0 = Debug|Win32 - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|ARM.ActiveCfg = Release|ARM - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|ARM.Build.0 = Release|ARM - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|Win32.ActiveCfg = Release|Win32 - {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|Win32.Build.0 = Release|Win32 - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|ARM.ActiveCfg = Debug|ARM - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|ARM.Build.0 = Debug|ARM - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|Win32.ActiveCfg = Debug|Win32 - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|Win32.Build.0 = Debug|Win32 - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|ARM.ActiveCfg = Release|ARM - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|ARM.Build.0 = Release|ARM - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|Win32.ActiveCfg = Release|Win32 - {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|Win32.Build.0 = Release|Win32 - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|ARM.ActiveCfg = Debug|ARM - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|ARM.Build.0 = Debug|ARM - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|Win32.ActiveCfg = Debug|Win32 - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|Win32.Build.0 = Debug|Win32 - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|ARM.ActiveCfg = Release|ARM - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|ARM.Build.0 = Release|ARM - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|Win32.ActiveCfg = Release|Win32 - {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj deleted file mode 100644 index ecbb249..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj +++ /dev/null @@ -1,230 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {1f710837-d5c0-4e7f-abea-fbff64722e7e} - SDL2_mixer_WinPhone - en-US - 11.0 - SDL2_mixer-WinPhone80 - - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - - - - - - false - - - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - - _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include - - - Console - false - false - true - - - - - _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include - - - Console - false - false - true - - - - - _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include - - - Console - false - false - true - - - - - _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include - - - Console - false - false - true - - - - - true - - - true - false - - - - - {33048af1-031a-4ce6-b61e-fad2db832e9e} - - - {ddb6f9c3-25d1-43c1-b439-20f2016d2f2e} - - - {e1553efc-2c62-41ae-aba3-d933d66d435d} - - - {8859e555-5684-436d-ad14-4e8ceb11ead1} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters deleted file mode 100644 index e998b91..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - {ba754ab5-5a7c-4e3c-9a2f-a1a8cf93fa90} - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj deleted file mode 100644 index fba1ad8..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {ddb6f9c3-25d1-43c1-b439-20f2016d2f2e} - libogg_WinPhone - en-US - 11.0 - libogg_dynamic-WinPhone80 - - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - - - - - - false - - - libogg - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libogg - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libogg - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libogg - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - - _USRDLL;WIN32;_DEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include - 4244 - - - Console - false - false - true - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - _USRDLL;WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include - 4244 - - - Console - false - false - true - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - _USRDLL;WIN32;_DEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include - 4244 - - - Console - false - false - true - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - _USRDLL;WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.2\include - 4244 - - - Console - false - false - true - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - diff --git a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj.filters deleted file mode 100644 index 79d181b..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj deleted file mode 100644 index 6439efd..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj +++ /dev/null @@ -1,238 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {8859e555-5684-436d-ad14-4e8ceb11ead1} - libvorbis_dynamic_WinPhone - en-US - 11.0 - - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - - - - - - false - - - libvorbis - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libvorbis - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libvorbis - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libvorbis - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - - _USRDLL;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - _USRDLL;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - _USRDLL;_WIN32_WCE;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - _USRDLL;_WIN32_WCE;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - true - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {ddb6f9c3-25d1-43c1-b439-20f2016d2f2e} - - - - - - - diff --git a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj.filters deleted file mode 100644 index e39da2b..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj.filters +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj deleted file mode 100644 index 75f2939..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - ARM - - - Release - Win32 - - - Release - ARM - - - - {e1553efc-2c62-41ae-aba3-d933d66d435d} - libvorbisfile_dynamic_WinPhone - en-US - 11.0 - - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - DynamicLibrary - false - true - v110_wp80 - false - - - - - - - - false - - - libvorbisfile - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libvorbisfile - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libvorbisfile - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libvorbisfile - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - - _USRDLL;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - _USRDLL;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - _USRDLL;_WIN32_WCE;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - _USRDLL;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions) - NotUsing - pch.h - false - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include - - - Console - false - false - true - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - true - - - true - false - - - - - - - - - - - {ddb6f9c3-25d1-43c1-b439-20f2016d2f2e} - - - {8859e555-5684-436d-ad14-4e8ceb11ead1} - - - - - - - diff --git a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj.filters deleted file mode 100644 index f70e45d..0000000 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.sln b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.sln deleted file mode 100644 index b507712..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.sln +++ /dev/null @@ -1,58 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinPhone81", "SDL_mixer-WinPhone81.vcxproj", "{FB75C3D3-D261-4575-9D17-9E88E09568BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinPhone81", "libogg_dynamic-WinPhone81.vcxproj", "{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinPhone81", "libvorbis_dynamic-WinPhone81.vcxproj", "{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinPhone81", "libvorbisfile_dynamic-WinPhone81.vcxproj", "{203EFCC5-CE11-4A75-92F4-C3DBF7609376}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|ARM.ActiveCfg = Debug|ARM - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|ARM.Build.0 = Debug|ARM - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|Win32.Build.0 = Debug|Win32 - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|ARM.ActiveCfg = Release|ARM - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|ARM.Build.0 = Release|ARM - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|Win32.ActiveCfg = Release|Win32 - {FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|Win32.Build.0 = Release|Win32 - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|ARM.ActiveCfg = Debug|ARM - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|ARM.Build.0 = Debug|ARM - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|Win32.ActiveCfg = Debug|Win32 - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|Win32.Build.0 = Debug|Win32 - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|ARM.ActiveCfg = Release|ARM - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|ARM.Build.0 = Release|ARM - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|Win32.ActiveCfg = Release|Win32 - {0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|Win32.Build.0 = Release|Win32 - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|ARM.ActiveCfg = Debug|ARM - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|ARM.Build.0 = Debug|ARM - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|Win32.Build.0 = Debug|Win32 - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|ARM.ActiveCfg = Release|ARM - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|ARM.Build.0 = Release|ARM - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|Win32.ActiveCfg = Release|Win32 - {C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|Win32.Build.0 = Release|Win32 - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|ARM.ActiveCfg = Debug|ARM - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|ARM.Build.0 = Debug|ARM - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|Win32.ActiveCfg = Debug|Win32 - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|Win32.Build.0 = Debug|Win32 - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|ARM.ActiveCfg = Release|ARM - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|ARM.Build.0 = Release|ARM - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|Win32.ActiveCfg = Release|Win32 - {203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj deleted file mode 100644 index 9432524..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj +++ /dev/null @@ -1,223 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - ARM - - - Release - ARM - - - - - {48fadc0e-964d-4dab-bced-372e0ad19577} - - - {0ccc2e56-e3a4-4cd7-92ba-0c6f99440753} - - - {203efcc5-ce11-4a75-92f4-c3dbf7609376} - - - {c943dbc9-4eb0-4684-be3e-334342a7ee2c} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {fb75c3d3-d261-4575-9d17-9e88e09568ba} - Win32Proj - SDL2_mixer-WinPhone81 - SDL2_mixer_WinPhone81 - en-US - 12.0 - true - Windows Phone - 8.1 - - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - - - - - - - - - - - - - - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters deleted file mode 100644 index 814b8f7..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - {3f55d8a7-802e-40cd-8b4e-b87e9fe24589} - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj deleted file mode 100644 index afbbdff..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - ARM - - - Release - ARM - - - - - - - - - - - - - - - {0ccc2e56-e3a4-4cd7-92ba-0c6f99440753} - Win32Proj - libogg_dynamic-WinPhone81 - libogg_dynamic_WinPhone81 - en-US - 12.0 - true - Windows Phone - 8.1 - - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - - - - - - - - - - - - - - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - true - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - - diff --git a/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj.filters b/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj.filters deleted file mode 100644 index edaf205..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj deleted file mode 100644 index c41e3be..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - ARM - - - Release - ARM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {0ccc2e56-e3a4-4cd7-92ba-0c6f99440753} - - - - {c943dbc9-4eb0-4684-be3e-334342a7ee2c} - Win32Proj - libvorbis_dynamic-WinPhone81 - libvorbis_dynamic_WinPhone81 - en-US - 12.0 - true - Windows Phone - 8.1 - - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - - - - - - - - - - - - - - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - - diff --git a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj.filters b/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj.filters deleted file mode 100644 index 2101a47..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj.filters +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj deleted file mode 100644 index 35b9a30..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - ARM - - - Release - ARM - - - - - - - - - - - {0ccc2e56-e3a4-4cd7-92ba-0c6f99440753} - - - {c943dbc9-4eb0-4684-be3e-334342a7ee2c} - - - - {203efcc5-ce11-4a75-92f4-c3dbf7609376} - Win32Proj - libvorbisfile_dynamic-WinPhone81 - libvorbisfile_dynamic_WinPhone81 - en-US - 12.0 - true - Windows Phone - 8.1 - - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - DynamicLibrary - true - v120_wp81 - - - DynamicLibrary - false - true - v120_wp81 - - - - - - - - - - - - - - - - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - - diff --git a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj.filters b/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj.filters deleted file mode 100644 index 74d0fac..0000000 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.sln b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.sln deleted file mode 100644 index 03f7674..0000000 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.sln +++ /dev/null @@ -1,74 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinRT80", "SDL_mixer-WinRT80.vcxproj", "{06925935-B340-44E8-BDDD-7C1B8D64FF76}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinRT80", "libogg_dynamic-WinRT80.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinRT80", "libvorbis_dynamic-WinRT80.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinRT80", "libvorbisfile_dynamic-WinRT80.vcxproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|ARM.ActiveCfg = Debug|ARM - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|ARM.Build.0 = Debug|ARM - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|Win32.ActiveCfg = Debug|Win32 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|Win32.Build.0 = Debug|Win32 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|x64.ActiveCfg = Debug|x64 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|x64.Build.0 = Debug|x64 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|ARM.ActiveCfg = Release|ARM - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|ARM.Build.0 = Release|ARM - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|Win32.ActiveCfg = Release|Win32 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|Win32.Build.0 = Release|Win32 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|x64.ActiveCfg = Release|x64 - {06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|x64.Build.0 = Release|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|ARM.ActiveCfg = Debug|ARM - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|ARM.Build.0 = Debug|ARM - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.ActiveCfg = Debug|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.Build.0 = Debug|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.ActiveCfg = Debug|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.Build.0 = Debug|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|ARM.ActiveCfg = Release|ARM - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|ARM.Build.0 = Release|ARM - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.ActiveCfg = Release|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.Build.0 = Release|Win32 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.ActiveCfg = Release|x64 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.Build.0 = Release|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|ARM.ActiveCfg = Debug|ARM - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|ARM.Build.0 = Debug|ARM - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.Build.0 = Debug|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.ActiveCfg = Debug|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.Build.0 = Debug|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|ARM.ActiveCfg = Release|ARM - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|ARM.Build.0 = Release|ARM - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|Win32.ActiveCfg = Release|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|Win32.Build.0 = Release|Win32 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|x64.ActiveCfg = Release|x64 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|x64.Build.0 = Release|x64 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|ARM.ActiveCfg = Debug|ARM - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|ARM.Build.0 = Debug|ARM - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|Win32.Build.0 = Debug|Win32 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|x64.ActiveCfg = Debug|x64 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|x64.Build.0 = Debug|x64 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|ARM.ActiveCfg = Release|ARM - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|ARM.Build.0 = Release|ARM - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.ActiveCfg = Release|Win32 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.Build.0 = Release|Win32 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.ActiveCfg = Release|x64 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj deleted file mode 100644 index 6201615..0000000 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj +++ /dev/null @@ -1,284 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - {aeaea3a2-d4e6-45b1-8ec6-53d84287fc14} - - - {15cbfeff-7965-41f5-b4e2-21e8795c9159} - - - {cebde98b-a6aa-46e6-bc79-faaf823db9ec} - - - {3a214e06-b95e-4d61-a291-1f8df2ec10fd} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {06925935-b340-44e8-bddd-7c1b8d64ff76} - Win32Proj - SDL2_mixer-WinRT80 - SDL_mixer_VS2012_WinRT - en-US - 11.0 - true - - - - DynamicLibrary - true - v110 - - - DynamicLibrary - true - v110 - - - DynamicLibrary - true - v110 - - - DynamicLibrary - false - true - v110 - - - DynamicLibrary - false - true - v110 - - - DynamicLibrary - false - true - v110 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters deleted file mode 100644 index 463712c..0000000 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - {76edff39-58d9-4391-b729-e34269a68b5a} - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT80_VS2012/libogg_dynamic-WinRT80.vcxproj b/VisualC-WinRT/WinRT80_VS2012/libogg_dynamic-WinRT80.vcxproj deleted file mode 100644 index a763d54..0000000 --- a/VisualC-WinRT/WinRT80_VS2012/libogg_dynamic-WinRT80.vcxproj +++ /dev/null @@ -1,279 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - libogg_dynamic-WinRT80 - {15CBFEFF-7965-41F5-B4E2-21E8795C9159} - libogg - Win32Proj - - - - DynamicLibrary - Unicode - true - v110 - true - - - DynamicLibrary - Unicode - true - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - true - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - - - libogg - - - libogg - - - libogg - - - libogg - - - libogg - - - libogg - - - - Disabled - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - CompileAsC - Cdecl - - - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - Disabled - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - CompileAsC - Cdecl - - - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - X64 - - - Disabled - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - CompileAsC - Cdecl - - - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - MaxSpeed - AnySuitable - true - Speed - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - - - CompileAsC - 4244;%(DisableSpecificWarnings) - Cdecl - - - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - MaxSpeed - AnySuitable - true - Speed - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - - - CompileAsC - 4244;%(DisableSpecificWarnings) - Cdecl - - - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - X64 - - - MaxSpeed - AnySuitable - true - Speed - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - - - CompileAsC - 4244;%(DisableSpecificWarnings) - Cdecl - - - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - - - - - - - - - - - - - diff --git a/VisualC-WinRT/WinRT80_VS2012/libvorbis_dynamic-WinRT80.vcxproj b/VisualC-WinRT/WinRT80_VS2012/libvorbis_dynamic-WinRT80.vcxproj deleted file mode 100644 index 642a853..0000000 --- a/VisualC-WinRT/WinRT80_VS2012/libvorbis_dynamic-WinRT80.vcxproj +++ /dev/null @@ -1,359 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - libvorbis_dynamic-WinRT80 - {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} - libvorbis - Win32Proj - - - - DynamicLibrary - Unicode - true - v110 - true - - - DynamicLibrary - Unicode - true - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - true - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - - - - - <_ProjectFileVersion>10.0.30319.1 - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - true - true - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - true - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - false - - - libvorbis - - - libvorbis - - - libvorbis - - - libvorbis - - - libvorbis - - - libvorbis - - - - Disabled - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - CompileAsC - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - true - $(OutDir)libvorbis.pdb - Windows - MachineX86 - - - - - Disabled - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WCE;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - EditAndContinue - CompileAsC - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - true - $(OutDir)libvorbis.pdb - Windows - - - - - X64 - - - Disabled - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level4 - ProgramDatabase - CompileAsC - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - true - $(OutDir)libvorbis.pdb - Windows - MachineX64 - - - - - Full - AnySuitable - true - Speed - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - ProgramDatabase - CompileAsC - 4244;4100;4267;4189;4305;4127;4706;%(DisableSpecificWarnings) - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - false - Windows - true - true - MachineX86 - - - - - Full - AnySuitable - true - Speed - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WCE;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - ProgramDatabase - CompileAsC - 4244;4100;4267;4189;4305;4127;4706;%(DisableSpecificWarnings) - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - false - Windows - true - true - - - - - X64 - - - Full - AnySuitable - true - Speed - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - MultiThreadedDLL - false - - - Level4 - ProgramDatabase - CompileAsC - 4244;4100;4267;4189;4305;4127;4706;%(DisableSpecificWarnings) - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - false - Windows - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {15cbfeff-7965-41f5-b4e2-21e8795c9159} - - - - - - diff --git a/VisualC-WinRT/WinRT80_VS2012/libvorbisfile_dynamic-WinRT80.vcxproj b/VisualC-WinRT/WinRT80_VS2012/libvorbisfile_dynamic-WinRT80.vcxproj deleted file mode 100644 index 8579be7..0000000 --- a/VisualC-WinRT/WinRT80_VS2012/libvorbisfile_dynamic-WinRT80.vcxproj +++ /dev/null @@ -1,266 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - libvorbisfile_dynamic-WinRT80 - {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC} - libvorbisfile - Win32Proj - - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - DynamicLibrary - Unicode - v110 - true - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - true - true - $(SolutionDir)$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - true - $(SolutionDir)$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - false - false - $(SolutionDir)$(Configuration)\$(MSBuildProjectName)\ - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - false - - - libvorbisfile - - - libvorbisfile - - - libvorbisfile - - - libvorbisfile - - - libvorbisfile - - - libvorbisfile - - - - Disabled - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - true - $(OutDir)libvorbisfile.pdb - Windows - MachineX86 - - - - - Disabled - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WCE;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - true - $(OutDir)libvorbisfile.pdb - Windows - - - - - X64 - - - Disabled - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - true - $(OutDir)libvorbisfile.pdb - Windows - MachineX64 - - - - - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - false - Windows - true - true - MachineX86 - - - - - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32_WCE;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - false - Windows - true - true - - - - - X64 - - - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - Cdecl - - - %(AdditionalDependencies) - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - false - Windows - true - true - MachineX64 - - - - - - - - - - - {15cbfeff-7965-41f5-b4e2-21e8795c9159} - - - {3a214e06-b95e-4d61-a291-1f8df2ec10fd} - - - - - - diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.sln b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.sln deleted file mode 100644 index 9d0bb93..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.sln +++ /dev/null @@ -1,76 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinRT81", "SDL_mixer-WinRT81.vcxproj", "{3A833C7A-C776-4202-9DBD-BC879B23C605}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinRT81", "libogg_dynamic-WinRT81.vcxproj", "{6BC6349C-E355-4F1C-9290-FF755114A84B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinRT81", "libvorbis_dynamic-WinRT81.vcxproj", "{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinRT81", "libvorbisfile_dynamic-WinRT81.vcxproj", "{936B2819-2364-45D9-901D-52878914FAFA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|ARM.ActiveCfg = Debug|ARM - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|ARM.Build.0 = Debug|ARM - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|Win32.Build.0 = Debug|Win32 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|x64.ActiveCfg = Debug|x64 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|x64.Build.0 = Debug|x64 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|ARM.ActiveCfg = Release|ARM - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|ARM.Build.0 = Release|ARM - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|Win32.ActiveCfg = Release|Win32 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|Win32.Build.0 = Release|Win32 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|x64.ActiveCfg = Release|x64 - {3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|x64.Build.0 = Release|x64 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|ARM.ActiveCfg = Debug|ARM - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|ARM.Build.0 = Debug|ARM - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|Win32.Build.0 = Debug|Win32 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|x64.ActiveCfg = Debug|x64 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|x64.Build.0 = Debug|x64 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|ARM.ActiveCfg = Release|ARM - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|ARM.Build.0 = Release|ARM - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|Win32.ActiveCfg = Release|Win32 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|Win32.Build.0 = Release|Win32 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|x64.ActiveCfg = Release|x64 - {6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|x64.Build.0 = Release|x64 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|ARM.ActiveCfg = Debug|ARM - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|ARM.Build.0 = Debug|ARM - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|Win32.ActiveCfg = Debug|Win32 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|Win32.Build.0 = Debug|Win32 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|x64.ActiveCfg = Debug|x64 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|x64.Build.0 = Debug|x64 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|ARM.ActiveCfg = Release|ARM - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|ARM.Build.0 = Release|ARM - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|Win32.ActiveCfg = Release|Win32 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|Win32.Build.0 = Release|Win32 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|x64.ActiveCfg = Release|x64 - {E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|x64.Build.0 = Release|x64 - {936B2819-2364-45D9-901D-52878914FAFA}.Debug|ARM.ActiveCfg = Debug|ARM - {936B2819-2364-45D9-901D-52878914FAFA}.Debug|ARM.Build.0 = Debug|ARM - {936B2819-2364-45D9-901D-52878914FAFA}.Debug|Win32.ActiveCfg = Debug|Win32 - {936B2819-2364-45D9-901D-52878914FAFA}.Debug|Win32.Build.0 = Debug|Win32 - {936B2819-2364-45D9-901D-52878914FAFA}.Debug|x64.ActiveCfg = Debug|x64 - {936B2819-2364-45D9-901D-52878914FAFA}.Debug|x64.Build.0 = Debug|x64 - {936B2819-2364-45D9-901D-52878914FAFA}.Release|ARM.ActiveCfg = Release|ARM - {936B2819-2364-45D9-901D-52878914FAFA}.Release|ARM.Build.0 = Release|ARM - {936B2819-2364-45D9-901D-52878914FAFA}.Release|Win32.ActiveCfg = Release|Win32 - {936B2819-2364-45D9-901D-52878914FAFA}.Release|Win32.Build.0 = Release|Win32 - {936B2819-2364-45D9-901D-52878914FAFA}.Release|x64.ActiveCfg = Release|x64 - {936B2819-2364-45D9-901D-52878914FAFA}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj deleted file mode 100644 index 8524c12..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj +++ /dev/null @@ -1,286 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - {c8df6173-06a1-4f56-a9bc-2002596b30e9} - - - {6bc6349c-e355-4f1c-9290-ff755114a84b} - - - {936b2819-2364-45d9-901d-52878914fafa} - - - {e3ab27f1-eb89-4c65-85df-cb6a4f805753} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3a833c7a-c776-4202-9dbd-bc879b23c605} - Win32Proj - SDL2_mixer-WinRT81 - SDL2_mixer_WinRT81 - en-US - 12.0 - true - Windows Store - 8.1 - - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - SDL2_mixer - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters deleted file mode 100644 index 3b9c3e8..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - - - - - - - - - - - - - - - - - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - Timidity - - - - - {1a42c048-3a89-4691-8289-2eb5b280596f} - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj b/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj deleted file mode 100644 index cd228a9..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - {6bc6349c-e355-4f1c-9290-ff755114a84b} - Win32Proj - libogg_dynamic-WinRT81 - libogg_dynamic_WinRT81 - en-US - 12.0 - true - Windows Store - 8.1 - - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libogg - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - NotUsing - false - ..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions) - 4244 - - - Console - false - false - ..\..\external\libogg-1.3.2\win32\ogg.def - - - - - - diff --git a/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj.filters b/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj.filters deleted file mode 100644 index edaf205..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj b/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj deleted file mode 100644 index f6fe398..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj +++ /dev/null @@ -1,299 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {6bc6349c-e355-4f1c-9290-ff755114a84b} - - - - {e3ab27f1-eb89-4c65-85df-cb6a4f805753} - Win32Proj - libvorbis_dynamic-WinRT81 - libvorbis_dynamic_WinRT81 - en-US - 12.0 - true - Windows Store - 8.1 - - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbis - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4244;4100;4267;4189;4305;4127;4706 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbis.def - - - - - - diff --git a/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj.filters b/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj.filters deleted file mode 100644 index 2101a47..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj.filters +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj b/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj deleted file mode 100644 index 4286de3..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj +++ /dev/null @@ -1,238 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - {6bc6349c-e355-4f1c-9290-ff755114a84b} - - - {e3ab27f1-eb89-4c65-85df-cb6a4f805753} - - - - {936b2819-2364-45d9-901d-52878914fafa} - Win32Proj - libvorbisfile_dynamic-WinRT81 - libvorbisfile_dynamic_WinRT81 - en-US - 12.0 - true - Windows Store - 8.1 - - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - DynamicLibrary - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - false - false - Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ - libvorbisfile - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;_WINDLL;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - NotUsing - false - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - 4244;4101 - - - Console - false - false - ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def - - - - - - diff --git a/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj.filters b/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj.filters deleted file mode 100644 index 74d0fac..0000000 --- a/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/acinclude/ltdl.m4 b/acinclude/ltdl.m4 deleted file mode 100644 index e2b7129..0000000 --- a/acinclude/ltdl.m4 +++ /dev/null @@ -1,806 +0,0 @@ -############################################################################## -# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- -# -# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Thomas Tanner, 1999 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 17 LTDL_INIT - -# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) -# ------------------------------------------ -# DIRECTORY contains the libltdl sources. It is okay to call this -# function multiple times, as long as the same DIRECTORY is always given. -AC_DEFUN([LT_CONFIG_LTDL_DIR], -[AC_BEFORE([$0], [LTDL_INIT]) -_$0($*) -])# LT_CONFIG_LTDL_DIR - -# We break this out into a separate macro, so that we can call it safely -# internally without being caught accidentally by the sed scan in libtoolize. -m4_defun([_LT_CONFIG_LTDL_DIR], -[dnl remove trailing slashes -m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$])) -m4_case(_LTDL_DIR, - [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.' - m4_if(_ARG_DIR, [.], - [], - [m4_define([_LTDL_DIR], _ARG_DIR) - _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])], - [m4_if(_ARG_DIR, _LTDL_DIR, - [], - [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])]) -m4_popdef([_ARG_DIR]) -])# _LT_CONFIG_LTDL_DIR - -# Initialise: -m4_define([_LTDL_DIR], []) - - -# _LT_BUILD_PREFIX -# ---------------- -# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise -# to `${top_builddir}/'. -m4_define([_LT_BUILD_PREFIX], -[m4_ifdef([AC_AUTOCONF_VERSION], - [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]), - [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX], - [${top_build_prefix}], - [${top_builddir}/])], - [${top_build_prefix}])], - [${top_builddir}/])[]dnl -]) - - -# LTDL_CONVENIENCE -# ---------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with -# '${top_build_prefix}' if available, otherwise with '${top_builddir}/', -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_build_prefix, top_builddir, and top_srcdir appropriately -# in your Makefiles. -AC_DEFUN([LTDL_CONVENIENCE], -[AC_BEFORE([$0], [LTDL_INIT])dnl -dnl Although the argument is deprecated and no longer documented, -dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one -dnl here make sure it is the same as any other declaration of libltdl's -dnl location! This also ensures lt_ltdl_dir is set when configure.ac is -dnl not yet using an explicit LT_CONFIG_LTDL_DIR. -m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl -_$0() -])# LTDL_CONVENIENCE - -# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools, -# now we have LT_CONFIG_LTDL_DIR: -AU_DEFUN([AC_LIBLTDL_CONVENIENCE], -[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) -_LTDL_CONVENIENCE]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], []) - - -# _LTDL_CONVENIENCE -# ----------------- -# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]). -m4_defun([_LTDL_CONVENIENCE], -[case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -esac -LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la" -LTDLDEPS=$LIBLTDL -LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" - -AC_SUBST([LIBLTDL]) -AC_SUBST([LTDLDEPS]) -AC_SUBST([LTDLINCL]) - -# For backwards non-gettext consistent compatibility... -INCLTDL="$LTDLINCL" -AC_SUBST([INCLTDL]) -])# _LTDL_CONVENIENCE - - -# LTDL_INSTALLABLE -# ---------------- -# sets LIBLTDL to the link flags for the libltdl installable library -# and LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl -# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if -# available, otherwise with '${top_builddir}/', and LTDLINCL will be -# prefixed with '${top_srcdir}/' (note the single quotes!). If your -# package is not flat and you're not using automake, define top_build_prefix, -# top_builddir, and top_srcdir appropriately in your Makefiles. -# In the future, this macro may have to be called after LT_INIT. -AC_DEFUN([LTDL_INSTALLABLE], -[AC_BEFORE([$0], [LTDL_INIT])dnl -dnl Although the argument is deprecated and no longer documented, -dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one -dnl here make sure it is the same as any other declaration of libltdl's -dnl location! This also ensures lt_ltdl_dir is set when configure.ac is -dnl not yet using an explicit LT_CONFIG_LTDL_DIR. -m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl -_$0() -])# LTDL_INSTALLABLE - -# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools, -# now we have LT_CONFIG_LTDL_DIR: -AU_DEFUN([AC_LIBLTDL_INSTALLABLE], -[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) -_LTDL_INSTALLABLE]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], []) - - -# _LTDL_INSTALLABLE -# ----------------- -# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]). -m4_defun([_LTDL_INSTALLABLE], -[if test -f $prefix/lib/libltdl.la; then - lt_save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$prefix/lib $LDFLAGS" - AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes]) - LDFLAGS="$lt_save_LDFLAGS" - if test x"${lt_lib_ltdl-no}" = xyes; then - if test x"$enable_ltdl_install" != xyes; then - # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install - AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install']) - enable_ltdl_install=no - fi - elif test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - fi -fi - -# If configure.ac declared an installable ltdl, and the user didn't override -# with --disable-ltdl-install, we will install the shipped libltdl. -case $enable_ltdl_install in - no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLDEPS= - LTDLINCL= - ;; - *) enable_ltdl_install=yes - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la" - LTDLDEPS=$LIBLTDL - LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" - ;; -esac - -AC_SUBST([LIBLTDL]) -AC_SUBST([LTDLDEPS]) -AC_SUBST([LTDLINCL]) - -# For backwards non-gettext consistent compatibility... -INCLTDL="$LTDLINCL" -AC_SUBST([INCLTDL]) -])# LTDL_INSTALLABLE - - -# _LTDL_MODE_DISPATCH -# ------------------- -m4_define([_LTDL_MODE_DISPATCH], -[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself: -m4_if(_LTDL_DIR, [], - [], - dnl if _LTDL_MODE was not set already, the default value is `subproject': - [m4_case(m4_default(_LTDL_MODE, [subproject]), - [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR) - _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], - [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])], - [recursive], [], - [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl -dnl Be careful not to expand twice: -m4_define([$0], []) -])# _LTDL_MODE_DISPATCH - - -# _LT_LIBOBJ(MODULE_NAME) -# ----------------------- -# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead -# of into LIBOBJS. -AC_DEFUN([_LT_LIBOBJ], [ - m4_pattern_allow([^_LT_LIBOBJS$]) - _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" -])# _LT_LIBOBJS - - -# LTDL_INIT([OPTIONS]) -# -------------------- -# Clients of libltdl can use this macro to allow the installer to -# choose between a shipped copy of the ltdl sources or a preinstalled -# version of the library. If the shipped ltdl sources are not in a -# subdirectory named libltdl, the directory name must be given by -# LT_CONFIG_LTDL_DIR. -AC_DEFUN([LTDL_INIT], -[dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -dnl We need to keep our own list of libobjs separate from our parent project, -dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while -dnl we look for our own LIBOBJs. -m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) -m4_pushdef([AC_LIBSOURCES]) - -dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: -m4_if(_LTDL_MODE, [], - [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) - m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], - [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) - -AC_ARG_WITH([included_ltdl], - [AS_HELP_STRING([--with-included-ltdl], - [use the GNU ltdl sources included here])]) - -if test "x$with_included_ltdl" != xyes; then - # We are not being forced to use the included libltdl sources, so - # decide whether there is a useful installed version we can use. - AC_CHECK_HEADER([ltdl.h], - [AC_CHECK_DECL([lt_dlinterface_register], - [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], - [with_included_ltdl=no], - [with_included_ltdl=yes])], - [with_included_ltdl=yes], - [AC_INCLUDES_DEFAULT - #include ])], - [with_included_ltdl=yes], - [AC_INCLUDES_DEFAULT] - ) -fi - -dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE -dnl was called yet, then for old times' sake, we assume libltdl is in an -dnl eponymous directory: -AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])]) - -AC_ARG_WITH([ltdl_include], - [AS_HELP_STRING([--with-ltdl-include=DIR], - [use the ltdl headers installed in DIR])]) - -if test -n "$with_ltdl_include"; then - if test -f "$with_ltdl_include/ltdl.h"; then : - else - AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include']) - fi -else - with_ltdl_include=no -fi - -AC_ARG_WITH([ltdl_lib], - [AS_HELP_STRING([--with-ltdl-lib=DIR], - [use the libltdl.la installed in DIR])]) - -if test -n "$with_ltdl_lib"; then - if test -f "$with_ltdl_lib/libltdl.la"; then : - else - AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) - fi -else - with_ltdl_lib=no -fi - -case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in - ,yes,no,no,) - m4_case(m4_default(_LTDL_TYPE, [convenience]), - [convenience], [_LTDL_CONVENIENCE], - [installable], [_LTDL_INSTALLABLE], - [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)]) - ;; - ,no,no,no,) - # If the included ltdl is not to be used, then use the - # preinstalled libltdl we found. - AC_DEFINE([HAVE_LTDL], [1], - [Define this if a modern libltdl is already installed]) - LIBLTDL=-lltdl - LTDLDEPS= - LTDLINCL= - ;; - ,no*,no,*) - AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together]) - ;; - *) with_included_ltdl=no - LIBLTDL="-L$with_ltdl_lib -lltdl" - LTDLDEPS= - LTDLINCL="-I$with_ltdl_include" - ;; -esac -INCLTDL="$LTDLINCL" - -# Report our decision... -AC_MSG_CHECKING([where to find libltdl headers]) -AC_MSG_RESULT([$LTDLINCL]) -AC_MSG_CHECKING([where to find libltdl library]) -AC_MSG_RESULT([$LIBLTDL]) - -_LTDL_SETUP - -dnl restore autoconf definition. -m4_popdef([AC_LIBOBJ]) -m4_popdef([AC_LIBSOURCES]) - -AC_CONFIG_COMMANDS_PRE([ - _ltdl_libobjs= - _ltdl_ltlibobjs= - if test -n "$_LT_LIBOBJS"; then - # Remove the extension. - _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do - _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" - _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" - done - fi - AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs]) - AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs]) -]) - -# Only expand once: -m4_define([LTDL_INIT]) -])# LTDL_INIT - -# Old names: -AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)]) -AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)]) -AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIB_LTDL], []) -dnl AC_DEFUN([AC_WITH_LTDL], []) -dnl AC_DEFUN([LT_WITH_LTDL], []) - - -# _LTDL_SETUP -# ----------- -# Perform all the checks necessary for compilation of the ltdl objects -# -- including compiler checks and header checks. This is a public -# interface mainly for the benefit of libltdl's own configure.ac, most -# other users should call LTDL_INIT instead. -AC_DEFUN([_LTDL_SETUP], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_SYS_MODULE_EXT])dnl -AC_REQUIRE([LT_SYS_MODULE_PATH])dnl -AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl -AC_REQUIRE([LT_LIB_DLLOAD])dnl -AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl -AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl -AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl -AC_REQUIRE([gl_FUNC_ARGZ])dnl - -m4_require([_LT_CHECK_OBJDIR])dnl -m4_require([_LT_HEADER_DLFCN])dnl -m4_require([_LT_CHECK_DLPREOPEN])dnl -m4_require([_LT_DECL_SED])dnl - -dnl Don't require this, or it will be expanded earlier than the code -dnl that sets the variables it relies on: -_LT_ENABLE_INSTALL - -dnl _LTDL_MODE specific code must be called at least once: -_LTDL_MODE_DISPATCH - -# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS -# the user used. This is so that ltdl.h can pick up the parent projects -# config.h file, The first file in AC_CONFIG_HEADERS must contain the -# definitions required by ltdl.c. -# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility). -AC_CONFIG_COMMANDS_PRE([dnl -m4_pattern_allow([^LT_CONFIG_H$])dnl -m4_ifset([AH_HEADER], - [LT_CONFIG_H=AH_HEADER], - [m4_ifset([AC_LIST_HEADERS], - [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`], - [])])]) -AC_SUBST([LT_CONFIG_H]) - -AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h], - [], [], [AC_INCLUDES_DEFAULT]) - -AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) -AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) - -AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) - -name=ltdl -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` -AC_SUBST([LTDLOPEN]) -])# _LTDL_SETUP - - -# _LT_ENABLE_INSTALL -# ------------------ -m4_define([_LT_ENABLE_INSTALL], -[AC_ARG_ENABLE([ltdl-install], - [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])]) - -case ,${enable_ltdl_install},${enable_ltdl_convenience} in - *yes*) ;; - *) enable_ltdl_convenience=yes ;; -esac - -m4_ifdef([AM_CONDITIONAL], -[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno) - AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)]) -])# _LT_ENABLE_INSTALL - - -# LT_SYS_DLOPEN_DEPLIBS -# --------------------- -AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_CACHE_CHECK([whether deplibs are loaded by dlopen], - [lt_cv_sys_dlopen_deplibs], - [# PORTME does your system automatically load deplibs for dlopen? - # or its logical equivalent (e.g. shl_load for HP-UX < 11) - # For now, we just catch OSes we know something about -- in the - # future, we'll try test this programmatically. - lt_cv_sys_dlopen_deplibs=unknown - case $host_os in - aix3*|aix4.1.*|aix4.2.*) - # Unknown whether this is true for these versions of AIX, but - # we want this `case' here to explicitly catch those versions. - lt_cv_sys_dlopen_deplibs=unknown - ;; - aix[[4-9]]*) - lt_cv_sys_dlopen_deplibs=yes - ;; - amigaos*) - case $host_cpu in - powerpc) - lt_cv_sys_dlopen_deplibs=no - ;; - esac - ;; - darwin*) - # Assuming the user has installed a libdl from somewhere, this is true - # If you are looking for one http://www.opendarwin.org/projects/dlcompat - lt_cv_sys_dlopen_deplibs=yes - ;; - freebsd* | dragonfly*) - lt_cv_sys_dlopen_deplibs=yes - ;; - gnu* | linux* | k*bsd*-gnu) - # GNU and its variants, using gnu ld.so (Glibc) - lt_cv_sys_dlopen_deplibs=yes - ;; - hpux10*|hpux11*) - lt_cv_sys_dlopen_deplibs=yes - ;; - interix*) - lt_cv_sys_dlopen_deplibs=yes - ;; - irix[[12345]]*|irix6.[[01]]*) - # Catch all versions of IRIX before 6.2, and indicate that we don't - # know how it worked for any of those versions. - lt_cv_sys_dlopen_deplibs=unknown - ;; - irix*) - # The case above catches anything before 6.2, and it's known that - # at 6.2 and later dlopen does load deplibs. - lt_cv_sys_dlopen_deplibs=yes - ;; - netbsd*) - lt_cv_sys_dlopen_deplibs=yes - ;; - openbsd*) - lt_cv_sys_dlopen_deplibs=yes - ;; - osf[[1234]]*) - # dlopen did load deplibs (at least at 4.x), but until the 5.x series, - # it did *not* use an RPATH in a shared library to find objects the - # library depends on, so we explicitly say `no'. - lt_cv_sys_dlopen_deplibs=no - ;; - osf5.0|osf5.0a|osf5.1) - # dlopen *does* load deplibs and with the right loader patch applied - # it even uses RPATH in a shared library to search for shared objects - # that the library depends on, but there's no easy way to know if that - # patch is installed. Since this is the case, all we can really - # say is unknown -- it depends on the patch being installed. If - # it is, this changes to `yes'. Without it, it would be `no'. - lt_cv_sys_dlopen_deplibs=unknown - ;; - osf*) - # the two cases above should catch all versions of osf <= 5.1. Read - # the comments above for what we know about them. - # At > 5.1, deplibs are loaded *and* any RPATH in a shared library - # is used to find them so we can finally say `yes'. - lt_cv_sys_dlopen_deplibs=yes - ;; - qnx*) - lt_cv_sys_dlopen_deplibs=yes - ;; - solaris*) - lt_cv_sys_dlopen_deplibs=yes - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - esac - ]) -if test "$lt_cv_sys_dlopen_deplibs" != yes; then - AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], - [Define if the OS needs help to load dependent libraries for dlopen().]) -fi -])# LT_SYS_DLOPEN_DEPLIBS - -# Old name: -AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], []) - - -# LT_SYS_MODULE_EXT -# ----------------- -AC_DEFUN([LT_SYS_MODULE_EXT], -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl -AC_CACHE_CHECK([which extension is used for runtime loadable modules], - [libltdl_cv_shlibext], -[ -module=yes -eval libltdl_cv_shlibext=$shrext_cmds - ]) -if test -n "$libltdl_cv_shlibext"; then - m4_pattern_allow([LT_MODULE_EXT])dnl - AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], - [Define to the extension used for runtime loadable modules, say, ".so".]) -fi -])# LT_SYS_MODULE_EXT - -# Old name: -AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SHLIBEXT], []) - - -# LT_SYS_MODULE_PATH -# ------------------ -AC_DEFUN([LT_SYS_MODULE_PATH], -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl -AC_CACHE_CHECK([which variable specifies run-time module search path], - [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"]) -if test -n "$lt_cv_module_path_var"; then - m4_pattern_allow([LT_MODULE_PATH_VAR])dnl - AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], - [Define to the name of the environment variable that determines the run-time module search path.]) -fi -])# LT_SYS_MODULE_PATH - -# Old name: -AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SHLIBPATH], []) - - -# LT_SYS_DLSEARCH_PATH -# -------------------- -AC_DEFUN([LT_SYS_DLSEARCH_PATH], -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl -AC_CACHE_CHECK([for the default library search path], - [lt_cv_sys_dlsearch_path], - [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"]) -if test -n "$lt_cv_sys_dlsearch_path"; then - sys_dlsearch_path= - for dir in $lt_cv_sys_dlsearch_path; do - if test -z "$sys_dlsearch_path"; then - sys_dlsearch_path="$dir" - else - sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir" - fi - done - m4_pattern_allow([LT_DLSEARCH_PATH])dnl - AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"], - [Define to the system default library search path.]) -fi -])# LT_SYS_DLSEARCH_PATH - -# Old name: -AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], []) - - -# _LT_CHECK_DLPREOPEN -# ------------------- -m4_defun([_LT_CHECK_DLPREOPEN], -[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], - [libltdl_cv_preloaded_symbols], - [if test -n "$lt_cv_sys_global_symbol_pipe"; then - libltdl_cv_preloaded_symbols=yes - else - libltdl_cv_preloaded_symbols=no - fi - ]) -if test x"$libltdl_cv_preloaded_symbols" = xyes; then - AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1], - [Define if libtool can extract symbol lists from object files.]) -fi -])# _LT_CHECK_DLPREOPEN - - -# LT_LIB_DLLOAD -# ------------- -AC_DEFUN([LT_LIB_DLLOAD], -[m4_pattern_allow([^LT_DLLOADERS$]) -LT_DLLOADERS= -AC_SUBST([LT_DLLOADERS]) - -AC_LANG_PUSH([C]) - -LIBADD_DLOPEN= -AC_SEARCH_LIBS([dlopen], [dl], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - if test "$ac_cv_search_dlopen" != "none required" ; then - LIBADD_DLOPEN="-ldl" - fi - libltdl_cv_lib_dl_dlopen="yes" - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H -# include -#endif - ]], [[dlopen(0, 0);]])], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - libltdl_cv_func_dlopen="yes" - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], - [AC_CHECK_LIB([svld], [dlopen], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes" - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) -if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes -then - lt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DLOPEN" - AC_CHECK_FUNCS([dlerror]) - LIBS="$lt_save_LIBS" -fi -AC_SUBST([LIBADD_DLOPEN]) - -LIBADD_SHL_LOAD= -AC_CHECK_FUNC([shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"], - [AC_CHECK_LIB([dld], [shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" - LIBADD_SHL_LOAD="-ldld"])]) -AC_SUBST([LIBADD_SHL_LOAD]) - -case $host_os in -darwin[[1567]].*) -# We only want this for pre-Mac OS X 10.4. - AC_CHECK_FUNC([_dyld_func_lookup], - [AC_DEFINE([HAVE_DYLD], [1], - [Define if you have the _dyld_func_lookup function.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"]) - ;; -beos*) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" - ;; -cygwin* | mingw* | os2* | pw32*) - AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include ]]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" - ;; -esac - -AC_CHECK_LIB([dld], [dld_link], - [AC_DEFINE([HAVE_DLD], [1], - [Define if you have the GNU dld library.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"]) -AC_SUBST([LIBADD_DLD_LINK]) - -m4_pattern_allow([^LT_DLPREOPEN$]) -LT_DLPREOPEN= -if test -n "$LT_DLLOADERS" -then - for lt_loader in $LT_DLLOADERS; do - LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader " - done - AC_DEFINE([HAVE_LIBDLLOADER], [1], - [Define if libdlloader will be built on this platform]) -fi -AC_SUBST([LT_DLPREOPEN]) - -dnl This isn't used anymore, but set it for backwards compatibility -LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD" -AC_SUBST([LIBADD_DL]) - -AC_LANG_POP -])# LT_LIB_DLLOAD - -# Old name: -AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_DLLIB], []) - - -# LT_SYS_SYMBOL_USCORE -# -------------------- -# does the compiler prefix global symbols with an underscore? -AC_DEFUN([LT_SYS_SYMBOL_USCORE], -[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -AC_CACHE_CHECK([for _ prefix in compiled symbols], - [lt_cv_sys_symbol_underscore], - [lt_cv_sys_symbol_underscore=no - cat > conftest.$ac_ext <<_LT_EOF -void nm_test_func(){} -int main(){nm_test_func;return 0;} -_LT_EOF - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - ac_nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then - lt_cv_sys_symbol_underscore=yes - else - if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD - fi - fi - else - echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.c >&AS_MESSAGE_LOG_FD - fi - rm -rf conftest* - ]) - sys_symbol_underscore=$lt_cv_sys_symbol_underscore - AC_SUBST([sys_symbol_underscore]) -])# LT_SYS_SYMBOL_USCORE - -# Old name: -AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], []) - - -# LT_FUNC_DLSYM_USCORE -# -------------------- -AC_DEFUN([LT_FUNC_DLSYM_USCORE], -[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl -if test x"$lt_cv_sys_symbol_underscore" = xyes; then - if test x"$libltdl_cv_func_dlopen" = xyes || - test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then - AC_CACHE_CHECK([whether we have to add an underscore for dlsym], - [libltdl_cv_need_uscore], - [libltdl_cv_need_uscore=unknown - save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DLOPEN" - _LT_TRY_DLOPEN_SELF( - [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], - [], [libltdl_cv_need_uscore=cross]) - LIBS="$save_LIBS" - ]) - fi -fi - -if test x"$libltdl_cv_need_uscore" = xyes; then - AC_DEFINE([NEED_USCORE], [1], - [Define if dlsym() requires a leading underscore in symbol names.]) -fi -])# LT_FUNC_DLSYM_USCORE - -# Old name: -AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], []) - diff --git a/acinclude/smpeg2.m4 b/acinclude/smpeg2.m4 deleted file mode 100644 index e0f045a..0000000 --- a/acinclude/smpeg2.m4 +++ /dev/null @@ -1,176 +0,0 @@ -# Configure paths for SMPEG -# Nicolas Vignal 11/19/2000 -# stolen from Sam Lantinga -# stolen from Manish Singh -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_SMPEG2([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS -dnl -AC_DEFUN([AM_PATH_SMPEG2], -[dnl -dnl Get the cflags and libraries from the smpeg2-config script -dnl -AC_ARG_WITH([smpeg-prefix], - AS_HELP_STRING([--with-smpeg-prefix=PFX], - [Prefix where SMPEG is installed (optional)]), - [smpeg_prefix="$withval"], [smpeg_prefix=""]) -AC_ARG_WITH([smpeg-exec-prefix], - AS_HELP_STRING([--with-smpeg-exec-prefix=PFX], - [Exec prefix where SMPEG is installed (optional)]), - [smpeg_exec_prefix="$withval"], [smpeg_exec_prefix=""]) -AC_ARG_ENABLE([smpegtest], - AS_HELP_STRING([--disable-smpegtest], - [Do not try to compile and run a test SMPEG program]), - [], [enable_smpegtest=yes]) - - if test x$smpeg_exec_prefix != x ; then - smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix" - if test x${SMPEG_CONFIG+set} != xset ; then - SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg2-config - fi - fi - if test x$smpeg_prefix != x ; then - smpeg_args="$smpeg_args --prefix=$smpeg_prefix" - if test x${SMPEG_CONFIG+set} != xset ; then - SMPEG_CONFIG=$smpeg_prefix/bin/smpeg2-config - fi - fi - - AC_PATH_PROG([SMPEG_CONFIG], [smpeg2-config], [no]) - min_smpeg_version=ifelse([$1], [], [2.0.0], [$1]) - AC_MSG_CHECKING([for SMPEG - version >= $min_smpeg_version]) - no_smpeg="" - if test "$SMPEG_CONFIG" = "no" ; then - no_smpeg=yes - else - SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags` - SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs` - - smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_smpegtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" -dnl -dnl Now check if the installed SMPEG is sufficiently new. (Also sanity -dnl checks the results of smpeg2-config to some extent -dnl - rm -f conf.smpegtest - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#include -#include -#include "smpeg.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.smpegtest"); - */ - { FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_smpeg_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_smpeg_version"); - exit(1); - } - - if (($smpeg_major_version > major) || - (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) || - (($smpeg_major_version == major) && ($smpeg_minor_version == minor) && ($smpeg_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'smpeg2-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version); - printf("*** of SMPEG required is %d.%d.%d. If smpeg2-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If smpeg2-config was wrong, set the environment variable SMPEG_CONFIG\n"); - printf("*** to point to the correct copy of smpeg2-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -]])],[],[no_smpeg=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_smpeg" = x ; then - AC_MSG_RESULT([yes]) - ifelse([$2], [], [:], [$2]) - else - AC_MSG_RESULT([no]) - if test "$SMPEG_CONFIG" = "no" ; then - echo "*** The smpeg2-config script installed by SMPEG could not be found" - echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SMPEG_CONFIG environment variable to the" - echo "*** full path to smpeg2-config." - else - if test -f conf.smpegtest ; then - : - else - echo "*** Could not run SMPEG test program, checking why..." - CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include -#include "smpeg.h" -]], - [[ return 0; ]])], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SMPEG or finding the wrong" - echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SMPEG was incorrectly installed" - echo "*** or that you have moved SMPEG since it was installed. In the latter case, you" - echo "*** may want to edit the smpeg2-config script: $SMPEG_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SMPEG_CFLAGS="" - SMPEG_LIBS="" - ifelse([$3], [], [:], [$3]) - fi - AC_SUBST([SMPEG_CFLAGS]) - AC_SUBST([SMPEG_LIBS]) - rm -f conf.smpegtest -]) diff --git a/aclocal.m4 b/aclocal.m4 index da031aa..2189f73 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -7372,812 +7372,6 @@ ]) ############################################################################## -# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- -# -# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Thomas Tanner, 1999 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 17 LTDL_INIT - -# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) -# ------------------------------------------ -# DIRECTORY contains the libltdl sources. It is okay to call this -# function multiple times, as long as the same DIRECTORY is always given. -AC_DEFUN([LT_CONFIG_LTDL_DIR], -[AC_BEFORE([$0], [LTDL_INIT]) -_$0($*) -])# LT_CONFIG_LTDL_DIR - -# We break this out into a separate macro, so that we can call it safely -# internally without being caught accidentally by the sed scan in libtoolize. -m4_defun([_LT_CONFIG_LTDL_DIR], -[dnl remove trailing slashes -m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$])) -m4_case(_LTDL_DIR, - [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.' - m4_if(_ARG_DIR, [.], - [], - [m4_define([_LTDL_DIR], _ARG_DIR) - _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])], - [m4_if(_ARG_DIR, _LTDL_DIR, - [], - [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])]) -m4_popdef([_ARG_DIR]) -])# _LT_CONFIG_LTDL_DIR - -# Initialise: -m4_define([_LTDL_DIR], []) - - -# _LT_BUILD_PREFIX -# ---------------- -# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise -# to `${top_builddir}/'. -m4_define([_LT_BUILD_PREFIX], -[m4_ifdef([AC_AUTOCONF_VERSION], - [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]), - [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX], - [${top_build_prefix}], - [${top_builddir}/])], - [${top_build_prefix}])], - [${top_builddir}/])[]dnl -]) - - -# LTDL_CONVENIENCE -# ---------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with -# '${top_build_prefix}' if available, otherwise with '${top_builddir}/', -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single -# quotes!). If your package is not flat and you're not using automake, -# define top_build_prefix, top_builddir, and top_srcdir appropriately -# in your Makefiles. -AC_DEFUN([LTDL_CONVENIENCE], -[AC_BEFORE([$0], [LTDL_INIT])dnl -dnl Although the argument is deprecated and no longer documented, -dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one -dnl here make sure it is the same as any other declaration of libltdl's -dnl location! This also ensures lt_ltdl_dir is set when configure.ac is -dnl not yet using an explicit LT_CONFIG_LTDL_DIR. -m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl -_$0() -])# LTDL_CONVENIENCE - -# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools, -# now we have LT_CONFIG_LTDL_DIR: -AU_DEFUN([AC_LIBLTDL_CONVENIENCE], -[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) -_LTDL_CONVENIENCE]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], []) - - -# _LTDL_CONVENIENCE -# ----------------- -# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]). -m4_defun([_LTDL_CONVENIENCE], -[case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -esac -LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la" -LTDLDEPS=$LIBLTDL -LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" - -AC_SUBST([LIBLTDL]) -AC_SUBST([LTDLDEPS]) -AC_SUBST([LTDLINCL]) - -# For backwards non-gettext consistent compatibility... -INCLTDL="$LTDLINCL" -AC_SUBST([INCLTDL]) -])# _LTDL_CONVENIENCE - - -# LTDL_INSTALLABLE -# ---------------- -# sets LIBLTDL to the link flags for the libltdl installable library -# and LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl -# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if -# available, otherwise with '${top_builddir}/', and LTDLINCL will be -# prefixed with '${top_srcdir}/' (note the single quotes!). If your -# package is not flat and you're not using automake, define top_build_prefix, -# top_builddir, and top_srcdir appropriately in your Makefiles. -# In the future, this macro may have to be called after LT_INIT. -AC_DEFUN([LTDL_INSTALLABLE], -[AC_BEFORE([$0], [LTDL_INIT])dnl -dnl Although the argument is deprecated and no longer documented, -dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one -dnl here make sure it is the same as any other declaration of libltdl's -dnl location! This also ensures lt_ltdl_dir is set when configure.ac is -dnl not yet using an explicit LT_CONFIG_LTDL_DIR. -m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl -_$0() -])# LTDL_INSTALLABLE - -# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools, -# now we have LT_CONFIG_LTDL_DIR: -AU_DEFUN([AC_LIBLTDL_INSTALLABLE], -[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) -_LTDL_INSTALLABLE]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], []) - - -# _LTDL_INSTALLABLE -# ----------------- -# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]). -m4_defun([_LTDL_INSTALLABLE], -[if test -f $prefix/lib/libltdl.la; then - lt_save_LDFLAGS="$LDFLAGS" - LDFLAGS="-L$prefix/lib $LDFLAGS" - AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes]) - LDFLAGS="$lt_save_LDFLAGS" - if test x"${lt_lib_ltdl-no}" = xyes; then - if test x"$enable_ltdl_install" != xyes; then - # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install - AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install']) - enable_ltdl_install=no - fi - elif test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - fi -fi - -# If configure.ac declared an installable ltdl, and the user didn't override -# with --disable-ltdl-install, we will install the shipped libltdl. -case $enable_ltdl_install in - no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLDEPS= - LTDLINCL= - ;; - *) enable_ltdl_install=yes - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la" - LTDLDEPS=$LIBLTDL - LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" - ;; -esac - -AC_SUBST([LIBLTDL]) -AC_SUBST([LTDLDEPS]) -AC_SUBST([LTDLINCL]) - -# For backwards non-gettext consistent compatibility... -INCLTDL="$LTDLINCL" -AC_SUBST([INCLTDL]) -])# LTDL_INSTALLABLE - - -# _LTDL_MODE_DISPATCH -# ------------------- -m4_define([_LTDL_MODE_DISPATCH], -[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself: -m4_if(_LTDL_DIR, [], - [], - dnl if _LTDL_MODE was not set already, the default value is `subproject': - [m4_case(m4_default(_LTDL_MODE, [subproject]), - [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR) - _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], - [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])], - [recursive], [], - [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl -dnl Be careful not to expand twice: -m4_define([$0], []) -])# _LTDL_MODE_DISPATCH - - -# _LT_LIBOBJ(MODULE_NAME) -# ----------------------- -# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead -# of into LIBOBJS. -AC_DEFUN([_LT_LIBOBJ], [ - m4_pattern_allow([^_LT_LIBOBJS$]) - _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" -])# _LT_LIBOBJS - - -# LTDL_INIT([OPTIONS]) -# -------------------- -# Clients of libltdl can use this macro to allow the installer to -# choose between a shipped copy of the ltdl sources or a preinstalled -# version of the library. If the shipped ltdl sources are not in a -# subdirectory named libltdl, the directory name must be given by -# LT_CONFIG_LTDL_DIR. -AC_DEFUN([LTDL_INIT], -[dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -dnl We need to keep our own list of libobjs separate from our parent project, -dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while -dnl we look for our own LIBOBJs. -m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) -m4_pushdef([AC_LIBSOURCES]) - -dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: -m4_if(_LTDL_MODE, [], - [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) - m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], - [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) - -AC_ARG_WITH([included_ltdl], - [AS_HELP_STRING([--with-included-ltdl], - [use the GNU ltdl sources included here])]) - -if test "x$with_included_ltdl" != xyes; then - # We are not being forced to use the included libltdl sources, so - # decide whether there is a useful installed version we can use. - AC_CHECK_HEADER([ltdl.h], - [AC_CHECK_DECL([lt_dlinterface_register], - [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], - [with_included_ltdl=no], - [with_included_ltdl=yes])], - [with_included_ltdl=yes], - [AC_INCLUDES_DEFAULT - #include ])], - [with_included_ltdl=yes], - [AC_INCLUDES_DEFAULT] - ) -fi - -dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE -dnl was called yet, then for old times' sake, we assume libltdl is in an -dnl eponymous directory: -AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])]) - -AC_ARG_WITH([ltdl_include], - [AS_HELP_STRING([--with-ltdl-include=DIR], - [use the ltdl headers installed in DIR])]) - -if test -n "$with_ltdl_include"; then - if test -f "$with_ltdl_include/ltdl.h"; then : - else - AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include']) - fi -else - with_ltdl_include=no -fi - -AC_ARG_WITH([ltdl_lib], - [AS_HELP_STRING([--with-ltdl-lib=DIR], - [use the libltdl.la installed in DIR])]) - -if test -n "$with_ltdl_lib"; then - if test -f "$with_ltdl_lib/libltdl.la"; then : - else - AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) - fi -else - with_ltdl_lib=no -fi - -case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in - ,yes,no,no,) - m4_case(m4_default(_LTDL_TYPE, [convenience]), - [convenience], [_LTDL_CONVENIENCE], - [installable], [_LTDL_INSTALLABLE], - [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)]) - ;; - ,no,no,no,) - # If the included ltdl is not to be used, then use the - # preinstalled libltdl we found. - AC_DEFINE([HAVE_LTDL], [1], - [Define this if a modern libltdl is already installed]) - LIBLTDL=-lltdl - LTDLDEPS= - LTDLINCL= - ;; - ,no*,no,*) - AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together]) - ;; - *) with_included_ltdl=no - LIBLTDL="-L$with_ltdl_lib -lltdl" - LTDLDEPS= - LTDLINCL="-I$with_ltdl_include" - ;; -esac -INCLTDL="$LTDLINCL" - -# Report our decision... -AC_MSG_CHECKING([where to find libltdl headers]) -AC_MSG_RESULT([$LTDLINCL]) -AC_MSG_CHECKING([where to find libltdl library]) -AC_MSG_RESULT([$LIBLTDL]) - -_LTDL_SETUP - -dnl restore autoconf definition. -m4_popdef([AC_LIBOBJ]) -m4_popdef([AC_LIBSOURCES]) - -AC_CONFIG_COMMANDS_PRE([ - _ltdl_libobjs= - _ltdl_ltlibobjs= - if test -n "$_LT_LIBOBJS"; then - # Remove the extension. - _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do - _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" - _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" - done - fi - AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs]) - AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs]) -]) - -# Only expand once: -m4_define([LTDL_INIT]) -])# LTDL_INIT - -# Old names: -AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)]) -AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)]) -AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIB_LTDL], []) -dnl AC_DEFUN([AC_WITH_LTDL], []) -dnl AC_DEFUN([LT_WITH_LTDL], []) - - -# _LTDL_SETUP -# ----------- -# Perform all the checks necessary for compilation of the ltdl objects -# -- including compiler checks and header checks. This is a public -# interface mainly for the benefit of libltdl's own configure.ac, most -# other users should call LTDL_INIT instead. -AC_DEFUN([_LTDL_SETUP], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_SYS_MODULE_EXT])dnl -AC_REQUIRE([LT_SYS_MODULE_PATH])dnl -AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl -AC_REQUIRE([LT_LIB_DLLOAD])dnl -AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl -AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl -AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl -AC_REQUIRE([gl_FUNC_ARGZ])dnl - -m4_require([_LT_CHECK_OBJDIR])dnl -m4_require([_LT_HEADER_DLFCN])dnl -m4_require([_LT_CHECK_DLPREOPEN])dnl -m4_require([_LT_DECL_SED])dnl - -dnl Don't require this, or it will be expanded earlier than the code -dnl that sets the variables it relies on: -_LT_ENABLE_INSTALL - -dnl _LTDL_MODE specific code must be called at least once: -_LTDL_MODE_DISPATCH - -# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS -# the user used. This is so that ltdl.h can pick up the parent projects -# config.h file, The first file in AC_CONFIG_HEADERS must contain the -# definitions required by ltdl.c. -# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility). -AC_CONFIG_COMMANDS_PRE([dnl -m4_pattern_allow([^LT_CONFIG_H$])dnl -m4_ifset([AH_HEADER], - [LT_CONFIG_H=AH_HEADER], - [m4_ifset([AC_LIST_HEADERS], - [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`], - [])])]) -AC_SUBST([LT_CONFIG_H]) - -AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h], - [], [], [AC_INCLUDES_DEFAULT]) - -AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) -AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) - -AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) - -name=ltdl -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` -AC_SUBST([LTDLOPEN]) -])# _LTDL_SETUP - - -# _LT_ENABLE_INSTALL -# ------------------ -m4_define([_LT_ENABLE_INSTALL], -[AC_ARG_ENABLE([ltdl-install], - [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])]) - -case ,${enable_ltdl_install},${enable_ltdl_convenience} in - *yes*) ;; - *) enable_ltdl_convenience=yes ;; -esac - -m4_ifdef([AM_CONDITIONAL], -[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno) - AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)]) -])# _LT_ENABLE_INSTALL - - -# LT_SYS_DLOPEN_DEPLIBS -# --------------------- -AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_CACHE_CHECK([whether deplibs are loaded by dlopen], - [lt_cv_sys_dlopen_deplibs], - [# PORTME does your system automatically load deplibs for dlopen? - # or its logical equivalent (e.g. shl_load for HP-UX < 11) - # For now, we just catch OSes we know something about -- in the - # future, we'll try test this programmatically. - lt_cv_sys_dlopen_deplibs=unknown - case $host_os in - aix3*|aix4.1.*|aix4.2.*) - # Unknown whether this is true for these versions of AIX, but - # we want this `case' here to explicitly catch those versions. - lt_cv_sys_dlopen_deplibs=unknown - ;; - aix[[4-9]]*) - lt_cv_sys_dlopen_deplibs=yes - ;; - amigaos*) - case $host_cpu in - powerpc) - lt_cv_sys_dlopen_deplibs=no - ;; - esac - ;; - darwin*) - # Assuming the user has installed a libdl from somewhere, this is true - # If you are looking for one http://www.opendarwin.org/projects/dlcompat - lt_cv_sys_dlopen_deplibs=yes - ;; - freebsd* | dragonfly*) - lt_cv_sys_dlopen_deplibs=yes - ;; - gnu* | linux* | k*bsd*-gnu) - # GNU and its variants, using gnu ld.so (Glibc) - lt_cv_sys_dlopen_deplibs=yes - ;; - hpux10*|hpux11*) - lt_cv_sys_dlopen_deplibs=yes - ;; - interix*) - lt_cv_sys_dlopen_deplibs=yes - ;; - irix[[12345]]*|irix6.[[01]]*) - # Catch all versions of IRIX before 6.2, and indicate that we don't - # know how it worked for any of those versions. - lt_cv_sys_dlopen_deplibs=unknown - ;; - irix*) - # The case above catches anything before 6.2, and it's known that - # at 6.2 and later dlopen does load deplibs. - lt_cv_sys_dlopen_deplibs=yes - ;; - netbsd*) - lt_cv_sys_dlopen_deplibs=yes - ;; - openbsd*) - lt_cv_sys_dlopen_deplibs=yes - ;; - osf[[1234]]*) - # dlopen did load deplibs (at least at 4.x), but until the 5.x series, - # it did *not* use an RPATH in a shared library to find objects the - # library depends on, so we explicitly say `no'. - lt_cv_sys_dlopen_deplibs=no - ;; - osf5.0|osf5.0a|osf5.1) - # dlopen *does* load deplibs and with the right loader patch applied - # it even uses RPATH in a shared library to search for shared objects - # that the library depends on, but there's no easy way to know if that - # patch is installed. Since this is the case, all we can really - # say is unknown -- it depends on the patch being installed. If - # it is, this changes to `yes'. Without it, it would be `no'. - lt_cv_sys_dlopen_deplibs=unknown - ;; - osf*) - # the two cases above should catch all versions of osf <= 5.1. Read - # the comments above for what we know about them. - # At > 5.1, deplibs are loaded *and* any RPATH in a shared library - # is used to find them so we can finally say `yes'. - lt_cv_sys_dlopen_deplibs=yes - ;; - qnx*) - lt_cv_sys_dlopen_deplibs=yes - ;; - solaris*) - lt_cv_sys_dlopen_deplibs=yes - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - esac - ]) -if test "$lt_cv_sys_dlopen_deplibs" != yes; then - AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], - [Define if the OS needs help to load dependent libraries for dlopen().]) -fi -])# LT_SYS_DLOPEN_DEPLIBS - -# Old name: -AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], []) - - -# LT_SYS_MODULE_EXT -# ----------------- -AC_DEFUN([LT_SYS_MODULE_EXT], -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl -AC_CACHE_CHECK([which extension is used for runtime loadable modules], - [libltdl_cv_shlibext], -[ -module=yes -eval libltdl_cv_shlibext=$shrext_cmds - ]) -if test -n "$libltdl_cv_shlibext"; then - m4_pattern_allow([LT_MODULE_EXT])dnl - AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], - [Define to the extension used for runtime loadable modules, say, ".so".]) -fi -])# LT_SYS_MODULE_EXT - -# Old name: -AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SHLIBEXT], []) - - -# LT_SYS_MODULE_PATH -# ------------------ -AC_DEFUN([LT_SYS_MODULE_PATH], -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl -AC_CACHE_CHECK([which variable specifies run-time module search path], - [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"]) -if test -n "$lt_cv_module_path_var"; then - m4_pattern_allow([LT_MODULE_PATH_VAR])dnl - AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], - [Define to the name of the environment variable that determines the run-time module search path.]) -fi -])# LT_SYS_MODULE_PATH - -# Old name: -AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SHLIBPATH], []) - - -# LT_SYS_DLSEARCH_PATH -# -------------------- -AC_DEFUN([LT_SYS_DLSEARCH_PATH], -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl -AC_CACHE_CHECK([for the default library search path], - [lt_cv_sys_dlsearch_path], - [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"]) -if test -n "$lt_cv_sys_dlsearch_path"; then - sys_dlsearch_path= - for dir in $lt_cv_sys_dlsearch_path; do - if test -z "$sys_dlsearch_path"; then - sys_dlsearch_path="$dir" - else - sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir" - fi - done - m4_pattern_allow([LT_DLSEARCH_PATH])dnl - AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"], - [Define to the system default library search path.]) -fi -])# LT_SYS_DLSEARCH_PATH - -# Old name: -AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], []) - - -# _LT_CHECK_DLPREOPEN -# ------------------- -m4_defun([_LT_CHECK_DLPREOPEN], -[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], - [libltdl_cv_preloaded_symbols], - [if test -n "$lt_cv_sys_global_symbol_pipe"; then - libltdl_cv_preloaded_symbols=yes - else - libltdl_cv_preloaded_symbols=no - fi - ]) -if test x"$libltdl_cv_preloaded_symbols" = xyes; then - AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1], - [Define if libtool can extract symbol lists from object files.]) -fi -])# _LT_CHECK_DLPREOPEN - - -# LT_LIB_DLLOAD -# ------------- -AC_DEFUN([LT_LIB_DLLOAD], -[m4_pattern_allow([^LT_DLLOADERS$]) -LT_DLLOADERS= -AC_SUBST([LT_DLLOADERS]) - -AC_LANG_PUSH([C]) - -LIBADD_DLOPEN= -AC_SEARCH_LIBS([dlopen], [dl], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - if test "$ac_cv_search_dlopen" != "none required" ; then - LIBADD_DLOPEN="-ldl" - fi - libltdl_cv_lib_dl_dlopen="yes" - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H -# include -#endif - ]], [[dlopen(0, 0);]])], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - libltdl_cv_func_dlopen="yes" - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], - [AC_CHECK_LIB([svld], [dlopen], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) - LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes" - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) -if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes -then - lt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DLOPEN" - AC_CHECK_FUNCS([dlerror]) - LIBS="$lt_save_LIBS" -fi -AC_SUBST([LIBADD_DLOPEN]) - -LIBADD_SHL_LOAD= -AC_CHECK_FUNC([shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"], - [AC_CHECK_LIB([dld], [shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" - LIBADD_SHL_LOAD="-ldld"])]) -AC_SUBST([LIBADD_SHL_LOAD]) - -case $host_os in -darwin[[1567]].*) -# We only want this for pre-Mac OS X 10.4. - AC_CHECK_FUNC([_dyld_func_lookup], - [AC_DEFINE([HAVE_DYLD], [1], - [Define if you have the _dyld_func_lookup function.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"]) - ;; -beos*) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" - ;; -cygwin* | mingw* | os2* | pw32*) - AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include ]]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" - ;; -esac - -AC_CHECK_LIB([dld], [dld_link], - [AC_DEFINE([HAVE_DLD], [1], - [Define if you have the GNU dld library.]) - LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"]) -AC_SUBST([LIBADD_DLD_LINK]) - -m4_pattern_allow([^LT_DLPREOPEN$]) -LT_DLPREOPEN= -if test -n "$LT_DLLOADERS" -then - for lt_loader in $LT_DLLOADERS; do - LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader " - done - AC_DEFINE([HAVE_LIBDLLOADER], [1], - [Define if libdlloader will be built on this platform]) -fi -AC_SUBST([LT_DLPREOPEN]) - -dnl This isn't used anymore, but set it for backwards compatibility -LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD" -AC_SUBST([LIBADD_DL]) - -AC_LANG_POP -])# LT_LIB_DLLOAD - -# Old name: -AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_DLLIB], []) - - -# LT_SYS_SYMBOL_USCORE -# -------------------- -# does the compiler prefix global symbols with an underscore? -AC_DEFUN([LT_SYS_SYMBOL_USCORE], -[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -AC_CACHE_CHECK([for _ prefix in compiled symbols], - [lt_cv_sys_symbol_underscore], - [lt_cv_sys_symbol_underscore=no - cat > conftest.$ac_ext <<_LT_EOF -void nm_test_func(){} -int main(){nm_test_func;return 0;} -_LT_EOF - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - ac_nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then - lt_cv_sys_symbol_underscore=yes - else - if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD - fi - fi - else - echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.c >&AS_MESSAGE_LOG_FD - fi - rm -rf conftest* - ]) - sys_symbol_underscore=$lt_cv_sys_symbol_underscore - AC_SUBST([sys_symbol_underscore]) -])# LT_SYS_SYMBOL_USCORE - -# Old name: -AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], []) - - -# LT_FUNC_DLSYM_USCORE -# -------------------- -AC_DEFUN([LT_FUNC_DLSYM_USCORE], -[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl -if test x"$lt_cv_sys_symbol_underscore" = xyes; then - if test x"$libltdl_cv_func_dlopen" = xyes || - test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then - AC_CACHE_CHECK([whether we have to add an underscore for dlsym], - [libltdl_cv_need_uscore], - [libltdl_cv_need_uscore=unknown - save_LIBS="$LIBS" - LIBS="$LIBS $LIBADD_DLOPEN" - _LT_TRY_DLOPEN_SELF( - [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], - [], [libltdl_cv_need_uscore=cross]) - LIBS="$save_LIBS" - ]) - fi -fi - -if test x"$libltdl_cv_need_uscore" = xyes; then - AC_DEFINE([NEED_USCORE], [1], - [Define if dlsym() requires a leading underscore in symbol names.]) -fi -])# LT_FUNC_DLSYM_USCORE - -# Old name: -AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], []) - -############################################################################## # Helper functions for option handling. -*- Autoconf -*- # # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. @@ -9149,179 +8343,3 @@ AC_SUBST(SDL_LIBS) rm -f conf.sdltest ]) -# Configure paths for SMPEG -# Nicolas Vignal 11/19/2000 -# stolen from Sam Lantinga -# stolen from Manish Singh -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_SMPEG2([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS -dnl -AC_DEFUN([AM_PATH_SMPEG2], -[dnl -dnl Get the cflags and libraries from the smpeg2-config script -dnl -AC_ARG_WITH([smpeg-prefix], - AS_HELP_STRING([--with-smpeg-prefix=PFX], - [Prefix where SMPEG is installed (optional)]), - [smpeg_prefix="$withval"], [smpeg_prefix=""]) -AC_ARG_WITH([smpeg-exec-prefix], - AS_HELP_STRING([--with-smpeg-exec-prefix=PFX], - [Exec prefix where SMPEG is installed (optional)]), - [smpeg_exec_prefix="$withval"], [smpeg_exec_prefix=""]) -AC_ARG_ENABLE([smpegtest], - AS_HELP_STRING([--disable-smpegtest], - [Do not try to compile and run a test SMPEG program]), - [], [enable_smpegtest=yes]) - - if test x$smpeg_exec_prefix != x ; then - smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix" - if test x${SMPEG_CONFIG+set} != xset ; then - SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg2-config - fi - fi - if test x$smpeg_prefix != x ; then - smpeg_args="$smpeg_args --prefix=$smpeg_prefix" - if test x${SMPEG_CONFIG+set} != xset ; then - SMPEG_CONFIG=$smpeg_prefix/bin/smpeg2-config - fi - fi - - AC_PATH_PROG([SMPEG_CONFIG], [smpeg2-config], [no]) - min_smpeg_version=ifelse([$1], [], [2.0.0], [$1]) - AC_MSG_CHECKING([for SMPEG - version >= $min_smpeg_version]) - no_smpeg="" - if test "$SMPEG_CONFIG" = "no" ; then - no_smpeg=yes - else - SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags` - SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs` - - smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_smpegtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" -dnl -dnl Now check if the installed SMPEG is sufficiently new. (Also sanity -dnl checks the results of smpeg2-config to some extent -dnl - rm -f conf.smpegtest - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#include -#include -#include "smpeg.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.smpegtest"); - */ - { FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_smpeg_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_smpeg_version"); - exit(1); - } - - if (($smpeg_major_version > major) || - (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) || - (($smpeg_major_version == major) && ($smpeg_minor_version == minor) && ($smpeg_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'smpeg2-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version); - printf("*** of SMPEG required is %d.%d.%d. If smpeg2-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If smpeg2-config was wrong, set the environment variable SMPEG_CONFIG\n"); - printf("*** to point to the correct copy of smpeg2-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -]])],[],[no_smpeg=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_smpeg" = x ; then - AC_MSG_RESULT([yes]) - ifelse([$2], [], [:], [$2]) - else - AC_MSG_RESULT([no]) - if test "$SMPEG_CONFIG" = "no" ; then - echo "*** The smpeg2-config script installed by SMPEG could not be found" - echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SMPEG_CONFIG environment variable to the" - echo "*** full path to smpeg2-config." - else - if test -f conf.smpegtest ; then - : - else - echo "*** Could not run SMPEG test program, checking why..." - CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include -#include "smpeg.h" -]], - [[ return 0; ]])], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SMPEG or finding the wrong" - echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SMPEG was incorrectly installed" - echo "*** or that you have moved SMPEG since it was installed. In the latter case, you" - echo "*** may want to edit the smpeg2-config script: $SMPEG_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SMPEG_CFLAGS="" - SMPEG_LIBS="" - ifelse([$3], [], [:], [$3]) - fi - AC_SUBST([SMPEG_CFLAGS]) - AC_SUBST([SMPEG_LIBS]) - rm -f conf.smpegtest -]) diff --git a/build-scripts/install-sh b/build-scripts/install-sh index 1a83534..377bb86 100755 --- a/build-scripts/install-sh +++ b/build-scripts/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-02-02.21 +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,42 +35,72 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. + +nl=' +' +IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog chowncmd= -chgrpcmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -80,108 +110,148 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " -while test -n "$1"; do +while test $# -ne 0; do case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done + --) shift break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; esac + shift done -if test -z "$1"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then if test -z "$dir_arg"; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src ;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -190,71 +260,194 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac + dst=$dst_arg # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi - pathcomp=$pathcomp/ - done + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -262,10 +455,9 @@ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -273,51 +465,63 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/build-scripts/mkinstalldirs b/build-scripts/mkinstalldirs index 8ab885e..55d537f 100755 --- a/build-scripts/mkinstalldirs +++ b/build-scripts/mkinstalldirs @@ -1,29 +1,59 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2009-04-28.21; # UTC + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . +nl=' +' +IFS=" "" $nl" errstatus=0 -dirmode="" +dirmode= usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac done for file @@ -36,64 +66,97 @@ done case $# in -0) exit 0 ;; + 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the 'mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because '.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac + for d + do + test "x$d" = x && continue - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac - mkdir "$pathcomp" || lasterr=$? + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" + mkdir "$pathcomp" || lasterr=$? - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr fi fi - fi + fi + fi - pathcomp="$pathcomp/" - done + pathcomp=$pathcomp/ + done done exit $errstatus # Local Variables: # mode: shell-script -# sh-indentation: 3 +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: -# mkinstalldirs ends here diff --git a/configure b/configure index 554ed55..4df0be5 100755 --- a/configure +++ b/configure @@ -781,9 +781,8 @@ VERSION_OBJECTS OBJECTS ac_aux_dir -SMPEG_LIBS -SMPEG_CFLAGS -SMPEG_CONFIG +OPUSFILE_LIBS +OPUSFILE_CFLAGS LIBMIKMOD_CONFIG MODPLUG_LIBS MODPLUG_CFLAGS @@ -913,15 +912,12 @@ enable_music_flac enable_music_flac_shared enable_music_mp3 -enable_music_mp3_smpeg -enable_music_mp3_smpeg_shared -with_smpeg_prefix -with_smpeg_exec_prefix -enable_smpegtest enable_music_mp3_mad_gpl enable_music_mp3_mad_gpl_dithering enable_music_mp3_mpg123 enable_music_mp3_mpg123_shared +enable_music_opus +enable_music_opus_shared ' ac_precious_vars='build_alias host_alias @@ -936,7 +932,9 @@ SDL_CFLAGS SDL_LIBS MODPLUG_CFLAGS -MODPLUG_LIBS' +MODPLUG_LIBS +OPUSFILE_CFLAGS +OPUSFILE_LIBS' # Initialize some variables set by options. @@ -1585,11 +1583,6 @@ --enable-music-flac-shared dynamically load FLAC library [[default=yes]] --enable-music-mp3 enable MP3 music [[default=yes]] - --enable-music-mp3-smpeg - enable MP3 music via smpeg [[default=no]] - --enable-music-mp3-smpeg-shared - dynamically load smpeg library [[default=yes]] - --disable-smpegtest Do not try to compile and run a test SMPEG program --enable-music-mp3-mad-gpl enable MP3 music via libmad GPL code [[default=no]] --enable-music-mp3-mad-gpl-dithering @@ -1598,6 +1591,9 @@ enable MP3 music via libmpg123 [[default=yes]] --enable-music-mp3-mpg123-shared dynamically load libmpg123 library [[default=yes]] + --enable-music-opus enable Opus music [[default=yes]] + --enable-music-opus-shared + dynamically load opusfile library [[default=yes]] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1607,9 +1603,6 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sdl-prefix=PFX Prefix where SDL is installed (optional) --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional) - --with-smpeg-prefix=PFX Prefix where SMPEG is installed (optional) - --with-smpeg-exec-prefix=PFX - Exec prefix where SMPEG is installed (optional) Some influential environment variables: CC C compiler command @@ -1627,6 +1620,10 @@ C compiler flags for MODPLUG, overriding pkg-config MODPLUG_LIBS linker flags for MODPLUG, overriding pkg-config + OPUSFILE_CFLAGS + C compiler flags for OPUSFILE, overriding pkg-config + OPUSFILE_LIBS + linker flags for OPUSFILE, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2448,9 +2445,9 @@ # MAJOR_VERSION=2 MINOR_VERSION=0 -MICRO_VERSION=2 -INTERFACE_AGE=0 -BINARY_AGE=2 +MICRO_VERSION=4 +INTERFACE_AGE=2 +BINARY_AGE=4 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION @@ -3930,13 +3927,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3933: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3930: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3936: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3933: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3939: output\"" >&5) + (eval echo "\"\$as_me:3936: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5147,7 +5144,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5150 "configure"' > conftest.$ac_ext + echo '#line 5147 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6977,11 +6974,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6980: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6977: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6984: \$? = $ac_status" >&5 + echo "$as_me:6981: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7316,11 +7313,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7319: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7316: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7323: \$? = $ac_status" >&5 + echo "$as_me:7320: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7421,11 +7418,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7424: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7421: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7428: \$? = $ac_status" >&5 + echo "$as_me:7425: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7476,11 +7473,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7479: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7476: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7483: \$? = $ac_status" >&5 + echo "$as_me:7480: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9845,7 +9842,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9848 "configure" +#line 9845 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9941,7 +9938,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9944 "configure" +#line 9941 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11862,7 +11859,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_modplug_ModPlug_Load" >&5 $as_echo "$ac_cv_lib_modplug_ModPlug_Load" >&6; } if test "x$ac_cv_lib_modplug_ModPlug_Load" = xyes; then : - have_libmodplug_lib=yes + have_libmodplug_lib=yes;MODPLUG_LIBS="-lmodplug" fi @@ -11910,7 +11907,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_modplug_ModPlug_Load" >&5 $as_echo "$ac_cv_lib_modplug_ModPlug_Load" >&6; } if test "x$ac_cv_lib_modplug_ModPlug_Load" = xyes; then : - have_libmodplug_lib=yes + have_libmodplug_lib=yes;MODPLUG_LIBS="-lmodplug" fi @@ -11973,6 +11970,8 @@ libmikmod_min=1 libmikmod_rev=10 libmikmod_ver="$libmikmod_maj.$libmikmod_min.$libmikmod_rev" + CFLAGS_SAVED="$CFLAGS" + LIBS_SAVED="$LIBS" # Extract the first word of "libmikmod-config", so it can be a program name with args. set dummy libmikmod-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -12015,9 +12014,6 @@ if test "$LIBMIKMOD_CONFIG" != "no" ; then - - CFLAGS_SAVED="$CFLAGS" - LIBS_SAVED="$LIBS" CFLAGS="$CFLAGS `$LIBMIKMOD_CONFIG --cflags`" LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`" have_libmikmod=yes @@ -12048,7 +12044,7 @@ if ac_fn_c_try_run "$LINENO"; then : else - have_libmikmod=no; CFLAGS="$CFLAGS_SAVED"; LIBS="$LIBS_SAVED" + have_libmikmod=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -12082,6 +12078,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find MikMod library (http://mikmod.raphnet.net/)" >&5 $as_echo "$as_me: WARNING: *** Unable to find MikMod library (http://mikmod.raphnet.net/)" >&2;} fi + LIBS="$LIBS_SAVED" + CFLAGS="$CFLAGS_SAVED" fi if test x$have_libmodplug != xyes -a x$have_libmikmod != xyes ; then @@ -12266,6 +12264,7 @@ fi if test x$enable_music_ogg = xyes; then + LIBS_SAVED="$LIBS" if test x$enable_music_ogg_tremor = xyes; then ac_fn_c_check_header_mongrel "$LINENO" "tremor/ivorbisfile.h" "ac_cv_header_tremor_ivorbisfile_h" "$ac_includes_default" if test "x$ac_cv_header_tremor_ivorbisfile_h" = xyes; then : @@ -12273,14 +12272,13 @@ fi - as_ac_Lib=`$as_echo "ac_cv_lib_vorbisidec -logg''_ov_open_callbacks" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ov_open_callbacks in -lvorbisidec -logg" >&5 -$as_echo_n "checking for ov_open_callbacks in -lvorbisidec -logg... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ov_open_callbacks in -lvorbisidec" >&5 +$as_echo_n "checking for ov_open_callbacks in -lvorbisidec... " >&6; } +if ${ac_cv_lib_vorbisidec_ov_open_callbacks+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lvorbisidec -logg $LIBS" +LIBS="-lvorbisidec -logg $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12300,18 +12298,17 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" + ac_cv_lib_vorbisidec_ov_open_callbacks=yes +else + ac_cv_lib_vorbisidec_ov_open_callbacks=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisidec_ov_open_callbacks" >&5 +$as_echo "$ac_cv_lib_vorbisidec_ov_open_callbacks" >&6; } +if test "x$ac_cv_lib_vorbisidec_ov_open_callbacks" = xyes; then : have_tremor_lib=yes fi @@ -12350,14 +12347,13 @@ fi - as_ac_Lib=`$as_echo "ac_cv_lib_vorbisfile -lvorbis -logg -lm''_ov_open_callbacks" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ov_open_callbacks in -lvorbisfile -lvorbis -logg -lm" >&5 -$as_echo_n "checking for ov_open_callbacks in -lvorbisfile -lvorbis -logg -lm... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ov_open_callbacks in -lvorbisfile" >&5 +$as_echo_n "checking for ov_open_callbacks in -lvorbisfile... " >&6; } +if ${ac_cv_lib_vorbisfile_ov_open_callbacks+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS" +LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12377,18 +12373,17 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" -else - eval "$as_ac_Lib=no" + ac_cv_lib_vorbisfile_ov_open_callbacks=yes +else + ac_cv_lib_vorbisfile_ov_open_callbacks=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbisfile_ov_open_callbacks" >&5 +$as_echo "$ac_cv_lib_vorbisfile_ov_open_callbacks" >&6; } +if test "x$ac_cv_lib_vorbisfile_ov_open_callbacks" = xyes; then : have_ogg_lib=yes fi @@ -12421,6 +12416,7 @@ $as_echo "$as_me: WARNING: Ogg Vorbis support disabled" >&2;} fi fi + LIBS="$LIBS_SAVED" fi libflac_ver=8 @@ -12566,287 +12562,6 @@ fi -# Check whether --enable-music-mp3-smpeg was given. -if test "${enable_music_mp3_smpeg+set}" = set; then : - enableval=$enable_music_mp3_smpeg; -else - enable_music_mp3_smpeg=no -fi - -# Check whether --enable-music-mp3-smpeg-shared was given. -if test "${enable_music_mp3_smpeg_shared+set}" = set; then : - enableval=$enable_music_mp3_smpeg_shared; -else - enable_music_mp3_smpeg_shared=yes -fi - -if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_smpeg = xyes; then - SMPEG_VERSION=2.0.0 - -# Check whether --with-smpeg-prefix was given. -if test "${with_smpeg_prefix+set}" = set; then : - withval=$with_smpeg_prefix; smpeg_prefix="$withval" -else - smpeg_prefix="" -fi - - -# Check whether --with-smpeg-exec-prefix was given. -if test "${with_smpeg_exec_prefix+set}" = set; then : - withval=$with_smpeg_exec_prefix; smpeg_exec_prefix="$withval" -else - smpeg_exec_prefix="" -fi - -# Check whether --enable-smpegtest was given. -if test "${enable_smpegtest+set}" = set; then : - enableval=$enable_smpegtest; -else - enable_smpegtest=yes -fi - - - if test x$smpeg_exec_prefix != x ; then - smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix" - if test x${SMPEG_CONFIG+set} != xset ; then - SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg2-config - fi - fi - if test x$smpeg_prefix != x ; then - smpeg_args="$smpeg_args --prefix=$smpeg_prefix" - if test x${SMPEG_CONFIG+set} != xset ; then - SMPEG_CONFIG=$smpeg_prefix/bin/smpeg2-config - fi - fi - - # Extract the first word of "smpeg2-config", so it can be a program name with args. -set dummy smpeg2-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_SMPEG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $SMPEG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SMPEG_CONFIG="$SMPEG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SMPEG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_SMPEG_CONFIG" && ac_cv_path_SMPEG_CONFIG="no" - ;; -esac -fi -SMPEG_CONFIG=$ac_cv_path_SMPEG_CONFIG -if test -n "$SMPEG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SMPEG_CONFIG" >&5 -$as_echo "$SMPEG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - min_smpeg_version=$SMPEG_VERSION - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMPEG - version >= $min_smpeg_version" >&5 -$as_echo_n "checking for SMPEG - version >= $min_smpeg_version... " >&6; } - no_smpeg="" - if test "$SMPEG_CONFIG" = "no" ; then - no_smpeg=yes - else - SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags` - SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs` - - smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_smpegtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" - rm -f conf.smpegtest - if test "$cross_compiling" = yes; then : - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -#include "smpeg.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.smpegtest"); - */ - { FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_smpeg_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_smpeg_version"); - exit(1); - } - - if (($smpeg_major_version > major) || - (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) || - (($smpeg_major_version == major) && ($smpeg_minor_version == minor) && ($smpeg_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'smpeg2-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version); - printf("*** of SMPEG required is %d.%d.%d. If smpeg2-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If smpeg2-config was wrong, set the environment variable SMPEG_CONFIG\n"); - printf("*** to point to the correct copy of smpeg2-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - no_smpeg=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_smpeg" = x ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_smpeg=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test "$SMPEG_CONFIG" = "no" ; then - echo "*** The smpeg2-config script installed by SMPEG could not be found" - echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SMPEG_CONFIG environment variable to the" - echo "*** full path to smpeg2-config." - else - if test -f conf.smpegtest ; then - : - else - echo "*** Could not run SMPEG test program, checking why..." - CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include "smpeg.h" - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SMPEG or finding the wrong" - echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SMPEG was incorrectly installed" - echo "*** or that you have moved SMPEG since it was installed. In the latter case, you" - echo "*** may want to edit the smpeg2-config script: $SMPEG_CONFIG" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SMPEG_CFLAGS="" - SMPEG_LIBS="" - have_smpeg=no - fi - - - rm -f conf.smpegtest - - if test x$have_smpeg = xyes; then - case "$host" in - *-*-darwin*) - smpeg_lib=`find_lib libsmpeg2.dylib` - ;; - *-*-cygwin* | *-*-mingw32*) - smpeg_lib=`find_lib "smpeg2*.dll"` - ;; - *) - smpeg_lib=`find_lib "libsmpeg2*.so.*"` - ;; - esac - EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS" - if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then - echo "-- dynamic libsmpeg -> $smpeg_lib" - EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\"" - else - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS" - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find SMPEG library (http://icculus.org/smpeg/)" >&5 -$as_echo "$as_me: WARNING: *** Unable to find SMPEG library (http://icculus.org/smpeg/)" >&2;} - fi -fi - # Check whether --enable-music-mp3-mad-gpl was given. if test "${enable_music_mp3_mad_gpl+set}" = set; then : enableval=$enable_music_mp3_mad_gpl; @@ -12889,10 +12604,10 @@ $as_echo "$have_libmad" >&6; } if test x$have_libmad = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD" - if test x$enable_music_mp3_mad_gpl_dithering = xyes; then + if test x$enable_music_mp3_mad_gpl_dithering = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Using GPL libmad and MP3 dithering routines, this build of SDL_mixer is now under the GPL" >&5 $as_echo "$as_me: WARNING: *** Using GPL libmad and MP3 dithering routines, this build of SDL_mixer is now under the GPL" >&2;} - EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD_GPL_DITHERING" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD_GPL_DITHERING" fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad" else @@ -12963,7 +12678,7 @@ fi if test x$have_mpg123_hdr = xyes -a x$have_mpg123_lib = xyes; then - have_mpg123=yes + have_libmpg123=yes case "$host" in *-*-darwin*) mpg123_lib=`find_lib libmpg123.dylib` @@ -12972,7 +12687,7 @@ mpg123_lib=`find_lib "libmpg123*.dll"` ;; *) - mpg123_lib=`find_lib "libmpg123.so.*"` + mpg123_lib=`find_lib "libmpg123.so.*"` ;; esac EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123" @@ -12990,11 +12705,224 @@ fi fi -if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then +if test x$have_libmad = xyes -o x$have_libmpg123 = xyes; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled" >&5 $as_echo "$as_me: WARNING: MP3 support disabled" >&2;} +fi + +# Check whether --enable-music-opus was given. +if test "${enable_music_opus+set}" = set; then : + enableval=$enable_music_opus; +else + enable_music_opus=yes +fi + + +# Check whether --enable-music-opus-shared was given. +if test "${enable_music_opus_shared+set}" = set; then : + enableval=$enable_music_opus_shared; +else + enable_music_opus_shared=yes +fi + +if test x$enable_music_opus = xyes; then + LIBS_SAVED="$LIBS" + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPUSFILE" >&5 +$as_echo_n "checking for OPUSFILE... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$OPUSFILE_CFLAGS"; then + pkg_cv_OPUSFILE_CFLAGS="$OPUSFILE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opusfile >= 0.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "opusfile >= 0.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPUSFILE_CFLAGS=`$PKG_CONFIG --cflags "opusfile >= 0.2" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$OPUSFILE_LIBS"; then + pkg_cv_OPUSFILE_LIBS="$OPUSFILE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opusfile >= 0.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "opusfile >= 0.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPUSFILE_LIBS=`$PKG_CONFIG --libs "opusfile >= 0.2" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + OPUSFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "opusfile >= 0.2"` + else + OPUSFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "opusfile >= 0.2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$OPUSFILE_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default" +if test "x$ac_cv_header_opus_opusfile_h" = xyes; then : + have_opusfile_hdr=yes +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_open_callbacks in -lopusfile" >&5 +$as_echo_n "checking for op_open_callbacks in -lopusfile... " >&6; } +if ${ac_cv_lib_opusfile_op_open_callbacks+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lopusfile -lopus -logg -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char op_open_callbacks (); +int +main () +{ +return op_open_callbacks (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_opusfile_op_open_callbacks=yes +else + ac_cv_lib_opusfile_op_open_callbacks=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5 +$as_echo "$ac_cv_lib_opusfile_op_open_callbacks" >&6; } +if test "x$ac_cv_lib_opusfile_op_open_callbacks" = xyes; then : + have_opusfile_lib=yes;OPUSFILE_LIBS="-lopusfile -lopus" +fi + + +elif test $pkg_failed = untried; then + ac_fn_c_check_header_mongrel "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default" +if test "x$ac_cv_header_opus_opusfile_h" = xyes; then : + have_opusfile_hdr=yes +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_open_callbacks in -lopusfile" >&5 +$as_echo_n "checking for op_open_callbacks in -lopusfile... " >&6; } +if ${ac_cv_lib_opusfile_op_open_callbacks+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lopusfile -lopus -logg -lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char op_open_callbacks (); +int +main () +{ +return op_open_callbacks (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_opusfile_op_open_callbacks=yes +else + ac_cv_lib_opusfile_op_open_callbacks=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5 +$as_echo "$ac_cv_lib_opusfile_op_open_callbacks" >&6; } +if test "x$ac_cv_lib_opusfile_op_open_callbacks" = xyes; then : + have_opusfile_lib=yes;OPUSFILE_LIBS="-lopusfile -lopus" +fi + + +else + OPUSFILE_CFLAGS=$pkg_cv_OPUSFILE_CFLAGS + OPUSFILE_LIBS=$pkg_cv_OPUSFILE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_opusfile_hdr=yes + have_opusfile_lib=yes + +fi + LIBS="$LIBS_SAVED" + + if test x$have_opusfile_hdr = xyes -a x$have_opusfile_lib = xyes; then + have_opusfile=yes + case "$host" in + *-*-darwin*) + opusfile_lib=`find_lib libopusfile.dylib` + ;; + *-*-cygwin* | *-*-mingw32*) + opusfile_lib=`find_lib "libopusfile*.dll"` + ;; + *) + opusfile_lib=`find_lib "libopusfile[0-9]*.so.*"` + if test x$opusfile_lib = x; then + opusfile_lib=`find_lib "libopusfile.so.*"` + fi + ;; + esac + EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OPUS $OPUSFILE_CFLAGS" + if test x$enable_music_opus_shared = xyes && test x$opusfile_lib != x; then + echo "-- dynamic opusfile -> $opusfile_lib" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DOPUS_DYNAMIC=\\\"$opusfile_lib\\\"" + else + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $OPUSFILE_LIBS" + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find opusfile library (http://opus-codec.org/)" >&5 +$as_echo "$as_me: WARNING: *** Unable to find opusfile library (http://opus-codec.org/)" >&2;} + fi fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBM" diff --git a/configure.in b/configure.in index 6aed16e..240a322 100644 --- a/configure.in +++ b/configure.in @@ -14,9 +14,9 @@ # MAJOR_VERSION=2 MINOR_VERSION=0 -MICRO_VERSION=2 -INTERFACE_AGE=0 -BINARY_AGE=2 +MICRO_VERSION=4 +INTERFACE_AGE=2 +BINARY_AGE=4 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION AC_SUBST(MAJOR_VERSION) @@ -110,7 +110,7 @@ DEPENDENCY_TRACKING_OPTIONS="-MMD -MT \$@" fi fi - + case "$host" in *mingw32ce*) #VERSION_SOURCES="$srcdir/version.rc" @@ -248,7 +248,7 @@ have_libmodplug_lib=yes ], [dnl AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes]) - AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes]) + AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes;MODPLUG_LIBS="-lmodplug"]) ]) if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then @@ -291,11 +291,10 @@ libmikmod_min=1 libmikmod_rev=10 libmikmod_ver="$libmikmod_maj.$libmikmod_min.$libmikmod_rev" + CFLAGS_SAVED="$CFLAGS" + LIBS_SAVED="$LIBS" AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH]) if test "$LIBMIKMOD_CONFIG" != "no" ; then - - CFLAGS_SAVED="$CFLAGS" - LIBS_SAVED="$LIBS" CFLAGS="$CFLAGS `$LIBMIKMOD_CONFIG --cflags`" LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`" have_libmikmod=yes @@ -315,8 +314,7 @@ printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev); return 1; } -], [], have_libmikmod=no; CFLAGS="$CFLAGS_SAVED"; LIBS="$LIBS_SAVED", - [echo $ac_n "cross compiling; assumed OK... $ac_c"]) +], [], [have_libmikmod=no], [echo $ac_n "cross compiling; assumed OK... $ac_c"]) fi if test x$have_libmikmod = xyes; then @@ -344,6 +342,8 @@ else AC_MSG_WARN([*** Unable to find MikMod library (http://mikmod.raphnet.net/)]) fi + LIBS="$LIBS_SAVED" + CFLAGS="$CFLAGS_SAVED" fi if test x$have_libmodplug != xyes -a x$have_libmikmod != xyes ; then @@ -448,9 +448,10 @@ AC_HELP_STRING([--enable-music-ogg-shared], [dynamically load Ogg Vorbis library [[default=yes]]]), [], [enable_music_ogg_shared=yes]) if test x$enable_music_ogg = xyes; then + LIBS_SAVED="$LIBS" if test x$enable_music_ogg_tremor = xyes; then AC_CHECK_HEADER([tremor/ivorbisfile.h], [have_tremor_hdr=yes]) - AC_CHECK_LIB([vorbisidec -logg], [ov_open_callbacks], [have_tremor_lib=yes]) + AC_CHECK_LIB([vorbisidec], [ov_open_callbacks], [have_tremor_lib=yes], [], [-logg]) if test x$have_tremor_hdr = xyes -a x$have_tremor_lib = xyes; then case "$host" in *-*-darwin*) @@ -479,7 +480,7 @@ fi else AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes]) - AC_CHECK_LIB([vorbisfile -lvorbis -logg -lm], [ov_open_callbacks], [have_ogg_lib=yes]) + AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [-lvorbis -logg -lm]) if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then case "$host" in *-*-darwin*) @@ -507,6 +508,7 @@ AC_MSG_WARN([Ogg Vorbis support disabled]) fi fi + LIBS="$LIBS_SAVED" fi libflac_ver=8 @@ -572,39 +574,6 @@ AC_HELP_STRING([--enable-music-mp3], [enable MP3 music [[default=yes]]]), [], enable_music_mp3=yes) -AC_ARG_ENABLE(music-mp3-smpeg, -AC_HELP_STRING([--enable-music-mp3-smpeg], [enable MP3 music via smpeg [[default=no]]]), - [], enable_music_mp3_smpeg=no) -AC_ARG_ENABLE([music-mp3-smpeg-shared], -AC_HELP_STRING([--enable-music-mp3-smpeg-shared], [dynamically load smpeg library [[default=yes]]]), - [], [enable_music_mp3_smpeg_shared=yes]) -if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_smpeg = xyes; then - SMPEG_VERSION=2.0.0 - AM_PATH_SMPEG2($SMPEG_VERSION, have_smpeg=yes, have_smpeg=no) - if test x$have_smpeg = xyes; then - case "$host" in - *-*-darwin*) - smpeg_lib=[`find_lib libsmpeg2.dylib`] - ;; - *-*-cygwin* | *-*-mingw32*) - smpeg_lib=[`find_lib "smpeg2*.dll"`] - ;; - *) - smpeg_lib=[`find_lib "libsmpeg2*.so.*"`] - ;; - esac - EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS" - if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then - echo "-- dynamic libsmpeg -> $smpeg_lib" - EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\"" - else - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS" - fi - else - AC_MSG_WARN([*** Unable to find SMPEG library (http://icculus.org/smpeg/)]) - fi -fi - AC_ARG_ENABLE(music-mp3-mad-gpl, AC_HELP_STRING([--enable-music-mp3-mad-gpl], [enable MP3 music via libmad GPL code [[default=no]]]), [], [enable_music_mp3_mad_gpl=no]) @@ -623,9 +592,9 @@ AC_MSG_RESULT($have_libmad) if test x$have_libmad = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD" - if test x$enable_music_mp3_mad_gpl_dithering = xyes; then + if test x$enable_music_mp3_mad_gpl_dithering = xyes; then AC_MSG_WARN([*** Using GPL libmad and MP3 dithering routines, this build of SDL_mixer is now under the GPL]) - EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD_GPL_DITHERING" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD_GPL_DITHERING" fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad" else @@ -643,7 +612,7 @@ AC_CHECK_HEADER([mpg123.h], [have_mpg123_hdr=yes]) AC_CHECK_LIB([mpg123], [mpg123_replace_reader_handle], [have_mpg123_lib=yes]) if test x$have_mpg123_hdr = xyes -a x$have_mpg123_lib = xyes; then - have_mpg123=yes + have_libmpg123=yes case "$host" in *-*-darwin*) mpg123_lib=[`find_lib libmpg123.dylib`] @@ -652,7 +621,7 @@ mpg123_lib=[`find_lib "libmpg123*.dll"`] ;; *) - mpg123_lib=[`find_lib "libmpg123.so.*"`] + mpg123_lib=[`find_lib "libmpg123.so.*"`] ;; esac EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123" @@ -668,10 +637,56 @@ fi fi -if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then +if test x$have_libmad = xyes -o x$have_libmpg123 = xyes; then : else AC_MSG_WARN([MP3 support disabled]) +fi + +AC_ARG_ENABLE([music-opus], +AC_HELP_STRING([--enable-music-opus], [enable Opus music [[default=yes]]]), + [], [enable_music_opus=yes]) + +AC_ARG_ENABLE([music-opus-shared], +AC_HELP_STRING([--enable-music-opus-shared], [dynamically load opusfile library [[default=yes]]]), + [], [enable_music_opus_shared=yes]) +if test x$enable_music_opus = xyes; then + LIBS_SAVED="$LIBS" + PKG_CHECK_MODULES([OPUSFILE], [opusfile >= 0.2], [dnl + have_opusfile_hdr=yes + have_opusfile_lib=yes + ], [dnl + AC_CHECK_HEADER([opus/opusfile.h], [have_opusfile_hdr=yes]) + AC_CHECK_LIB([opusfile], [op_open_callbacks], [have_opusfile_lib=yes;OPUSFILE_LIBS="-lopusfile -lopus"], [], [-lopus -logg -lm]) + ]) + LIBS="$LIBS_SAVED" + + if test x$have_opusfile_hdr = xyes -a x$have_opusfile_lib = xyes; then + have_opusfile=yes + case "$host" in + *-*-darwin*) + opusfile_lib=[`find_lib libopusfile.dylib`] + ;; + *-*-cygwin* | *-*-mingw32*) + opusfile_lib=[`find_lib "libopusfile*.dll"`] + ;; + *) + opusfile_lib=[`find_lib "libopusfile[0-9]*.so.*"`] + if test x$opusfile_lib = x; then + opusfile_lib=[`find_lib "libopusfile.so.*"`] + fi + ;; + esac + EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OPUS $OPUSFILE_CFLAGS" + if test x$enable_music_opus_shared = xyes && test x$opusfile_lib != x; then + echo "-- dynamic opusfile -> $opusfile_lib" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DOPUS_DYNAMIC=\\\"$opusfile_lib\\\"" + else + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $OPUSFILE_LIBS" + fi + else + AC_MSG_WARN([*** Unable to find opusfile library (http://opus-codec.org/)]) + fi fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBM" diff --git a/effect_position.c b/effect_position.c index 8bec6a0..d532e74 100644 --- a/effect_position.c +++ b/effect_position.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/effect_stereoreverse.c b/effect_stereoreverse.c index f4677e1..2f753ad 100644 --- a/effect_stereoreverse.c +++ b/effect_stereoreverse.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/effects_internal.c b/effects_internal.c index c4ba220..4e677ab 100644 --- a/effects_internal.c +++ b/effects_internal.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/effects_internal.h b/effects_internal.h index bb85df0..ed16bd9 100644 --- a/effects_internal.h +++ b/effects_internal.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/load_aiff.c b/load_aiff.c index 16d0263..42620a1 100644 --- a/load_aiff.c +++ b/load_aiff.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/load_aiff.h b/load_aiff.h index a786d83..4fd876c 100644 --- a/load_aiff.h +++ b/load_aiff.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/load_voc.c b/load_voc.c index 4669756..7f0ab2d 100644 --- a/load_voc.c +++ b/load_voc.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/load_voc.h b/load_voc.h index 8099c26..f177ce1 100644 --- a/load_voc.h +++ b/load_voc.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/mixer.c b/mixer.c index 8a54e20..ba2b407 100644 --- a/mixer.c +++ b/mixer.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -118,9 +118,19 @@ return SDL_FALSE; } -static void add_chunk_decoder(const char *decoder) -{ - void *ptr = SDL_realloc((void *)chunk_decoders, (num_decoders + 1) * sizeof (const char *)); +void add_chunk_decoder(const char *decoder) +{ + int i; + void *ptr; + + /* Check to see if we already have this decoder */ + for (i = 0; i < num_decoders; ++i) { + if (SDL_strcmp(chunk_decoders[i], decoder) == 0) { + return; + } + } + + ptr = SDL_realloc((void *)chunk_decoders, (num_decoders + 1) * sizeof (const char *)); if (ptr == NULL) { return; /* oh well, go on without it. */ } @@ -140,44 +150,55 @@ { int result = 0; - load_music(); - if (flags & MIX_INIT_FLAC) { - if (has_music(MUS_FLAC)) { + if (load_music_type(MUS_FLAC)) { + open_music_type(MUS_FLAC); result |= MIX_INIT_FLAC; } else { Mix_SetError("FLAC support not available"); } } if (flags & MIX_INIT_MOD) { - if (has_music(MUS_MOD)) { + if (load_music_type(MUS_MOD)) { + open_music_type(MUS_MOD); result |= MIX_INIT_MOD; } else { Mix_SetError("MOD support not available"); } } if (flags & MIX_INIT_MP3) { - if (has_music(MUS_MP3)) { + if (load_music_type(MUS_MP3)) { + open_music_type(MUS_MP3); result |= MIX_INIT_MP3; } else { Mix_SetError("MP3 support not available"); } } if (flags & MIX_INIT_OGG) { - if (has_music(MUS_OGG)) { + if (load_music_type(MUS_OGG)) { + open_music_type(MUS_OGG); result |= MIX_INIT_OGG; } else { Mix_SetError("OGG support not available"); } } + if (flags & MIX_INIT_OPUS) { + if (load_music_type(MUS_OPUS)) { + open_music_type(MUS_OPUS); + result |= MIX_INIT_OPUS; + } else { + Mix_SetError("OPUS support not available"); + } + } if (flags & MIX_INIT_MID) { - if (has_music(MUS_MID)) { + if (load_music_type(MUS_MID)) { + open_music_type(MUS_MID); result |= MIX_INIT_MID; } else { Mix_SetError("MIDI support not available"); } } - return (result); + return result; } void Mix_Quit() @@ -400,13 +421,6 @@ PrintFormat("Audio device", &mixer); #endif - /* Initialize the music players */ - load_music(); - if (open_music(&mixer) < 0) { - SDL_CloseAudioDevice(audio_device); - return(-1); - } - num_channels = MIX_CHANNELS; mix_channel = (struct _Mix_Channel *) SDL_malloc(num_channels * sizeof(struct _Mix_Channel)); @@ -431,21 +445,9 @@ add_chunk_decoder("WAVE"); add_chunk_decoder("AIFF"); add_chunk_decoder("VOC"); - if (has_music(MUS_MOD)) { - add_chunk_decoder("MOD"); - } - if (has_music(MUS_MID)) { - add_chunk_decoder("MID"); - } - if (has_music(MUS_OGG)) { - add_chunk_decoder("OGG"); - } - if (has_music(MUS_MP3)) { - add_chunk_decoder("MP3"); - } - if (has_music(MUS_FLAC)) { - add_chunk_decoder("FLAC"); - } + + /* Initialize the music players */ + open_music(&mixer); audio_opened = 1; SDL_PauseAudioDevice(audio_device, 0); @@ -536,6 +538,10 @@ int count = 0; int fragment_size; + if (!load_music_type(music_type) || !open_music_type(music_type)) { + return NULL; + } + *spec = mixer; /* Use fragments sized on full audio frame boundaries - this'll do */ @@ -544,6 +550,9 @@ start = SDL_RWtell(src); for (i = 0; i < get_num_music_interfaces(); ++i) { interface = get_music_interface(i); + if (!interface->opened) { + continue; + } if (interface->type != music_type) { continue; } @@ -708,7 +717,7 @@ loaded = SDL_LoadWAV_RW(src, freesrc, &wavespec, (Uint8 **)&chunk->abuf, &chunk->alen); } else if (SDL_memcmp(magic, "FORM", 4) == 0) { loaded = Mix_LoadAIFF_RW(src, freesrc, &wavespec, (Uint8 **)&chunk->abuf, &chunk->alen); - } else if (SDL_memcmp(magic, "CREA", 4) == 0) { + } else if (SDL_memcmp(magic, "Crea", 4) == 0) { loaded = Mix_LoadVOC_RW(src, freesrc, &wavespec, (Uint8 **)&chunk->abuf, &chunk->alen); } else { Mix_MusicType music_type = detect_music_type_from_magic(magic); diff --git a/mixer.h b/mixer.h index 53d1d2b..dc06e71 100644 --- a/mixer.h +++ b/mixer.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -23,4 +23,6 @@ extern void Mix_LockAudio(void); extern void Mix_UnlockAudio(void); +extern void add_chunk_decoder(const char *decoder); + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/music.c b/music.c index 1b2dfe4..a09373f 100644 --- a/music.c +++ b/music.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -36,12 +36,20 @@ #include "music_fluidsynth.h" #include "music_timidity.h" #include "music_ogg.h" +#include "music_opus.h" #include "music_mpg123.h" #include "music_mad.h" -#include "music_smpeg.h" #include "music_flac.h" #include "native_midi/native_midi.h" +/* Check to make sure we are building with a new enough SDL */ +#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 7) +#error You need SDL 2.0.7 or newer from http://www.libsdl.org +#endif + +/* Set this hint to true if you want verbose logging of music interfaces */ +#define SDL_MIXER_HINT_DEBUG_MUSIC_INTERFACES \ + "SDL_MIXER_DEBUG_MUSIC_INTERFACES" char *music_cmd = NULL; static SDL_bool music_active = SDL_TRUE; @@ -84,15 +92,15 @@ #ifdef MUSIC_OGG &Mix_MusicInterface_OGG, #endif +#ifdef MUSIC_OPUS + &Mix_MusicInterface_Opus, +#endif #ifdef MUSIC_MP3_MPG123 &Mix_MusicInterface_MPG123, #endif #ifdef MUSIC_MP3_MAD &Mix_MusicInterface_MAD, #endif -#ifdef MUSIC_MP3_SMPEG - &Mix_MusicInterface_SMPEG, -#endif #ifdef MUSIC_MOD_MODPLUG &Mix_MusicInterface_MODPLUG, #endif @@ -135,7 +143,17 @@ static void add_music_decoder(const char *decoder) { - void *ptr = SDL_realloc((void *)music_decoders, (num_decoders + 1) * sizeof (const char *)); + void *ptr; + int i; + + /* Check to see if we already have this decoder */ + for (i = 0; i < num_decoders; ++i) { + if (SDL_strcmp(music_decoders[i], decoder) == 0) { + return; + } + } + + ptr = SDL_realloc((void *)music_decoders, (num_decoders + 1) * sizeof (const char *)); if (ptr == NULL) { return; /* oh well, go on without it. */ } @@ -252,28 +270,127 @@ } } -/* Load the music interface libraries */ -int load_music(void) -{ - char hint[128]; - - int i; +/* Load the music interface libraries for a given music type */ +SDL_bool load_music_type(Mix_MusicType type) +{ + int i, loaded = 0; for (i = 0; i < SDL_arraysize(s_music_interfaces); ++i) { Mix_MusicInterface *interface = s_music_interfaces[i]; - if (interface->loaded) { + if (interface->type != type) { continue; } - - SDL_snprintf(hint, sizeof(hint), "SDL_MIXER_DISABLE_%s", interface->tag); - if (SDL_GetHintBoolean(hint, SDL_FALSE)) { + if (!interface->loaded) { + char hint[64]; + SDL_snprintf(hint, sizeof(hint), "SDL_MIXER_DISABLE_%s", interface->tag); + if (SDL_GetHintBoolean(hint, SDL_FALSE)) { + continue; + } + + if (interface->Load && interface->Load() < 0) { + if (SDL_GetHintBoolean(SDL_MIXER_HINT_DEBUG_MUSIC_INTERFACES, SDL_FALSE)) { + SDL_Log("Couldn't load %s: %s\n", interface->tag, Mix_GetError()); + } + continue; + } + interface->loaded = SDL_TRUE; + } + ++loaded; + } + return (loaded > 0) ? SDL_TRUE : SDL_FALSE; +} + +/* Open the music interfaces for a given music type */ +SDL_bool open_music_type(Mix_MusicType type) +{ + int i, opened = 0; + SDL_bool use_native_midi = SDL_FALSE; + + if (!music_spec.format) { + /* Music isn't opened yet */ + return SDL_FALSE; + } + +#ifdef MUSIC_MID_NATIVE + if (type == MUS_MID && SDL_GetHintBoolean("SDL_NATIVE_MUSIC", SDL_FALSE) && native_midi_detect()) { + use_native_midi = SDL_TRUE; + } +#endif + + for (i = 0; i < SDL_arraysize(s_music_interfaces); ++i) { + Mix_MusicInterface *interface = s_music_interfaces[i]; + if (!interface->loaded) { continue; } - - if (!interface->Load || interface->Load() == 0) { - interface->loaded = SDL_TRUE; - } - } - return 0; + if (type != MUS_NONE && interface->type != type) { + continue; + } + + if (interface->type == MUS_MID && use_native_midi && interface->api != MIX_MUSIC_NATIVEMIDI) { + continue; + } + + if (!interface->opened) { + if (interface->Open && interface->Open(&music_spec) < 0) { + if (SDL_GetHintBoolean(SDL_MIXER_HINT_DEBUG_MUSIC_INTERFACES, SDL_FALSE)) { + SDL_Log("Couldn't open %s: %s\n", interface->tag, Mix_GetError()); + } + continue; + } + interface->opened = SDL_TRUE; + add_music_decoder(interface->tag); + } + ++opened; + } + + if (has_music(MUS_MOD)) { + add_music_decoder("MOD"); + add_chunk_decoder("MOD"); + } + if (has_music(MUS_MID)) { + add_music_decoder("MIDI"); + add_chunk_decoder("MID"); + } + if (has_music(MUS_OGG)) { + add_music_decoder("OGG"); + add_chunk_decoder("OGG"); + } + if (has_music(MUS_OPUS)) { + add_music_decoder("OPUS"); + add_chunk_decoder("OPUS"); + } + if (has_music(MUS_MP3)) { + add_music_decoder("MP3"); + add_chunk_decoder("MP3"); + } + if (has_music(MUS_FLAC)) { + add_music_decoder("FLAC"); + add_chunk_decoder("FLAC"); + } + + return (opened > 0) ? SDL_TRUE : SDL_FALSE; +} + +/* Initialize the music interfaces with a certain desired audio format */ +void open_music(const SDL_AudioSpec *spec) +{ +#ifdef MIX_INIT_SOUNDFONT_PATHS + if (!soundfont_paths) { + soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS); + } +#endif + + /* Load the music interfaces that don't have explicit initialization */ + load_music_type(MUS_CMD); + load_music_type(MUS_WAV); + + /* Open all the interfaces that are loaded */ + music_spec = *spec; + open_music_type(MUS_NONE); + + Mix_VolumeMusic(MIX_MAX_VOLUME); + + /* Calculate the number of ms for each callback */ + ms_per_step = (int) (((float)spec->samples * 1000.0) / spec->freq); } /* Return SDL_TRUE if the music type is available */ @@ -290,60 +407,6 @@ } } return SDL_FALSE; -} - -/* Initialize the music interfaces with a certain desired audio format */ -int open_music(const SDL_AudioSpec *spec) -{ - int i; - SDL_bool use_native_midi = SDL_FALSE; - -#ifdef MIX_INIT_SOUNDFONT_PATHS - if (!soundfont_paths) { - soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS); - } -#endif - - -#ifdef MUSIC_MID_NATIVE - if (SDL_GetHintBoolean("SDL_NATIVE_MUSIC", SDL_FALSE) && native_midi_detect()) { - use_native_midi = SDL_TRUE; - } -#endif - - music_spec = *spec; - for (i = 0; i < SDL_arraysize(s_music_interfaces); ++i) { - Mix_MusicInterface *interface = s_music_interfaces[i]; - if (!interface->loaded) { - continue; - } - - if (interface->type == MUS_MID && use_native_midi && interface->api != MIX_MUSIC_NATIVEMIDI) { - continue; - } - - if (!interface->Open || interface->Open(spec) == 0) { - interface->opened = SDL_TRUE; - add_music_decoder(interface->tag); - } - } - - if (has_music(MUS_MOD)) { - add_music_decoder("MOD"); - } - if (has_music(MUS_MID)) { - add_music_decoder("MIDI"); - } - if (has_music(MUS_MP3)) { - add_music_decoder("MP3"); - } - - Mix_VolumeMusic(MIX_MAX_VOLUME); - - /* Calculate the number of ms for each callback */ - ms_per_step = (int) (((float)spec->samples * 1000.0) / spec->freq); - - return 0; } Mix_MusicType detect_music_type_from_magic(const Uint8 *magic) @@ -379,6 +442,7 @@ static Mix_MusicType detect_music_type(SDL_RWops *src) { Uint8 magic[12]; + Mix_MusicType t; if (SDL_RWread(src, magic, 1, 12) != 12) { Mix_SetError("Couldn't read first 12 bytes of audio data"); @@ -392,8 +456,17 @@ (SDL_memcmp(magic, "FORM", 4) == 0)) { return MUS_WAV; } - - return detect_music_type_from_magic(magic); + t = detect_music_type_from_magic(magic); + if (t == MUS_OGG) { + Sint64 pos = SDL_RWtell(src); + SDL_RWseek(src, 28, RW_SEEK_CUR); + SDL_RWread(src, magic, 1, 8); + SDL_RWseek(src, pos, RW_SEEK_SET); + if (SDL_memcmp(magic, "OpusHead", 8) == 0) { + return MUS_OPUS; + } + } + return t; } /* Load a music file */ @@ -444,6 +517,8 @@ type = MUS_MID; } else if (SDL_strcasecmp(ext, "OGG") == 0) { type = MUS_OGG; + } else if (SDL_strcasecmp(ext, "OPUS") == 0) { + type = MUS_OPUS; } else if (SDL_strcasecmp(ext, "FLAC") == 0) { type = MUS_FLAC; } else if (SDL_strcasecmp(ext, "MPG") == 0 || @@ -509,32 +584,34 @@ Mix_ClearError(); - for (i = 0; i < SDL_arraysize(s_music_interfaces); ++i) { - Mix_MusicInterface *interface = s_music_interfaces[i]; - if (!interface->opened || type != interface->type || !interface->CreateFromRW) { - continue; - } - - context = interface->CreateFromRW(src, freesrc); - if (context) { - /* Allocate memory for the music structure */ - Mix_Music *music = (Mix_Music *)SDL_calloc(1, sizeof(Mix_Music)); - if (music == NULL) { - interface->Delete(context); - Mix_SetError("Out of memory"); - return NULL; - } - music->interface = interface; - music->context = context; -#ifdef DEBUG_MUSIC - /* This would be useful to expose via an API */ - SDL_Log("Music playing with %s\n", interface->tag); -#endif - return music; - } - - /* Reset the stream for the next decoder */ - SDL_RWseek(src, start, RW_SEEK_SET); + if (load_music_type(type) && open_music_type(type)) { + for (i = 0; i < SDL_arraysize(s_music_interfaces); ++i) { + Mix_MusicInterface *interface = s_music_interfaces[i]; + if (!interface->opened || type != interface->type || !interface->CreateFromRW) { + continue; + } + + context = interface->CreateFromRW(src, freesrc); + if (context) { + /* Allocate memory for the music structure */ + Mix_Music *music = (Mix_Music *)SDL_calloc(1, sizeof(Mix_Music)); + if (music == NULL) { + interface->Delete(context); + Mix_SetError("Out of memory"); + return NULL; + } + music->interface = interface; + music->context = context; + + if (SDL_GetHintBoolean(SDL_MIXER_HINT_DEBUG_MUSIC_INTERFACES, SDL_FALSE)) { + SDL_Log("Loaded music with %s\n", interface->tag); + } + return music; + } + + /* Reset the stream for the next decoder */ + SDL_RWseek(src, start, RW_SEEK_SET); + } } if (!*Mix_GetError()) { @@ -678,6 +755,7 @@ loops = 1; } retval = music_internal_play(music, loops, position); + music_active = (retval == 0); Mix_UnlockAudio(); return(retval); diff --git a/music.h b/music.h index a9b7923..caec82f 100644 --- a/music.h +++ b/music.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,8 +37,8 @@ MIX_MUSIC_OGG, MIX_MUSIC_MPG123, MIX_MUSIC_MAD, - MIX_MUSIC_SMPEG, MIX_MUSIC_FLAC, + MIX_MUSIC_OPUS, MIX_MUSIC_LAST } Mix_MusicAPI; @@ -103,12 +103,13 @@ } Mix_MusicInterface; -extern int load_music(void); -extern Mix_MusicType detect_music_type_from_magic(const Uint8 *magic); extern int get_num_music_interfaces(void); extern Mix_MusicInterface *get_music_interface(int index); +extern Mix_MusicType detect_music_type_from_magic(const Uint8 *magic); +extern SDL_bool load_music_type(Mix_MusicType type); +extern SDL_bool open_music_type(Mix_MusicType type); extern SDL_bool has_music(Mix_MusicType type); -extern int open_music(const SDL_AudioSpec *spec); +extern void open_music(const SDL_AudioSpec *spec); extern int music_pcm_getaudio(void *context, void *data, int bytes, int volume, int (*GetSome)(void *context, void *data, int bytes, SDL_bool *done)); extern void SDLCALL music_mixer(void *udata, Uint8 *stream, int len); diff --git a/music_cmd.c b/music_cmd.c index 8c5900d..f9f7298 100644 --- a/music_cmd.c +++ b/music_cmd.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_cmd.h b/music_cmd.h index 1104afb..c1f0ece 100644 --- a/music_cmd.h +++ b/music_cmd.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_flac.c b/music_flac.c index babba16..98d6665 100644 --- a/music_flac.c +++ b/music_flac.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_flac.h b/music_flac.h index 2d8224c..65b9502 100644 --- a/music_flac.h +++ b/music_flac.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_fluidsynth.c b/music_fluidsynth.c index c1e79ff..f5346a4 100644 --- a/music_fluidsynth.c +++ b/music_fluidsynth.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_fluidsynth.h b/music_fluidsynth.h index 23785fe..5946973 100644 --- a/music_fluidsynth.h +++ b/music_fluidsynth.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_mad.c b/music_mad.c index 23517b3..b385a31 100644 --- a/music_mad.c +++ b/music_mad.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -188,6 +188,101 @@ return MAD_Seek(music, 0.0); } + +/*************************** TAG HANDLING: ******************************/ + +static SDL_INLINE SDL_bool is_id3v1(const Uint8 *data, size_t length) +{ + /* http://id3.org/ID3v1 : 3 bytes "TAG" identifier and 125 bytes tag data */ + if (length < 3 || SDL_memcmp(data,"TAG",3) != 0) { + return SDL_FALSE; + } + return SDL_TRUE; +} +static SDL_INLINE SDL_bool is_id3v2(const Uint8 *data, size_t length) +{ + /* ID3v2 header is 10 bytes: http://id3.org/id3v2.4.0-structure */ + /* bytes 0-2: "ID3" identifier */ + if (length < 10 || SDL_memcmp(data,"ID3",3) != 0) { + return SDL_FALSE; + } + /* bytes 3-4: version num (major,revision), each byte always less than 0xff. */ + if (data[3] == 0xff || data[4] == 0xff) { + return SDL_FALSE; + } + /* bytes 6-9 are the ID3v2 tag size: a 32 bit 'synchsafe' integer, i.e. the + * highest bit 7 in each byte zeroed. i.e.: 7 bit information in each byte -> + * effectively a 28 bit value. */ + if (data[6] >= 0x80 || data[7] >= 0x80 || data[8] >= 0x80 || data[9] >= 0x80) { + return SDL_FALSE; + } + return SDL_TRUE; +} +static SDL_INLINE SDL_bool is_apetag(const Uint8 *data, size_t length) +{ + /* http://wiki.hydrogenaud.io/index.php?title=APEv2_specification + * APEv2 header is 32 bytes: bytes 0-7 ident, bytes 8-11 version, + * bytes 12-17 size. bytes 24-31 are reserved: must be all zeroes. + * APEv1 has no header, so no luck. */ + Uint32 v; + + if (length < 32 || SDL_memcmp(data,"APETAGEX",8) != 0) { + return SDL_FALSE; + } + v = (data[11]<<24) | (data[10]<<16) | (data[9]<<8) | data[8]; /* version */ + if (v != 2000U) { + return SDL_FALSE; + } + v = 0; /* reserved bits : */ + if (SDL_memcmp(&data[24],&v,4) != 0 || SDL_memcmp(&data[28],&v,4) != 0) { + return SDL_FALSE; + } + return SDL_TRUE; +} + +static size_t get_tagsize(const Uint8 *data, size_t length) +{ + size_t size; + + if (is_id3v1(data, length)) { + return 128; /* fixed length */ + } + if (is_id3v2(data, length)) { + /* size is a 'synchsafe' integer (see above) */ + size = (data[6]<<21) + (data[7]<<14) + (data[8]<<7) + data[9]; + size += 10; /* header size */ + /* ID3v2 header[5] is flags (bits 4-7 only, 0-3 are zero). + * bit 4 set: footer is present (a copy of the header but + * with "3DI" as ident.) */ + if (data[5] & 0x10) { + size += 10; /* footer size */ + } + /* optional padding (always zeroes) */ + while (size < length && data[size] == 0) { + ++size; + } + return size; + } + if (is_apetag(data, length)) { + size = (data[15]<<24) | (data[14]<<16) | (data[13]<<8) | data[12]; + size += 32; /* header size */ + return size; + } + return 0; +} + +static int consume_tag(struct mad_stream *stream) +{ + /* FIXME: what if the buffer doesn't have the full tag ??? */ + size_t remaining = stream->bufend - stream->next_frame; + size_t tagsize = get_tagsize(stream->this_frame, remaining); + if (tagsize != 0) { + mad_stream_skip(stream, tagsize); + return 0; + } + return -1; +} + /* Reads the next frame from the file. Returns true on success or false on failure. */ @@ -239,6 +334,8 @@ its buffer. */ if (mad_frame_decode(&music->frame, &music->stream)) { if (MAD_RECOVERABLE(music->stream.error)) { + consume_tag(&music->stream); /* consume any ID3 tags */ + mad_stream_sync(&music->stream); /* to frame seek mode */ return SDL_FALSE; } else if (music->stream.error == MAD_ERROR_BUFLEN) { diff --git a/music_mad.h b/music_mad.h index d04ee57..b6011ba 100644 --- a/music_mad.h +++ b/music_mad.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_mikmod.c b/music_mikmod.c index 9ad59c5..83b8547 100644 --- a/music_mikmod.c +++ b/music_mikmod.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -119,7 +119,8 @@ mikmod.MikMod_free = free; } #else -#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8)) +#if (LIBMIKMOD_VERSION < 0x030200) || !defined(DMODE_NOISEREDUCTION) + /* libmikmod 3.2.0-beta2 or older */ mikmod.MikMod_free = free; #else mikmod.MikMod_free = MikMod_free; @@ -254,7 +255,7 @@ if (offset < lmmmr->offset) return -1; } - return (int)(SDL_RWseek(lmmmr->src, offset, dir)); + return (SDL_RWseek(lmmmr->src, offset, dir) < lmmmr->offset)? -1 : 0; } long LMM_Tell(struct MREADER *mr) { diff --git a/music_mikmod.h b/music_mikmod.h index 5cd633a..436fffc 100644 --- a/music_mikmod.h +++ b/music_mikmod.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_modplug.c b/music_modplug.c index 7e40039..e187943 100644 --- a/music_modplug.c +++ b/music_modplug.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_modplug.h b/music_modplug.h index ce28d05..ca0553e 100644 --- a/music_modplug.h +++ b/music_modplug.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_mpg123.c b/music_mpg123.c index f75e9ce..cd151b9 100644 --- a/music_mpg123.c +++ b/music_mpg123.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_mpg123.h b/music_mpg123.h index 5b5657f..9c30257 100644 --- a/music_mpg123.h +++ b/music_mpg123.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_nativemidi.c b/music_nativemidi.c index 846f3bd..d9a69eb 100644 --- a/music_nativemidi.c +++ b/music_nativemidi.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_nativemidi.h b/music_nativemidi.h index d3902e2..35ccc1e 100644 --- a/music_nativemidi.h +++ b/music_nativemidi.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_ogg.c b/music_ogg.c index f54cdda..8323653 100644 --- a/music_ogg.c +++ b/music_ogg.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -27,6 +27,7 @@ #include "music_ogg.h" +#define OV_EXCLUDE_STATIC_CALLBACKS #if defined(OGG_HEADER) #include OGG_HEADER #elif defined(OGG_USE_TREMOR) diff --git a/music_ogg.h b/music_ogg.h index 146b12f..30fba4d 100644 --- a/music_ogg.h +++ b/music_ogg.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_opus.c b/music_opus.c new file mode 100644 index 0000000..9b4bcb8 --- /dev/null +++ b/music_opus.c @@ -0,0 +1,373 @@ +/* + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997-2018 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#ifdef MUSIC_OPUS + +/* This file supports Ogg Opus music streams */ + +#include "SDL_loadso.h" + +#include "music_opus.h" + +#if defined(OPUS_HEADER) +#include OPUS_HEADER +#else +#include +#endif + +typedef struct { + int loaded; + void *handle; + OggOpusFile *(*op_open_callbacks)(void *,const OpusFileCallbacks *,const unsigned char *,size_t,int *); + void (*op_free)(OggOpusFile *); + const OpusHead *(*op_head)(const OggOpusFile *,int); + int (*op_seekable)(const OggOpusFile *); + int (*op_read)(OggOpusFile *, opus_int16 *,int,int *); + int (*op_pcm_seek)(OggOpusFile *,ogg_int64_t); +} opus_loader; + +static opus_loader opus = { + 0, NULL +}; + +#ifdef OPUS_DYNAMIC +#define FUNCTION_LOADER(FUNC, SIG) \ + opus.FUNC = (SIG) SDL_LoadFunction(opus.handle, #FUNC); \ + if (opus.FUNC == NULL) { SDL_UnloadObject(opus.handle); return -1; } +#else +#define FUNCTION_LOADER(FUNC, SIG) \ + opus.FUNC = FUNC; +#endif + +static int OPUS_Load(void) +{ + if (opus.loaded == 0) { +#ifdef OPUS_DYNAMIC + opus.handle = SDL_LoadObject(OPUS_DYNAMIC); + if (opus.handle == NULL) { + return -1; + } +#elif defined(__MACOSX__) + extern OggOpusFile *op_open_callbacks(void *,const OpusFileCallbacks *,const unsigned char *,size_t,int *) __attribute__((weak_import)); + if (op_open_callbacks == NULL) { + /* Missing weakly linked framework */ + Mix_SetError("Missing OpusFile.framework"); + return -1; + } +#endif + FUNCTION_LOADER(op_open_callbacks, OggOpusFile *(*)(void *,const OpusFileCallbacks *,const unsigned char *,size_t,int *)) + FUNCTION_LOADER(op_free, void (*)(OggOpusFile *)) + FUNCTION_LOADER(op_head, const OpusHead *(*)(const OggOpusFile *,int)) + FUNCTION_LOADER(op_seekable, int (*)(const OggOpusFile *)) + FUNCTION_LOADER(op_read, int (*)(OggOpusFile *, opus_int16 *,int,int *)) + FUNCTION_LOADER(op_pcm_seek, int (*)(OggOpusFile *,ogg_int64_t)) + } + ++opus.loaded; + + return 0; +} + +static void OPUS_Unload(void) +{ + if (opus.loaded == 0) { + return; + } + if (opus.loaded == 1) { +#ifdef OPUS_DYNAMIC + SDL_UnloadObject(opus.handle); +#endif + } + --opus.loaded; +} + + +typedef struct { + SDL_RWops *src; + int freesrc; + int play_count; + int volume; + OggOpusFile *of; + const OpusHead *op_info; + int section; + SDL_AudioStream *stream; + char *buffer; + int buffer_size; +} OPUS_music; + + +static int set_op_error(const char *function, int error) +{ +#define HANDLE_ERROR_CASE(X) case X: Mix_SetError("%s: %s", function, #X); break; + switch (error) { + HANDLE_ERROR_CASE(OP_FALSE); + HANDLE_ERROR_CASE(OP_EOF); + HANDLE_ERROR_CASE(OP_HOLE); + HANDLE_ERROR_CASE(OP_EREAD); + HANDLE_ERROR_CASE(OP_EFAULT); + HANDLE_ERROR_CASE(OP_EIMPL); + HANDLE_ERROR_CASE(OP_EINVAL); + HANDLE_ERROR_CASE(OP_ENOTFORMAT); + HANDLE_ERROR_CASE(OP_EBADHEADER); + HANDLE_ERROR_CASE(OP_EVERSION); + HANDLE_ERROR_CASE(OP_ENOTAUDIO); + HANDLE_ERROR_CASE(OP_EBADPACKET); + HANDLE_ERROR_CASE(OP_EBADLINK); + HANDLE_ERROR_CASE(OP_ENOSEEK); + HANDLE_ERROR_CASE(OP_EBADTIMESTAMP); + default: + Mix_SetError("%s: unknown error %d\n", function, error); + break; + } + return -1; +} + +static int sdl_read_func(void *datasource, unsigned char *ptr, int size) +{ + return (int)SDL_RWread((SDL_RWops*)datasource, ptr, 1, size); +} + +static int sdl_seek_func(void *datasource, opus_int64 offset, int whence) +{ + return (SDL_RWseek((SDL_RWops*)datasource, offset, whence) < 0)? -1 : 0; +} + +static opus_int64 sdl_tell_func(void *datasource) +{ + return SDL_RWtell((SDL_RWops*)datasource); +} + +static int OPUS_Seek(void*, double); +static void OPUS_Delete(void*); + +static int OPUS_UpdateSection(OPUS_music *music) +{ + const OpusHead *op_info; + + op_info = opus.op_head(music->of, -1); + if (!op_info) { + Mix_SetError("op_head returned NULL"); + return -1; + } + + if (music->op_info && op_info->channel_count == music->op_info->channel_count) { + return 0; + } + music->op_info = op_info; + + if (music->buffer) { + SDL_free(music->buffer); + music->buffer = NULL; + } + + if (music->stream) { + SDL_FreeAudioStream(music->stream); + music->stream = NULL; + } + + music->stream = SDL_NewAudioStream(AUDIO_S16, op_info->channel_count, 48000, + music_spec.format, music_spec.channels, music_spec.freq); + if (!music->stream) { + return -1; + } + + music->buffer_size = music_spec.samples * sizeof(opus_int16) * op_info->channel_count; + music->buffer = (char *)SDL_malloc(music->buffer_size); + if (!music->buffer) { + return -1; + } + return 0; +} + +/* Load an Opus stream from an SDL_RWops object */ +static void *OPUS_CreateFromRW(SDL_RWops *src, int freesrc) +{ + OPUS_music *music; + OpusFileCallbacks callbacks; + int err = 0; + + music = (OPUS_music *)SDL_calloc(1, sizeof *music); + if (!music) { + SDL_OutOfMemory(); + return NULL; + } + music->src = src; + music->volume = MIX_MAX_VOLUME; + music->section = -1; + + SDL_zero(callbacks); + callbacks.read = sdl_read_func; + callbacks.seek = sdl_seek_func; + callbacks.tell = sdl_tell_func; + + music->of = opus.op_open_callbacks(src, &callbacks, NULL, 0, &err); + if (music->of == NULL) { + /* set_op_error("op_open_callbacks", err);*/ + SDL_SetError("Not an Opus audio stream"); + SDL_free(music); + return NULL; + } + + if (!opus.op_seekable(music->of)) { + OPUS_Delete(music); + Mix_SetError("Opus stream not seekable"); + return NULL; + } + + if (OPUS_UpdateSection(music) < 0) { + OPUS_Delete(music); + return NULL; + } + + music->freesrc = freesrc; + return music; +} + +/* Set the volume for an Opus stream */ +static void OPUS_SetVolume(void *context, int volume) +{ + OPUS_music *music = (OPUS_music *)context; + music->volume = volume; +} + +/* Start playback of a given Opus stream */ +static int OPUS_Play(void *context, int play_count) +{ + OPUS_music *music = (OPUS_music *)context; + music->play_count = play_count; + return OPUS_Seek(music, 0.0); +} + +/* Play some of a stream previously started with OPUS_Play() */ +static int OPUS_GetSome(void *context, void *data, int bytes, SDL_bool *done) +{ + OPUS_music *music = (OPUS_music *)context; + int filled, samples, section; + + filled = SDL_AudioStreamGet(music->stream, data, bytes); + if (filled != 0) { + return filled; + } + + if (!music->play_count) { + /* All done */ + *done = SDL_TRUE; + return 0; + } + + section = music->section; + samples = opus.op_read(music->of, (opus_int16 *)music->buffer, music->buffer_size / sizeof(opus_int16), §ion); + if (samples < 0) { + set_op_error("op_read", samples); + return -1; + } + + if (section != music->section) { + music->section = section; + if (OPUS_UpdateSection(music) < 0) { + return -1; + } + } + + if (samples > 0) { + filled = samples * music->op_info->channel_count * 2; + if (SDL_AudioStreamPut(music->stream, music->buffer, filled) < 0) { + return -1; + } + } else { + if (music->play_count == 1) { + music->play_count = 0; + SDL_AudioStreamFlush(music->stream); + } else { + int play_count = -1; + if (music->play_count > 0) { + play_count = (music->play_count - 1); + } + if (OPUS_Play(music, play_count) < 0) { + return -1; + } + } + } + return 0; +} + +static int OPUS_GetAudio(void *context, void *data, int bytes) +{ + OPUS_music *music = (OPUS_music *)context; + return music_pcm_getaudio(context, data, bytes, music->volume, OPUS_GetSome); +} + +/* Jump (seek) to a given position (time is in seconds) */ +static int OPUS_Seek(void *context, double time) +{ + OPUS_music *music = (OPUS_music *)context; + int result; + result = opus.op_pcm_seek(music->of, (ogg_int64_t)(time * 48000)); + if (result < 0) { + return set_op_error("op_pcm_seek", result); + } + return 0; +} + +/* Close the given Opus stream */ +static void OPUS_Delete(void *context) +{ + OPUS_music *music = (OPUS_music *)context; + opus.op_free(music->of); + if (music->stream) { + SDL_FreeAudioStream(music->stream); + } + if (music->buffer) { + SDL_free(music->buffer); + } + if (music->freesrc) { + SDL_RWclose(music->src); + } + SDL_free(music); +} + +Mix_MusicInterface Mix_MusicInterface_Opus = +{ + "OPUS", + MIX_MUSIC_OPUS, + MUS_OPUS, + SDL_FALSE, + SDL_FALSE, + + OPUS_Load, + NULL, /* Open */ + OPUS_CreateFromRW, + NULL, /* CreateFromFile */ + OPUS_SetVolume, + OPUS_Play, + NULL, /* IsPlaying */ + OPUS_GetAudio, + OPUS_Seek, + NULL, /* Pause */ + NULL, /* Resume */ + NULL, /* Stop */ + OPUS_Delete, + NULL, /* Close */ + OPUS_Unload, +}; + +#endif /* MUSIC_OPUS */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/music_opus.h b/music_opus.h new file mode 100644 index 0000000..a207bc5 --- /dev/null +++ b/music_opus.h @@ -0,0 +1,28 @@ +/* + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997-2018 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +/* This file supports Ogg Opus music streams */ + +#include "music.h" + +extern Mix_MusicInterface Mix_MusicInterface_Opus; + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/music_smpeg.c b/music_smpeg.c deleted file mode 100644 index b333bcb..0000000 --- a/music_smpeg.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifdef MUSIC_MP3_SMPEG - -#include "SDL_loadso.h" - -#include "music_smpeg.h" - -#if SDL_VERSION_ATLEAST(2, 0, 0) -/* Forward declaration for SDL 2.0 because struct is not available there but - still used in a file included with smpeg.h. May not compile if missing. */ -typedef struct SDL_Overlay SDL_Overlay; -#endif - -#include "smpeg.h" - -typedef struct { - int loaded; - void *handle; - void (*SMPEG_actualSpec)(SMPEG *mpeg, SDL_AudioSpec *spec); - void (*SMPEG_delete)(SMPEG* mpeg); - void (*SMPEG_enableaudio)(SMPEG* mpeg, int enable); - void (*SMPEG_enablevideo)(SMPEG* mpeg, int enable); - SMPEG* (*SMPEG_new_rwops)(SDL_RWops *src, SMPEG_Info* info, int freesrc, int sdl_audio); - void (*SMPEG_play)(SMPEG* mpeg); - int (*SMPEG_playAudio)(SMPEG *mpeg, Uint8 *stream, int len); - void (*SMPEG_rewind)(SMPEG* mpeg); - void (*SMPEG_setvolume)(SMPEG* mpeg, int volume); - void (*SMPEG_skip)(SMPEG* mpeg, float seconds); - SMPEGstatus (*SMPEG_status)(SMPEG* mpeg); - void (*SMPEG_stop)(SMPEG* mpeg); -} smpeg_loader; - -static smpeg_loader smpeg = { - 0, NULL -}; - -#ifdef SMPEG_DYNAMIC -#define FUNCTION_LOADER(FUNC, SIG) \ - smpeg.FUNC = (SIG) SDL_LoadFunction(smpeg.handle, #FUNC); \ - if (smpeg.FUNC == NULL) { SDL_UnloadObject(smpeg.handle); return -1; } -#else -#define FUNCTION_LOADER(FUNC, SIG) \ - smpeg.FUNC = FUNC; -#endif - -static int SMPEG_Load(void) -{ - if (smpeg.loaded == 0) { -#ifdef SMPEG_DYNAMIC - smpeg.handle = SDL_LoadObject(SMPEG_DYNAMIC); - if (smpeg.handle == NULL) { - return -1; - } -#elif defined(__MACOSX__) - extern SMPEG* SMPEG_new_rwops(SDL_RWops*, SMPEG_Info*, int, int) __attribute__((weak_import)); - if (SMPEG_new_rwops == NULL) - { - /* Missing weakly linked framework */ - Mix_SetError("Missing smpeg2.framework"); - return -1; - } -#endif - FUNCTION_LOADER(SMPEG_actualSpec, void (*)(SMPEG *, SDL_AudioSpec *)) - FUNCTION_LOADER(SMPEG_delete, void (*)(SMPEG*)) - FUNCTION_LOADER(SMPEG_enableaudio, void (*)(SMPEG*, int)) - FUNCTION_LOADER(SMPEG_enablevideo, void (*)(SMPEG*, int)) - FUNCTION_LOADER(SMPEG_new_rwops, SMPEG* (*)(SDL_RWops *, SMPEG_Info*, int, int)) - FUNCTION_LOADER(SMPEG_play, void (*)(SMPEG*)) - FUNCTION_LOADER(SMPEG_playAudio, int (*)(SMPEG *, Uint8 *, int)) - FUNCTION_LOADER(SMPEG_rewind, void (*)(SMPEG*)) - FUNCTION_LOADER(SMPEG_setvolume, void (*)(SMPEG*, int)) - FUNCTION_LOADER(SMPEG_skip, void (*)(SMPEG*, float)) - FUNCTION_LOADER(SMPEG_status, SMPEGstatus (*)(SMPEG*)) - FUNCTION_LOADER(SMPEG_stop, void (*)(SMPEG*)) - } - ++smpeg.loaded; - - return 0; -} - -static void SMPEG_Unload(void) -{ - if (smpeg.loaded == 0) { - return; - } - if (smpeg.loaded == 1) { -#ifdef SMPEG_DYNAMIC - SDL_UnloadObject(smpeg.handle); -#endif - } - --smpeg.loaded; -} - - -typedef struct -{ - SMPEG *mp3; - SDL_RWops *src; - int freesrc; -} SMPEG_Music; - -static void *SMPEG_CreateFromRW(SDL_RWops *src, int freesrc) -{ - SMPEG_Music *music; - SMPEG_Info info; - - music = (SMPEG_Music *)SDL_calloc(1, sizeof(*music)); - if (!music) { - SDL_OutOfMemory(); - return NULL; - } - music->src = src; - - music->mp3 = smpeg.SMPEG_new_rwops(src, &info, SDL_FALSE, 0); - if (!info.has_audio) { - Mix_SetError("MPEG file does not have any audio stream."); - smpeg.SMPEG_delete(music->mp3); - SDL_free(music); - return NULL; - } - smpeg.SMPEG_actualSpec(mp3, &music_spec); - - music->freesrc = freesrc; - return music; -} - -static void SMPEG_SetVolume(void *context, int volume) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - smpeg.SMPEG_setvolume(music->mp3,(int)(((float)volume/(float)MIX_MAX_VOLUME)*100.0)); -} - -static int SMPEG_Play(void *context) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - smpeg.SMPEG_enableaudio(music->mp3, 1); - smpeg.SMPEG_enablevideo(music->mp3, 0); - smpeg.SMPEG_rewind(music->mp3); - smpeg.SMPEG_play(music->mp3); - return 0; -} - -static SDL_bool SMPEG_IsPlaying(void *context) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - return smpeg.SMPEG_status(music->mp3) == SMPEG_PLAYING ? SDL_TRUE : SDL_FALSE; -} - -static int SMPEG_GetAudio(void *context, void *data, int bytes) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - Uint8 *stream = (Uint8 *)data; - int len = bytes; - int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len)); - if (left > 0) { - stream += (len - left); - return left; -} - -static int SMPEG_Seek(void *context, double position) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - smpeg.SMPEG_rewind(music->mp3); - smpeg.SMPEG_play(music->mp3); - if (position > 0.0) { - smpeg.SMPEG_skip(music->mp3, (float)position); - } - return 0; -} - -static void SMPEG_Stop(void *context) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - smpeg.SMPEG_stop(music->mp3); -} - -static void SMPEG_Delete(void *context) -{ - SMPEG_Music *music = (SMPEG_Music *)context; - - smpeg.SMPEG_delete(music->mp3); - - if (music->freesrc) { - SDL_RWclose(music->src); - } - SDL_free(music); -} - -Mix_MusicInterface Mix_MusicInterface_SMPEG = -{ - "SMPEG", - MIX_MUSIC_SMPEG, - MUS_MP3, - SDL_FALSE, - SDL_FALSE, - - SMPEG_Load, - NULL, /* Open */ - SMPEG_CreateFromRW, - NULL, /* CreateFromFile */ - SMPEG_SetVolume, - SMPEG_Play, - SMPEG_IsPlaying, - SMPEG_GetAudio, - SMPEG_Seek, - NULL, /* Pause */ - NULL, /* Resume */ - SMPEG_Stop, - SMPEG_Delete, - NULL, /* Close */ - SMPEG_Unload, -}; - -#endif /* MUSIC_MP3_SMPEG */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/music_smpeg.h b/music_smpeg.h deleted file mode 100644 index ddea251..0000000 --- a/music_smpeg.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/* This file supports playing MP3 files with smpeg */ - -#include "music.h" - -extern Mix_MusicInterface Mix_MusicInterface_SMPEG; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/music_timidity.c b/music_timidity.c index bca278b..68634fd 100644 --- a/music_timidity.c +++ b/music_timidity.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_timidity.h b/music_timidity.h index 62301d8..1884097 100644 --- a/music_timidity.h +++ b/music_timidity.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_wav.c b/music_wav.c index 5eb34b1..21e20dc 100644 --- a/music_wav.c +++ b/music_wav.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/music_wav.h b/music_wav.h index 1deacfb..98dc7e6 100644 --- a/music_wav.h +++ b/music_wav.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/playmus.c b/playmus.c index 8ff015d..744407e 100644 --- a/playmus.c +++ b/playmus.c @@ -1,6 +1,6 @@ /* PLAYMUS: A test application for the SDL mixer library. - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/playwave.c b/playwave.c index ac63636..e98bd55 100644 --- a/playwave.c +++ b/playwave.c @@ -1,6 +1,6 @@ /* PLAYWAVE: A test application for the SDL mixer library. - Copyright (C) 1997-2017 Sam Lantinga + Copyright (C) 1997-2018 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/timidity/readmidi.c b/timidity/readmidi.c index 17c359f..bfe6377 100644 --- a/timidity/readmidi.c +++ b/timidity/readmidi.c @@ -97,7 +97,7 @@ if (SDL_RWread(song->rw, &me, 1, 1) != 1) { SNDDBG(("read_midi_event: SDL_RWread() failure\n")); - return 0; + return NULL; } if(me==0xF0 || me == 0xF7) /* SysEx event */ @@ -334,7 +334,7 @@ free(meep); meep=next; } - song->evlist=0; + song->evlist=NULL; } /* Allocate an array of MidiEvents and fill it from the linked list of @@ -455,12 +455,23 @@ /* Recompute time in samples*/ if ((dt=meep->event.time - at) && !counting_time) { + if (song->sample_increment > 2147483647/dt || + song->sample_correction > 2147483647/dt) { + goto _overflow; + } samples_to_do = song->sample_increment * dt; sample_cum += song->sample_correction * dt; if (sample_cum & 0xFFFF0000) { samples_to_do += ((sample_cum >> 16) & 0xFFFF); sample_cum &= 0x0000FFFF; + } + if (st >= 2147483647 - samples_to_do) { + _overflow: + SNDDBG(("Overflow in sample counter\n")); + free_midi_list(song); + free(groomed_list); + return NULL; } st += samples_to_do; } @@ -502,18 +513,29 @@ song->event_count=0; song->at=0; - song->evlist=0; + song->evlist = NULL; if (SDL_RWread(song->rw, tmp, 1, 4) != 4 || SDL_RWread(song->rw, &len, 4, 1) != 1) { SNDDBG(("Not a MIDI file!\n")); - return 0; - } + return NULL; + } + if (memcmp(tmp, "RIFF", 4) == 0) { /* RMID ?? */ + if (SDL_RWread(song->rw, tmp, 1, 4) != 4 || memcmp(tmp, "RMID", 4) != 0 || + SDL_RWread(song->rw, tmp, 1, 4) != 4 || memcmp(tmp, "data", 4) != 0 || + SDL_RWread(song->rw, tmp, 1, 4) != 4 || + /* SMF must begin from here onwards: */ + SDL_RWread(song->rw, tmp, 1, 4) != 4 || SDL_RWread(song->rw, &len, 4, 1) != 1) + { + SNDDBG(("Not an RMID file!\n")); + return NULL; + } + } len=SDL_SwapBE32(len); if (memcmp(tmp, "MThd", 4) || len < 6) { SNDDBG(("Not a MIDI file!\n")); - return 0; + return NULL; } SDL_RWread(song->rw, &format, 2, 1); @@ -539,17 +561,17 @@ if (format<0 || format >2) { SNDDBG(("Unknown MIDI file format %d\n", format)); - return 0; + return NULL; } if (tracks<1) { SNDDBG(("Bad number of tracks %d\n", tracks)); - return 0; + return NULL; } if (format==0 && tracks!=1) { SNDDBG(("%d tracks with Type-0 MIDI (must be 1.)\n", tracks)); - return 0; + return NULL; } SNDDBG(("Format: %d Tracks: %d Divisions: %d\n", format, tracks, divisions)); @@ -565,7 +587,7 @@ if (read_track(song, 0)) { free_midi_list(song); - return 0; + return NULL; } break; @@ -574,7 +596,7 @@ if (read_track(song, 0)) { free_midi_list(song); - return 0; + return NULL; } break; @@ -583,9 +605,10 @@ if (read_track(song, 1)) { free_midi_list(song); - return 0; + return NULL; } break; } + return groom_list(song, divisions, count, sp); } diff --git a/timidity/timidity.c b/timidity/timidity.c index 5cf5c9a..6251f87 100644 --- a/timidity/timidity.c +++ b/timidity/timidity.c @@ -459,9 +459,11 @@ if (rw == NULL) return NULL; - + /* Allocate memory for the song */ song = (MidiSong *)safe_malloc(sizeof(*song)); + if (song == NULL) + return NULL; memset(song, 0, sizeof(*song)); for (i = 0; i < MAXBANK; i++) @@ -498,6 +500,7 @@ song->encoding |= PE_MONO; else if (audio->channels > 2) { SDL_SetError("Surround sound not supported"); + free(song); return NULL; } switch (audio->format) { @@ -530,7 +533,8 @@ break; default: SDL_SetError("Unsupported audio format"); - return NULL; + free(song); + return NULL; } song->buffer_size = audio->samples; diff --git a/version.rc b/version.rc index 1ddf32d..95989c7 100644 --- a/version.rc +++ b/version.rc @@ -9,8 +9,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,2,0 - PRODUCTVERSION 2,0,2,0 + FILEVERSION 2,0,4,0 + PRODUCTVERSION 2,0,4,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_mixer\0" - VALUE "FileVersion", "2, 0, 2, 0\0" + VALUE "FileVersion", "2, 0, 4, 0\0" VALUE "InternalName", "SDL_mixer\0" - VALUE "LegalCopyright", "Copyright © 2017 Sam Lantinga\0" + VALUE "LegalCopyright", "Copyright © 2018 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_mixer.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 2, 0\0" + VALUE "ProductVersion", "2, 0, 4, 0\0" END END BLOCK "VarFileInfo"