Updated Windows RT projects and added Timidity MIDI playback
authorSam Lantinga <slouken@libsdl.org>
Sat, 21 Oct 2017 22:28:18 -0700
changeset 828561ae6f09324
parent 827 825514161f97
child 829 ab82b7aff1fd
Updated Windows RT projects and added Timidity MIDI playback
.hgignore
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters
VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj
VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj
VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters
VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj
VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj
VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters
VisualC/SDL_mixer.vcxproj
timidity/timidity.c
     1.1 --- a/.hgignore	Sat Oct 21 15:43:15 2017 -0700
     1.2 +++ b/.hgignore	Sat Oct 21 22:28:18 2017 -0700
     1.3 @@ -13,6 +13,12 @@
     1.4  *.o
     1.5  *.la
     1.6  *.lai
     1.7 +Debug
     1.8 +Release
     1.9 +*.user
    1.10 +*.ncb
    1.11 +*.suo
    1.12 +*.sdf
    1.13  .DS_Store
    1.14  xcuserdata
    1.15  *.xcworkspace
     2.1 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj	Sat Oct 21 15:43:15 2017 -0700
     2.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj	Sat Oct 21 22:28:18 2017 -0700
     2.3 @@ -47,27 +47,21 @@
     2.4      <ClCompile Include="..\..\music_timidity.c" />
     2.5      <ClCompile Include="..\..\music_wav.c" />
     2.6      <ClCompile Include="..\..\timidity\common.c" />
     2.7 -    <ClCompile Include="..\..\timidity\ctrlmode.c" />
     2.8 -    <ClCompile Include="..\..\timidity\filter.c" />
     2.9      <ClCompile Include="..\..\timidity\instrum.c" />
    2.10      <ClCompile Include="..\..\timidity\mix.c" />
    2.11      <ClCompile Include="..\..\timidity\output.c" />
    2.12      <ClCompile Include="..\..\timidity\playmidi.c" />
    2.13      <ClCompile Include="..\..\timidity\readmidi.c" />
    2.14      <ClCompile Include="..\..\timidity\resample.c" />
    2.15 -    <ClCompile Include="..\..\timidity\sdl_a.c" />
    2.16 -    <ClCompile Include="..\..\timidity\sdl_c.c" />
    2.17      <ClCompile Include="..\..\timidity\tables.c" />
    2.18      <ClCompile Include="..\..\timidity\timidity.c" />
    2.19    </ItemGroup>
    2.20    <ItemGroup>
    2.21      <ClInclude Include="..\..\SDL_mixer.h" />
    2.22      <ClInclude Include="..\..\timidity\common.h" />
    2.23 -    <ClInclude Include="..\..\timidity\config.h" />
    2.24 -    <ClInclude Include="..\..\timidity\ctrlmode.h" />
    2.25 -    <ClInclude Include="..\..\timidity\filter.h" />
    2.26      <ClInclude Include="..\..\timidity\instrum.h" />
    2.27      <ClInclude Include="..\..\timidity\mix.h" />
    2.28 +    <ClInclude Include="..\..\timidity\options.h" />
    2.29      <ClInclude Include="..\..\timidity\output.h" />
    2.30      <ClInclude Include="..\..\timidity\playmidi.h" />
    2.31      <ClInclude Include="..\..\timidity\readmidi.h" />
    2.32 @@ -200,7 +194,7 @@
    2.33        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    2.34        <CompileAsWinRT>false</CompileAsWinRT>
    2.35        <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.36 -      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.37 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.38      </ClCompile>
    2.39      <Link>
    2.40        <SubSystem>Console</SubSystem>
    2.41 @@ -213,7 +207,7 @@
    2.42        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    2.43        <CompileAsWinRT>false</CompileAsWinRT>
    2.44        <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.45 -      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.46 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.47      </ClCompile>
    2.48      <Link>
    2.49        <SubSystem>Console</SubSystem>
    2.50 @@ -226,7 +220,7 @@
    2.51        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    2.52        <CompileAsWinRT>false</CompileAsWinRT>
    2.53        <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.54 -      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.55 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.56      </ClCompile>
    2.57      <Link>
    2.58        <SubSystem>Console</SubSystem>
    2.59 @@ -239,7 +233,7 @@
    2.60        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    2.61        <CompileAsWinRT>false</CompileAsWinRT>
    2.62        <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.63 -      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.64 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.65      </ClCompile>
    2.66      <Link>
    2.67        <SubSystem>Console</SubSystem>
    2.68 @@ -252,7 +246,7 @@
    2.69        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    2.70        <CompileAsWinRT>false</CompileAsWinRT>
    2.71        <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.72 -      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.73 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.74      </ClCompile>
    2.75      <Link>
    2.76        <SubSystem>Console</SubSystem>
    2.77 @@ -265,7 +259,7 @@
    2.78        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    2.79        <CompileAsWinRT>false</CompileAsWinRT>
    2.80        <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.81 -      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.82 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.83      </ClCompile>
    2.84      <Link>
    2.85        <SubSystem>Console</SubSystem>
    2.86 @@ -276,4 +270,4 @@
    2.87    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    2.88    <ImportGroup Label="ExtensionTargets">
    2.89    </ImportGroup>
    2.90 -</Project>
    2.91 +</Project>
    2.92 \ No newline at end of file
     3.1 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters	Sat Oct 21 15:43:15 2017 -0700
     3.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters	Sat Oct 21 22:28:18 2017 -0700
     3.3 @@ -1,15 +1,28 @@
     3.4  <?xml version="1.0" encoding="utf-8"?>
     3.5  <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     3.6    <ItemGroup>
     3.7 +    <ClCompile Include="..\..\effect_position.c" />
     3.8 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
     3.9 +    <ClCompile Include="..\..\effects_internal.c" />
    3.10 +    <ClCompile Include="..\..\load_aiff.c" />
    3.11 +    <ClCompile Include="..\..\load_voc.c" />
    3.12 +    <ClCompile Include="..\..\mixer.c" />
    3.13 +    <ClCompile Include="..\..\music.c" />
    3.14 +    <ClCompile Include="..\..\music_cmd.c" />
    3.15 +    <ClCompile Include="..\..\music_flac.c" />
    3.16 +    <ClCompile Include="..\..\music_fluidsynth.c" />
    3.17 +    <ClCompile Include="..\..\music_mad.c" />
    3.18 +    <ClCompile Include="..\..\music_mikmod.c" />
    3.19 +    <ClCompile Include="..\..\music_modplug.c" />
    3.20 +    <ClCompile Include="..\..\music_mpg123.c" />
    3.21 +    <ClCompile Include="..\..\music_nativemidi.c" />
    3.22 +    <ClCompile Include="..\..\music_ogg.c" />
    3.23 +    <ClCompile Include="..\..\music_smpeg.c" />
    3.24 +    <ClCompile Include="..\..\music_timidity.c" />
    3.25 +    <ClCompile Include="..\..\music_wav.c" />
    3.26      <ClCompile Include="..\..\timidity\common.c">
    3.27        <Filter>Timidity</Filter>
    3.28      </ClCompile>
    3.29 -    <ClCompile Include="..\..\timidity\ctrlmode.c">
    3.30 -      <Filter>Timidity</Filter>
    3.31 -    </ClCompile>
    3.32 -    <ClCompile Include="..\..\timidity\filter.c">
    3.33 -      <Filter>Timidity</Filter>
    3.34 -    </ClCompile>
    3.35      <ClCompile Include="..\..\timidity\instrum.c">
    3.36        <Filter>Timidity</Filter>
    3.37      </ClCompile>
    3.38 @@ -28,58 +41,27 @@
    3.39      <ClCompile Include="..\..\timidity\resample.c">
    3.40        <Filter>Timidity</Filter>
    3.41      </ClCompile>
    3.42 -    <ClCompile Include="..\..\timidity\sdl_a.c">
    3.43 -      <Filter>Timidity</Filter>
    3.44 -    </ClCompile>
    3.45 -    <ClCompile Include="..\..\timidity\sdl_c.c">
    3.46 -      <Filter>Timidity</Filter>
    3.47 -    </ClCompile>
    3.48      <ClCompile Include="..\..\timidity\tables.c">
    3.49        <Filter>Timidity</Filter>
    3.50      </ClCompile>
    3.51      <ClCompile Include="..\..\timidity\timidity.c">
    3.52        <Filter>Timidity</Filter>
    3.53      </ClCompile>
    3.54 -    <ClCompile Include="..\..\effect_position.c" />
    3.55 -    <ClCompile Include="..\..\effect_stereoreverse.c" />
    3.56 -    <ClCompile Include="..\..\effects_internal.c" />
    3.57 -    <ClCompile Include="..\..\load_aiff.c" />
    3.58 -    <ClCompile Include="..\..\load_voc.c" />
    3.59 -    <ClCompile Include="..\..\mixer.c" />
    3.60 -    <ClCompile Include="..\..\music.c" />
    3.61 -    <ClCompile Include="..\..\music_cmd.c" />
    3.62 -    <ClCompile Include="..\..\music_flac.c" />
    3.63 -    <ClCompile Include="..\..\music_fluidsynth.c" />
    3.64 -    <ClCompile Include="..\..\music_mad.c" />
    3.65 -    <ClCompile Include="..\..\music_mikmod.c" />
    3.66 -    <ClCompile Include="..\..\music_modplug.c" />
    3.67 -    <ClCompile Include="..\..\music_mpg123.c" />
    3.68 -    <ClCompile Include="..\..\music_nativemidi.c" />
    3.69 -    <ClCompile Include="..\..\music_ogg.c" />
    3.70 -    <ClCompile Include="..\..\music_smpeg.c" />
    3.71 -    <ClCompile Include="..\..\music_timidity.c" />
    3.72 -    <ClCompile Include="..\..\music_wav.c" />
    3.73    </ItemGroup>
    3.74    <ItemGroup>
    3.75      <ClInclude Include="..\..\SDL_mixer.h" />
    3.76      <ClInclude Include="..\..\timidity\common.h">
    3.77        <Filter>Timidity</Filter>
    3.78      </ClInclude>
    3.79 -    <ClInclude Include="..\..\timidity\config.h">
    3.80 -      <Filter>Timidity</Filter>
    3.81 -    </ClInclude>
    3.82 -    <ClInclude Include="..\..\timidity\ctrlmode.h">
    3.83 -      <Filter>Timidity</Filter>
    3.84 -    </ClInclude>
    3.85 -    <ClInclude Include="..\..\timidity\filter.h">
    3.86 -      <Filter>Timidity</Filter>
    3.87 -    </ClInclude>
    3.88      <ClInclude Include="..\..\timidity\instrum.h">
    3.89        <Filter>Timidity</Filter>
    3.90      </ClInclude>
    3.91      <ClInclude Include="..\..\timidity\mix.h">
    3.92        <Filter>Timidity</Filter>
    3.93      </ClInclude>
    3.94 +    <ClInclude Include="..\..\timidity\options.h">
    3.95 +      <Filter>Timidity</Filter>
    3.96 +    </ClInclude>
    3.97      <ClInclude Include="..\..\timidity\output.h">
    3.98        <Filter>Timidity</Filter>
    3.99      </ClInclude>
   3.100 @@ -104,4 +86,4 @@
   3.101        <UniqueIdentifier>{660dbe57-4c07-417e-9609-12b312726942}</UniqueIdentifier>
   3.102      </Filter>
   3.103    </ItemGroup>
   3.104 -</Project>
   3.105 +</Project>
   3.106 \ No newline at end of file
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln	Sat Oct 21 22:28:18 2017 -0700
     4.3 @@ -0,0 +1,56 @@
     4.4 +
     4.5 +Microsoft Visual Studio Solution File, Format Version 12.00
     4.6 +# Visual Studio 2012
     4.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinPhone80", "SDL_mixer-WinPhone80.vcxproj", "{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}"
     4.8 +EndProject
     4.9 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinPhone80", "libogg_dynamic-WinPhone80.vcxproj", "{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}"
    4.10 +EndProject
    4.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinPhone80", "libvorbis_dynamic-WinPhone80.vcxproj", "{8859E555-5684-436D-AD14-4E8CEB11EAD1}"
    4.12 +EndProject
    4.13 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinPhone80", "libvorbisfile_dynamic-WinPhone80.vcxproj", "{E1553EFC-2C62-41AE-ABA3-D933D66D435D}"
    4.14 +EndProject
    4.15 +Global
    4.16 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    4.17 +		Debug|ARM = Debug|ARM
    4.18 +		Debug|Win32 = Debug|Win32
    4.19 +		Release|ARM = Release|ARM
    4.20 +		Release|Win32 = Release|Win32
    4.21 +	EndGlobalSection
    4.22 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
    4.23 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|ARM.ActiveCfg = Debug|ARM
    4.24 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|ARM.Build.0 = Debug|ARM
    4.25 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|Win32.ActiveCfg = Debug|Win32
    4.26 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|Win32.Build.0 = Debug|Win32
    4.27 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|ARM.ActiveCfg = Release|ARM
    4.28 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|ARM.Build.0 = Release|ARM
    4.29 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|Win32.ActiveCfg = Release|Win32
    4.30 +		{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|Win32.Build.0 = Release|Win32
    4.31 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|ARM.ActiveCfg = Debug|ARM
    4.32 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|ARM.Build.0 = Debug|ARM
    4.33 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|Win32.ActiveCfg = Debug|Win32
    4.34 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|Win32.Build.0 = Debug|Win32
    4.35 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|ARM.ActiveCfg = Release|ARM
    4.36 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|ARM.Build.0 = Release|ARM
    4.37 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|Win32.ActiveCfg = Release|Win32
    4.38 +		{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|Win32.Build.0 = Release|Win32
    4.39 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|ARM.ActiveCfg = Debug|ARM
    4.40 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|ARM.Build.0 = Debug|ARM
    4.41 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|Win32.ActiveCfg = Debug|Win32
    4.42 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|Win32.Build.0 = Debug|Win32
    4.43 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|ARM.ActiveCfg = Release|ARM
    4.44 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|ARM.Build.0 = Release|ARM
    4.45 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|Win32.ActiveCfg = Release|Win32
    4.46 +		{8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|Win32.Build.0 = Release|Win32
    4.47 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|ARM.ActiveCfg = Debug|ARM
    4.48 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|ARM.Build.0 = Debug|ARM
    4.49 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|Win32.ActiveCfg = Debug|Win32
    4.50 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|Win32.Build.0 = Debug|Win32
    4.51 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|ARM.ActiveCfg = Release|ARM
    4.52 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|ARM.Build.0 = Release|ARM
    4.53 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|Win32.ActiveCfg = Release|Win32
    4.54 +		{E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|Win32.Build.0 = Release|Win32
    4.55 +	EndGlobalSection
    4.56 +	GlobalSection(SolutionProperties) = preSolution
    4.57 +		HideSolutionNode = FALSE
    4.58 +	EndGlobalSection
    4.59 +EndGlobal
     5.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj	Sat Oct 21 15:43:15 2017 -0700
     5.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj	Sat Oct 21 22:28:18 2017 -0700
     5.3 @@ -78,12 +78,12 @@
     5.4    </PropertyGroup>
     5.5    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     5.6      <ClCompile>
     5.7 -      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     5.8 +      <PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     5.9        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    5.10        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    5.11        <CompileAsWinRT>false</CompileAsWinRT>
    5.12        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    5.13 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.14 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.15      </ClCompile>
    5.16      <Link>
    5.17        <SubSystem>Console</SubSystem>
    5.18 @@ -94,12 +94,12 @@
    5.19    </ItemDefinitionGroup>
    5.20    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    5.21      <ClCompile>
    5.22 -      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.23 +      <PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.24        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    5.25        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    5.26        <CompileAsWinRT>false</CompileAsWinRT>
    5.27        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    5.28 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.29 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.30      </ClCompile>
    5.31      <Link>
    5.32        <SubSystem>Console</SubSystem>
    5.33 @@ -110,12 +110,12 @@
    5.34    </ItemDefinitionGroup>
    5.35    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    5.36      <ClCompile>
    5.37 -      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.38 +      <PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.39        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    5.40        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    5.41        <CompileAsWinRT>false</CompileAsWinRT>
    5.42        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    5.43 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.44 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.45      </ClCompile>
    5.46      <Link>
    5.47        <SubSystem>Console</SubSystem>
    5.48 @@ -126,12 +126,12 @@
    5.49    </ItemDefinitionGroup>
    5.50    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
    5.51      <ClCompile>
    5.52 -      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.53 +      <PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    5.54        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    5.55        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    5.56        <CompileAsWinRT>false</CompileAsWinRT>
    5.57        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    5.58 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.59 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include</AdditionalIncludeDirectories>
    5.60      </ClCompile>
    5.61      <Link>
    5.62        <SubSystem>Console</SubSystem>
    5.63 @@ -150,49 +150,6 @@
    5.64      </Reference>
    5.65    </ItemGroup>
    5.66    <ItemGroup>
    5.67 -    <ClCompile Include="..\..\dynamic_flac.c" />
    5.68 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    5.69 -    <ClCompile Include="..\..\dynamic_mikmod.c" />
    5.70 -    <ClCompile Include="..\..\dynamic_ogg.c" />
    5.71 -    <ClCompile Include="..\..\dynamic_smpeg.c" />
    5.72 -    <ClCompile Include="..\..\effect_position.c" />
    5.73 -    <ClCompile Include="..\..\effect_stereoreverse.c" />
    5.74 -    <ClCompile Include="..\..\effects_internal.c" />
    5.75 -    <ClCompile Include="..\..\fluidsynth.c" />
    5.76 -    <ClCompile Include="..\..\load_aiff.c" />
    5.77 -    <ClCompile Include="..\..\load_flac.c" />
    5.78 -    <ClCompile Include="..\..\load_ogg.c" />
    5.79 -    <ClCompile Include="..\..\load_voc.c" />
    5.80 -    <ClCompile Include="..\..\mixer.c" />
    5.81 -    <ClCompile Include="..\..\music.c" />
    5.82 -    <ClCompile Include="..\..\music_cmd.c" />
    5.83 -    <ClCompile Include="..\..\music_flac.c" />
    5.84 -    <ClCompile Include="..\..\music_mad.c" />
    5.85 -    <ClCompile Include="..\..\music_mikmod.c" />
    5.86 -    <ClCompile Include="..\..\music_ogg.c" />
    5.87 -    <ClCompile Include="..\..\music_wav.c" />
    5.88 -  </ItemGroup>
    5.89 -  <ItemGroup>
    5.90 -    <ClInclude Include="..\..\dynamic_flac.h" />
    5.91 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
    5.92 -    <ClInclude Include="..\..\dynamic_mikmod.h" />
    5.93 -    <ClInclude Include="..\..\dynamic_ogg.h" />
    5.94 -    <ClInclude Include="..\..\dynamic_smpeg.h" />
    5.95 -    <ClInclude Include="..\..\effects_internal.h" />
    5.96 -    <ClInclude Include="..\..\fluidsynth.h" />
    5.97 -    <ClInclude Include="..\..\load_aiff.h" />
    5.98 -    <ClInclude Include="..\..\load_flac.h" />
    5.99 -    <ClInclude Include="..\..\load_ogg.h" />
   5.100 -    <ClInclude Include="..\..\load_voc.h" />
   5.101 -    <ClInclude Include="..\..\music_cmd.h" />
   5.102 -    <ClInclude Include="..\..\music_flac.h" />
   5.103 -    <ClInclude Include="..\..\music_mad.h" />
   5.104 -    <ClInclude Include="..\..\music_mikmod.h" />
   5.105 -    <ClInclude Include="..\..\music_ogg.h" />
   5.106 -    <ClInclude Include="..\..\SDL_mixer.h" />
   5.107 -    <ClInclude Include="..\..\music_wav.h" />
   5.108 -  </ItemGroup>
   5.109 -  <ItemGroup>
   5.110      <ProjectReference Include="..\..\..\SDL\VisualC-WinRT\WinPhone80_VS2012\SDL-WinPhone80.vcxproj">
   5.111        <Project>{33048af1-031a-4ce6-b61e-fad2db832e9e}</Project>
   5.112      </ProjectReference>
   5.113 @@ -206,8 +163,68 @@
   5.114        <Project>{8859e555-5684-436d-ad14-4e8ceb11ead1}</Project>
   5.115      </ProjectReference>
   5.116    </ItemGroup>
   5.117 +  <ItemGroup>
   5.118 +    <ClCompile Include="..\..\effects_internal.c" />
   5.119 +    <ClCompile Include="..\..\effect_position.c" />
   5.120 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
   5.121 +    <ClCompile Include="..\..\load_aiff.c" />
   5.122 +    <ClCompile Include="..\..\load_voc.c" />
   5.123 +    <ClCompile Include="..\..\mixer.c" />
   5.124 +    <ClCompile Include="..\..\music.c" />
   5.125 +    <ClCompile Include="..\..\music_cmd.c" />
   5.126 +    <ClCompile Include="..\..\music_flac.c" />
   5.127 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   5.128 +    <ClCompile Include="..\..\music_mad.c" />
   5.129 +    <ClCompile Include="..\..\music_mikmod.c" />
   5.130 +    <ClCompile Include="..\..\music_modplug.c" />
   5.131 +    <ClCompile Include="..\..\music_mpg123.c" />
   5.132 +    <ClCompile Include="..\..\music_nativemidi.c" />
   5.133 +    <ClCompile Include="..\..\music_ogg.c" />
   5.134 +    <ClCompile Include="..\..\music_smpeg.c" />
   5.135 +    <ClCompile Include="..\..\music_timidity.c" />
   5.136 +    <ClCompile Include="..\..\music_wav.c" />
   5.137 +    <ClCompile Include="..\..\timidity\common.c" />
   5.138 +    <ClCompile Include="..\..\timidity\instrum.c" />
   5.139 +    <ClCompile Include="..\..\timidity\mix.c" />
   5.140 +    <ClCompile Include="..\..\timidity\output.c" />
   5.141 +    <ClCompile Include="..\..\timidity\playmidi.c" />
   5.142 +    <ClCompile Include="..\..\timidity\readmidi.c" />
   5.143 +    <ClCompile Include="..\..\timidity\resample.c" />
   5.144 +    <ClCompile Include="..\..\timidity\tables.c" />
   5.145 +    <ClCompile Include="..\..\timidity\timidity.c" />
   5.146 +  </ItemGroup>
   5.147 +  <ItemGroup>
   5.148 +    <ClInclude Include="..\..\effects_internal.h" />
   5.149 +    <ClInclude Include="..\..\load_aiff.h" />
   5.150 +    <ClInclude Include="..\..\load_voc.h" />
   5.151 +    <ClInclude Include="..\..\mixer.h" />
   5.152 +    <ClInclude Include="..\..\music.h" />
   5.153 +    <ClInclude Include="..\..\music_cmd.h" />
   5.154 +    <ClInclude Include="..\..\music_flac.h" />
   5.155 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   5.156 +    <ClInclude Include="..\..\music_mad.h" />
   5.157 +    <ClInclude Include="..\..\music_mikmod.h" />
   5.158 +    <ClInclude Include="..\..\music_modplug.h" />
   5.159 +    <ClInclude Include="..\..\music_mpg123.h" />
   5.160 +    <ClInclude Include="..\..\music_nativemidi.h" />
   5.161 +    <ClInclude Include="..\..\music_ogg.h" />
   5.162 +    <ClInclude Include="..\..\music_smpeg.h" />
   5.163 +    <ClInclude Include="..\..\music_timidity.h" />
   5.164 +    <ClInclude Include="..\..\music_wav.h" />
   5.165 +    <ClInclude Include="..\..\SDL_mixer.h" />
   5.166 +    <ClInclude Include="..\..\timidity\common.h" />
   5.167 +    <ClInclude Include="..\..\timidity\instrum.h" />
   5.168 +    <ClInclude Include="..\..\timidity\mix.h" />
   5.169 +    <ClInclude Include="..\..\timidity\options.h" />
   5.170 +    <ClInclude Include="..\..\timidity\output.h" />
   5.171 +    <ClInclude Include="..\..\timidity\playmidi.h" />
   5.172 +    <ClInclude Include="..\..\timidity\readmidi.h" />
   5.173 +    <ClInclude Include="..\..\timidity\resample.h" />
   5.174 +    <ClInclude Include="..\..\timidity\tables.h" />
   5.175 +    <ClInclude Include="..\..\timidity\timidity.h" />
   5.176 +  </ItemGroup>
   5.177    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   5.178    <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
   5.179    <ImportGroup Label="ExtensionTargets">
   5.180    </ImportGroup>
   5.181 -</Project>
   5.182 +</Project>
   5.183 \ No newline at end of file
     6.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters	Sat Oct 21 15:43:15 2017 -0700
     6.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters	Sat Oct 21 22:28:18 2017 -0700
     6.3 @@ -1,46 +1,106 @@
     6.4  <?xml version="1.0" encoding="utf-8"?>
     6.5  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     6.6    <ItemGroup>
     6.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
     6.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
     6.9 -    <ClCompile Include="..\..\dynamic_mikmod.c" />
    6.10 -    <ClCompile Include="..\..\dynamic_ogg.c" />
    6.11 -    <ClCompile Include="..\..\dynamic_smpeg.c" />
    6.12      <ClCompile Include="..\..\effect_position.c" />
    6.13      <ClCompile Include="..\..\effect_stereoreverse.c" />
    6.14      <ClCompile Include="..\..\effects_internal.c" />
    6.15 -    <ClCompile Include="..\..\fluidsynth.c" />
    6.16      <ClCompile Include="..\..\load_aiff.c" />
    6.17 -    <ClCompile Include="..\..\load_flac.c" />
    6.18 -    <ClCompile Include="..\..\load_ogg.c" />
    6.19      <ClCompile Include="..\..\load_voc.c" />
    6.20      <ClCompile Include="..\..\mixer.c" />
    6.21      <ClCompile Include="..\..\music.c" />
    6.22      <ClCompile Include="..\..\music_cmd.c" />
    6.23      <ClCompile Include="..\..\music_flac.c" />
    6.24 +    <ClCompile Include="..\..\music_fluidsynth.c" />
    6.25      <ClCompile Include="..\..\music_mad.c" />
    6.26      <ClCompile Include="..\..\music_mikmod.c" />
    6.27 +    <ClCompile Include="..\..\music_modplug.c" />
    6.28 +    <ClCompile Include="..\..\music_mpg123.c" />
    6.29 +    <ClCompile Include="..\..\music_nativemidi.c" />
    6.30      <ClCompile Include="..\..\music_ogg.c" />
    6.31 +    <ClCompile Include="..\..\music_smpeg.c" />
    6.32 +    <ClCompile Include="..\..\music_timidity.c" />
    6.33      <ClCompile Include="..\..\music_wav.c" />
    6.34 +    <ClCompile Include="..\..\timidity\common.c">
    6.35 +      <Filter>Timidity</Filter>
    6.36 +    </ClCompile>
    6.37 +    <ClCompile Include="..\..\timidity\instrum.c">
    6.38 +      <Filter>Timidity</Filter>
    6.39 +    </ClCompile>
    6.40 +    <ClCompile Include="..\..\timidity\mix.c">
    6.41 +      <Filter>Timidity</Filter>
    6.42 +    </ClCompile>
    6.43 +    <ClCompile Include="..\..\timidity\output.c">
    6.44 +      <Filter>Timidity</Filter>
    6.45 +    </ClCompile>
    6.46 +    <ClCompile Include="..\..\timidity\playmidi.c">
    6.47 +      <Filter>Timidity</Filter>
    6.48 +    </ClCompile>
    6.49 +    <ClCompile Include="..\..\timidity\readmidi.c">
    6.50 +      <Filter>Timidity</Filter>
    6.51 +    </ClCompile>
    6.52 +    <ClCompile Include="..\..\timidity\resample.c">
    6.53 +      <Filter>Timidity</Filter>
    6.54 +    </ClCompile>
    6.55 +    <ClCompile Include="..\..\timidity\tables.c">
    6.56 +      <Filter>Timidity</Filter>
    6.57 +    </ClCompile>
    6.58 +    <ClCompile Include="..\..\timidity\timidity.c">
    6.59 +      <Filter>Timidity</Filter>
    6.60 +    </ClCompile>
    6.61    </ItemGroup>
    6.62    <ItemGroup>
    6.63 -    <ClInclude Include="..\..\dynamic_flac.h" />
    6.64 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
    6.65 -    <ClInclude Include="..\..\dynamic_mikmod.h" />
    6.66 -    <ClInclude Include="..\..\dynamic_ogg.h" />
    6.67 -    <ClInclude Include="..\..\dynamic_smpeg.h" />
    6.68      <ClInclude Include="..\..\effects_internal.h" />
    6.69 -    <ClInclude Include="..\..\fluidsynth.h" />
    6.70      <ClInclude Include="..\..\load_aiff.h" />
    6.71 -    <ClInclude Include="..\..\load_flac.h" />
    6.72 -    <ClInclude Include="..\..\load_ogg.h" />
    6.73      <ClInclude Include="..\..\load_voc.h" />
    6.74 +    <ClInclude Include="..\..\mixer.h" />
    6.75 +    <ClInclude Include="..\..\music.h" />
    6.76      <ClInclude Include="..\..\music_cmd.h" />
    6.77      <ClInclude Include="..\..\music_flac.h" />
    6.78 +    <ClInclude Include="..\..\music_fluidsynth.h" />
    6.79      <ClInclude Include="..\..\music_mad.h" />
    6.80      <ClInclude Include="..\..\music_mikmod.h" />
    6.81 +    <ClInclude Include="..\..\music_modplug.h" />
    6.82 +    <ClInclude Include="..\..\music_mpg123.h" />
    6.83 +    <ClInclude Include="..\..\music_nativemidi.h" />
    6.84      <ClInclude Include="..\..\music_ogg.h" />
    6.85 +    <ClInclude Include="..\..\music_smpeg.h" />
    6.86 +    <ClInclude Include="..\..\music_timidity.h" />
    6.87 +    <ClInclude Include="..\..\music_wav.h" />
    6.88      <ClInclude Include="..\..\SDL_mixer.h" />
    6.89 -    <ClInclude Include="..\..\music_wav.h" />
    6.90 +    <ClInclude Include="..\..\timidity\common.h">
    6.91 +      <Filter>Timidity</Filter>
    6.92 +    </ClInclude>
    6.93 +    <ClInclude Include="..\..\timidity\instrum.h">
    6.94 +      <Filter>Timidity</Filter>
    6.95 +    </ClInclude>
    6.96 +    <ClInclude Include="..\..\timidity\mix.h">
    6.97 +      <Filter>Timidity</Filter>
    6.98 +    </ClInclude>
    6.99 +    <ClInclude Include="..\..\timidity\options.h">
   6.100 +      <Filter>Timidity</Filter>
   6.101 +    </ClInclude>
   6.102 +    <ClInclude Include="..\..\timidity\output.h">
   6.103 +      <Filter>Timidity</Filter>
   6.104 +    </ClInclude>
   6.105 +    <ClInclude Include="..\..\timidity\playmidi.h">
   6.106 +      <Filter>Timidity</Filter>
   6.107 +    </ClInclude>
   6.108 +    <ClInclude Include="..\..\timidity\readmidi.h">
   6.109 +      <Filter>Timidity</Filter>
   6.110 +    </ClInclude>
   6.111 +    <ClInclude Include="..\..\timidity\resample.h">
   6.112 +      <Filter>Timidity</Filter>
   6.113 +    </ClInclude>
   6.114 +    <ClInclude Include="..\..\timidity\tables.h">
   6.115 +      <Filter>Timidity</Filter>
   6.116 +    </ClInclude>
   6.117 +    <ClInclude Include="..\..\timidity\timidity.h">
   6.118 +      <Filter>Timidity</Filter>
   6.119 +    </ClInclude>
   6.120    </ItemGroup>
   6.121 -</Project>
   6.122 +  <ItemGroup>
   6.123 +    <Filter Include="Timidity">
   6.124 +      <UniqueIdentifier>{ba754ab5-5a7c-4e3c-9a2f-a1a8cf93fa90}</UniqueIdentifier>
   6.125 +    </Filter>
   6.126 +  </ItemGroup>
   6.127 +</Project>
   6.128 \ No newline at end of file
     7.1 --- a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj	Sat Oct 21 15:43:15 2017 -0700
     7.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj	Sat Oct 21 22:28:18 2017 -0700
     7.3 @@ -83,7 +83,7 @@
     7.4        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     7.5        <CompileAsWinRT>false</CompileAsWinRT>
     7.6        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
     7.7 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
     7.8 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
     7.9        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    7.10      </ClCompile>
    7.11      <Link>
    7.12 @@ -91,7 +91,7 @@
    7.13        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    7.14        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    7.15        <GenerateDebugInformation>true</GenerateDebugInformation>
    7.16 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    7.17 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    7.18      </Link>
    7.19    </ItemDefinitionGroup>
    7.20    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    7.21 @@ -101,7 +101,7 @@
    7.22        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    7.23        <CompileAsWinRT>false</CompileAsWinRT>
    7.24        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    7.25 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    7.26 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    7.27        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    7.28      </ClCompile>
    7.29      <Link>
    7.30 @@ -109,7 +109,7 @@
    7.31        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    7.32        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    7.33        <GenerateDebugInformation>true</GenerateDebugInformation>
    7.34 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    7.35 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    7.36      </Link>
    7.37    </ItemDefinitionGroup>
    7.38    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    7.39 @@ -119,7 +119,7 @@
    7.40        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    7.41        <CompileAsWinRT>false</CompileAsWinRT>
    7.42        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    7.43 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    7.44 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    7.45        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    7.46      </ClCompile>
    7.47      <Link>
    7.48 @@ -127,7 +127,7 @@
    7.49        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    7.50        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    7.51        <GenerateDebugInformation>true</GenerateDebugInformation>
    7.52 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    7.53 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    7.54      </Link>
    7.55    </ItemDefinitionGroup>
    7.56    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
    7.57 @@ -137,7 +137,7 @@
    7.58        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    7.59        <CompileAsWinRT>false</CompileAsWinRT>
    7.60        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    7.61 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    7.62 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    7.63        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    7.64      </ClCompile>
    7.65      <Link>
    7.66 @@ -145,7 +145,7 @@
    7.67        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    7.68        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    7.69        <GenerateDebugInformation>true</GenerateDebugInformation>
    7.70 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    7.71 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    7.72      </Link>
    7.73    </ItemDefinitionGroup>
    7.74    <ItemGroup>
    7.75 @@ -158,18 +158,18 @@
    7.76      </Reference>
    7.77    </ItemGroup>
    7.78    <ItemGroup>
    7.79 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\bitwise.c" />
    7.80 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\framing.c" />
    7.81 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\bitwise.c" />
    7.82 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\framing.c" />
    7.83    </ItemGroup>
    7.84    <ItemGroup>
    7.85 -    <None Include="..\..\external\libogg-1.3.1\win32\ogg.def" />
    7.86 +    <None Include="..\..\external\libogg-1.3.2\win32\ogg.def" />
    7.87    </ItemGroup>
    7.88    <ItemGroup>
    7.89 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\ogg.h" />
    7.90 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\os_types.h" />
    7.91 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\ogg.h" />
    7.92 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\os_types.h" />
    7.93    </ItemGroup>
    7.94    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    7.95    <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
    7.96    <ImportGroup Label="ExtensionTargets">
    7.97    </ImportGroup>
    7.98 -</Project>
    7.99 \ No newline at end of file
   7.100 +</Project>
     8.1 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj	Sat Oct 21 15:43:15 2017 -0700
     8.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj	Sat Oct 21 22:28:18 2017 -0700
     8.3 @@ -83,14 +83,14 @@
     8.4        <CompileAsWinRT>false</CompileAsWinRT>
     8.5        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
     8.6        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
     8.7 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
     8.8 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
     8.9      </ClCompile>
    8.10      <Link>
    8.11        <SubSystem>Console</SubSystem>
    8.12        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.13        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.14        <GenerateDebugInformation>true</GenerateDebugInformation>
    8.15 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
    8.16 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
    8.17      </Link>
    8.18    </ItemDefinitionGroup>
    8.19    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    8.20 @@ -101,14 +101,14 @@
    8.21        <CompileAsWinRT>false</CompileAsWinRT>
    8.22        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    8.23        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
    8.24 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    8.25 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    8.26      </ClCompile>
    8.27      <Link>
    8.28        <SubSystem>Console</SubSystem>
    8.29        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.30        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.31        <GenerateDebugInformation>true</GenerateDebugInformation>
    8.32 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
    8.33 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
    8.34      </Link>
    8.35    </ItemDefinitionGroup>
    8.36    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    8.37 @@ -119,14 +119,14 @@
    8.38        <CompileAsWinRT>false</CompileAsWinRT>
    8.39        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    8.40        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
    8.41 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    8.42 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    8.43      </ClCompile>
    8.44      <Link>
    8.45        <SubSystem>Console</SubSystem>
    8.46        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.47        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.48        <GenerateDebugInformation>true</GenerateDebugInformation>
    8.49 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
    8.50 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
    8.51      </Link>
    8.52    </ItemDefinitionGroup>
    8.53    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
    8.54 @@ -137,14 +137,14 @@
    8.55        <CompileAsWinRT>false</CompileAsWinRT>
    8.56        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    8.57        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
    8.58 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    8.59 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    8.60      </ClCompile>
    8.61      <Link>
    8.62        <SubSystem>Console</SubSystem>
    8.63        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.64        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.65        <GenerateDebugInformation>true</GenerateDebugInformation>
    8.66 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
    8.67 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
    8.68      </Link>
    8.69    </ItemDefinitionGroup>
    8.70    <ItemGroup>
    8.71 @@ -157,74 +157,74 @@
    8.72      </Reference>
    8.73    </ItemGroup>
    8.74    <ItemGroup>
    8.75 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\analysis.c" />
    8.76 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\bitrate.c" />
    8.77 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\block.c" />
    8.78 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\codebook.c" />
    8.79 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\envelope.c" />
    8.80 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor0.c" />
    8.81 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor1.c" />
    8.82 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\info.c" />
    8.83 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lookup.c" />
    8.84 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lpc.c" />
    8.85 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lsp.c" />
    8.86 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mapping0.c" />
    8.87 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mdct.c" />
    8.88 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\psy.c" />
    8.89 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\registry.c" />
    8.90 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\res0.c" />
    8.91 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\sharedbook.c" />
    8.92 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\smallft.c" />
    8.93 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\synthesis.c" />
    8.94 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisenc.c" />
    8.95 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\window.c" />
    8.96 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\analysis.c" />
    8.97 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\bitrate.c" />
    8.98 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\block.c" />
    8.99 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\codebook.c" />
   8.100 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\envelope.c" />
   8.101 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor0.c" />
   8.102 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor1.c" />
   8.103 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\info.c" />
   8.104 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lookup.c" />
   8.105 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lpc.c" />
   8.106 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lsp.c" />
   8.107 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mapping0.c" />
   8.108 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mdct.c" />
   8.109 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\psy.c" />
   8.110 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\registry.c" />
   8.111 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\res0.c" />
   8.112 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\sharedbook.c" />
   8.113 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\smallft.c" />
   8.114 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\synthesis.c" />
   8.115 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisenc.c" />
   8.116 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\window.c" />
   8.117    </ItemGroup>
   8.118    <ItemGroup>
   8.119 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\codec.h" />
   8.120 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisenc.h" />
   8.121 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
   8.122 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\backends.h" />
   8.123 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\bitrate.h" />
   8.124 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\coupled\res_books_stereo.h" />
   8.125 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\floor\floor_books.h" />
   8.126 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\uncoupled\res_books_uncoupled.h" />
   8.127 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codebook.h" />
   8.128 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codec_internal.h" />
   8.129 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\envelope.h" />
   8.130 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\highlevel.h" />
   8.131 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup.h" />
   8.132 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup_data.h" />
   8.133 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lpc.h" />
   8.134 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lsp.h" />
   8.135 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\masking.h" />
   8.136 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\mdct.h" />
   8.137 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\misc.h" />
   8.138 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\floor_all.h" />
   8.139 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_11.h" />
   8.140 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_16.h" />
   8.141 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_44.h" />
   8.142 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_8.h" />
   8.143 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_16.h" />
   8.144 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44.h" />
   8.145 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44u.h" />
   8.146 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_8.h" />
   8.147 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_11.h" />
   8.148 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_16.h" />
   8.149 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_22.h" />
   8.150 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_32.h" />
   8.151 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44.h" />
   8.152 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44u.h" />
   8.153 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_8.h" />
   8.154 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_X.h" />
   8.155 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\os.h" />
   8.156 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\psy.h" />
   8.157 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\registry.h" />
   8.158 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\scales.h" />
   8.159 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\smallft.h" />
   8.160 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\window.h" />
   8.161 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\codec.h" />
   8.162 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisenc.h" />
   8.163 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
   8.164 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\backends.h" />
   8.165 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\bitrate.h" />
   8.166 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\coupled\res_books_stereo.h" />
   8.167 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\floor\floor_books.h" />
   8.168 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\uncoupled\res_books_uncoupled.h" />
   8.169 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codebook.h" />
   8.170 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codec_internal.h" />
   8.171 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\envelope.h" />
   8.172 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\highlevel.h" />
   8.173 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup.h" />
   8.174 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup_data.h" />
   8.175 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lpc.h" />
   8.176 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lsp.h" />
   8.177 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\masking.h" />
   8.178 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\mdct.h" />
   8.179 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\misc.h" />
   8.180 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\floor_all.h" />
   8.181 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_11.h" />
   8.182 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_16.h" />
   8.183 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_44.h" />
   8.184 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_8.h" />
   8.185 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_16.h" />
   8.186 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44.h" />
   8.187 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44u.h" />
   8.188 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_8.h" />
   8.189 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_11.h" />
   8.190 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_16.h" />
   8.191 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_22.h" />
   8.192 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_32.h" />
   8.193 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44.h" />
   8.194 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44u.h" />
   8.195 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_8.h" />
   8.196 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_X.h" />
   8.197 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\os.h" />
   8.198 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\psy.h" />
   8.199 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\registry.h" />
   8.200 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\scales.h" />
   8.201 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\smallft.h" />
   8.202 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\window.h" />
   8.203    </ItemGroup>
   8.204    <ItemGroup>
   8.205 -    <None Include="..\..\external\libvorbis-1.3.3\win32\vorbis.def" />
   8.206 +    <None Include="..\..\external\libvorbis-1.3.5\win32\vorbis.def" />
   8.207    </ItemGroup>
   8.208    <ItemGroup>
   8.209      <ProjectReference Include="libogg_dynamic-WinPhone80.vcxproj">
   8.210 @@ -235,4 +235,4 @@
   8.211    <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
   8.212    <ImportGroup Label="ExtensionTargets">
   8.213    </ImportGroup>
   8.214 -</Project>
   8.215 \ No newline at end of file
   8.216 +</Project>
     9.1 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj	Sat Oct 21 15:43:15 2017 -0700
     9.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj	Sat Oct 21 22:28:18 2017 -0700
     9.3 @@ -82,14 +82,14 @@
     9.4        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     9.5        <CompileAsWinRT>false</CompileAsWinRT>
     9.6        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
     9.7 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
     9.8 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
     9.9      </ClCompile>
    9.10      <Link>
    9.11        <SubSystem>Console</SubSystem>
    9.12        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    9.13        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    9.14        <GenerateDebugInformation>true</GenerateDebugInformation>
    9.15 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
    9.16 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
    9.17      </Link>
    9.18    </ItemDefinitionGroup>
    9.19    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    9.20 @@ -99,14 +99,14 @@
    9.21        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    9.22        <CompileAsWinRT>false</CompileAsWinRT>
    9.23        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    9.24 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    9.25 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    9.26      </ClCompile>
    9.27      <Link>
    9.28        <SubSystem>Console</SubSystem>
    9.29        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    9.30        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    9.31        <GenerateDebugInformation>true</GenerateDebugInformation>
    9.32 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
    9.33 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
    9.34      </Link>
    9.35    </ItemDefinitionGroup>
    9.36    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    9.37 @@ -116,14 +116,14 @@
    9.38        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    9.39        <CompileAsWinRT>false</CompileAsWinRT>
    9.40        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    9.41 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    9.42 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    9.43      </ClCompile>
    9.44      <Link>
    9.45        <SubSystem>Console</SubSystem>
    9.46        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    9.47        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    9.48        <GenerateDebugInformation>true</GenerateDebugInformation>
    9.49 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
    9.50 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
    9.51      </Link>
    9.52    </ItemDefinitionGroup>
    9.53    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
    9.54 @@ -133,14 +133,14 @@
    9.55        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
    9.56        <CompileAsWinRT>false</CompileAsWinRT>
    9.57        <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    9.58 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include</AdditionalIncludeDirectories>
    9.59 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include</AdditionalIncludeDirectories>
    9.60      </ClCompile>
    9.61      <Link>
    9.62        <SubSystem>Console</SubSystem>
    9.63        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    9.64        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    9.65        <GenerateDebugInformation>true</GenerateDebugInformation>
    9.66 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
    9.67 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
    9.68      </Link>
    9.69    </ItemDefinitionGroup>
    9.70    <ItemGroup>
    9.71 @@ -153,10 +153,10 @@
    9.72      </Reference>
    9.73    </ItemGroup>
    9.74    <ItemGroup>
    9.75 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisfile.c" />
    9.76 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisfile.c" />
    9.77    </ItemGroup>
    9.78    <ItemGroup>
    9.79 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
    9.80 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
    9.81    </ItemGroup>
    9.82    <ItemGroup>
    9.83      <ProjectReference Include="libogg_dynamic-WinPhone80.vcxproj">
    9.84 @@ -170,4 +170,4 @@
    9.85    <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
    9.86    <ImportGroup Label="ExtensionTargets">
    9.87    </ImportGroup>
    9.88 -</Project>
    9.89 \ No newline at end of file
    9.90 +</Project>
    10.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj	Sat Oct 21 15:43:15 2017 -0700
    10.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj	Sat Oct 21 22:28:18 2017 -0700
    10.3 @@ -52,6 +52,15 @@
    10.4      <ClCompile Include="..\..\music_smpeg.c" />
    10.5      <ClCompile Include="..\..\music_timidity.c" />
    10.6      <ClCompile Include="..\..\music_wav.c" />
    10.7 +    <ClCompile Include="..\..\timidity\common.c" />
    10.8 +    <ClCompile Include="..\..\timidity\instrum.c" />
    10.9 +    <ClCompile Include="..\..\timidity\mix.c" />
   10.10 +    <ClCompile Include="..\..\timidity\output.c" />
   10.11 +    <ClCompile Include="..\..\timidity\playmidi.c" />
   10.12 +    <ClCompile Include="..\..\timidity\readmidi.c" />
   10.13 +    <ClCompile Include="..\..\timidity\resample.c" />
   10.14 +    <ClCompile Include="..\..\timidity\tables.c" />
   10.15 +    <ClCompile Include="..\..\timidity\timidity.c" />
   10.16    </ItemGroup>
   10.17    <ItemGroup>
   10.18      <ClInclude Include="..\..\effects_internal.h" />
   10.19 @@ -72,6 +81,16 @@
   10.20      <ClInclude Include="..\..\music_timidity.h" />
   10.21      <ClInclude Include="..\..\music_wav.h" />
   10.22      <ClInclude Include="..\..\SDL_mixer.h" />
   10.23 +    <ClInclude Include="..\..\timidity\common.h" />
   10.24 +    <ClInclude Include="..\..\timidity\instrum.h" />
   10.25 +    <ClInclude Include="..\..\timidity\mix.h" />
   10.26 +    <ClInclude Include="..\..\timidity\options.h" />
   10.27 +    <ClInclude Include="..\..\timidity\output.h" />
   10.28 +    <ClInclude Include="..\..\timidity\playmidi.h" />
   10.29 +    <ClInclude Include="..\..\timidity\readmidi.h" />
   10.30 +    <ClInclude Include="..\..\timidity\resample.h" />
   10.31 +    <ClInclude Include="..\..\timidity\tables.h" />
   10.32 +    <ClInclude Include="..\..\timidity\timidity.h" />
   10.33    </ItemGroup>
   10.34    <PropertyGroup Label="Globals">
   10.35      <ProjectGuid>{fb75c3d3-d261-4575-9d17-9e88e09568ba}</ProjectGuid>
   10.36 @@ -147,8 +166,8 @@
   10.37        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.38        <CompileAsWinRT>false</CompileAsWinRT>
   10.39        <SDLCheck>true</SDLCheck>
   10.40 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.41 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.42 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.43 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.44      </ClCompile>
   10.45      <Link>
   10.46        <SubSystem>Console</SubSystem>
   10.47 @@ -161,8 +180,8 @@
   10.48        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.49        <CompileAsWinRT>false</CompileAsWinRT>
   10.50        <SDLCheck>true</SDLCheck>
   10.51 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.52 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.53 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.54 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.55      </ClCompile>
   10.56      <Link>
   10.57        <SubSystem>Console</SubSystem>
   10.58 @@ -175,8 +194,8 @@
   10.59        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.60        <CompileAsWinRT>false</CompileAsWinRT>
   10.61        <SDLCheck>true</SDLCheck>
   10.62 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.63 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.64 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.65 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.66      </ClCompile>
   10.67      <Link>
   10.68        <SubSystem>Console</SubSystem>
   10.69 @@ -189,8 +208,8 @@
   10.70        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.71        <CompileAsWinRT>false</CompileAsWinRT>
   10.72        <SDLCheck>true</SDLCheck>
   10.73 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.74 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.75 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.76 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.77      </ClCompile>
   10.78      <Link>
   10.79        <SubSystem>Console</SubSystem>
   10.80 @@ -201,4 +220,4 @@
   10.81    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   10.82    <ImportGroup Label="ExtensionTargets">
   10.83    </ImportGroup>
   10.84 -</Project>
   10.85 \ No newline at end of file
   10.86 +</Project>
    11.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters	Sat Oct 21 15:43:15 2017 -0700
    11.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters	Sat Oct 21 22:28:18 2017 -0700
    11.3 @@ -20,6 +20,33 @@
    11.4      <ClCompile Include="..\..\music_smpeg.c" />
    11.5      <ClCompile Include="..\..\music_timidity.c" />
    11.6      <ClCompile Include="..\..\music_wav.c" />
    11.7 +    <ClCompile Include="..\..\timidity\common.c">
    11.8 +      <Filter>Timidity</Filter>
    11.9 +    </ClCompile>
   11.10 +    <ClCompile Include="..\..\timidity\instrum.c">
   11.11 +      <Filter>Timidity</Filter>
   11.12 +    </ClCompile>
   11.13 +    <ClCompile Include="..\..\timidity\mix.c">
   11.14 +      <Filter>Timidity</Filter>
   11.15 +    </ClCompile>
   11.16 +    <ClCompile Include="..\..\timidity\output.c">
   11.17 +      <Filter>Timidity</Filter>
   11.18 +    </ClCompile>
   11.19 +    <ClCompile Include="..\..\timidity\playmidi.c">
   11.20 +      <Filter>Timidity</Filter>
   11.21 +    </ClCompile>
   11.22 +    <ClCompile Include="..\..\timidity\readmidi.c">
   11.23 +      <Filter>Timidity</Filter>
   11.24 +    </ClCompile>
   11.25 +    <ClCompile Include="..\..\timidity\resample.c">
   11.26 +      <Filter>Timidity</Filter>
   11.27 +    </ClCompile>
   11.28 +    <ClCompile Include="..\..\timidity\tables.c">
   11.29 +      <Filter>Timidity</Filter>
   11.30 +    </ClCompile>
   11.31 +    <ClCompile Include="..\..\timidity\timidity.c">
   11.32 +      <Filter>Timidity</Filter>
   11.33 +    </ClCompile>
   11.34    </ItemGroup>
   11.35    <ItemGroup>
   11.36      <ClInclude Include="..\..\effects_internal.h" />
   11.37 @@ -40,5 +67,40 @@
   11.38      <ClInclude Include="..\..\music_timidity.h" />
   11.39      <ClInclude Include="..\..\music_wav.h" />
   11.40      <ClInclude Include="..\..\SDL_mixer.h" />
   11.41 +    <ClInclude Include="..\..\timidity\common.h">
   11.42 +      <Filter>Timidity</Filter>
   11.43 +    </ClInclude>
   11.44 +    <ClInclude Include="..\..\timidity\instrum.h">
   11.45 +      <Filter>Timidity</Filter>
   11.46 +    </ClInclude>
   11.47 +    <ClInclude Include="..\..\timidity\mix.h">
   11.48 +      <Filter>Timidity</Filter>
   11.49 +    </ClInclude>
   11.50 +    <ClInclude Include="..\..\timidity\options.h">
   11.51 +      <Filter>Timidity</Filter>
   11.52 +    </ClInclude>
   11.53 +    <ClInclude Include="..\..\timidity\output.h">
   11.54 +      <Filter>Timidity</Filter>
   11.55 +    </ClInclude>
   11.56 +    <ClInclude Include="..\..\timidity\playmidi.h">
   11.57 +      <Filter>Timidity</Filter>
   11.58 +    </ClInclude>
   11.59 +    <ClInclude Include="..\..\timidity\readmidi.h">
   11.60 +      <Filter>Timidity</Filter>
   11.61 +    </ClInclude>
   11.62 +    <ClInclude Include="..\..\timidity\resample.h">
   11.63 +      <Filter>Timidity</Filter>
   11.64 +    </ClInclude>
   11.65 +    <ClInclude Include="..\..\timidity\tables.h">
   11.66 +      <Filter>Timidity</Filter>
   11.67 +    </ClInclude>
   11.68 +    <ClInclude Include="..\..\timidity\timidity.h">
   11.69 +      <Filter>Timidity</Filter>
   11.70 +    </ClInclude>
   11.71 +  </ItemGroup>
   11.72 +  <ItemGroup>
   11.73 +    <Filter Include="Timidity">
   11.74 +      <UniqueIdentifier>{3f55d8a7-802e-40cd-8b4e-b87e9fe24589}</UniqueIdentifier>
   11.75 +    </Filter>
   11.76    </ItemGroup>
   11.77  </Project>
   11.78 \ No newline at end of file
    12.1 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj	Sat Oct 21 15:43:15 2017 -0700
    12.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj	Sat Oct 21 22:28:18 2017 -0700
    12.3 @@ -167,7 +167,7 @@
    12.4        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    12.5        <CompileAsWinRT>false</CompileAsWinRT>
    12.6        <SDLCheck>true</SDLCheck>
    12.7 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    12.8 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    12.9        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   12.10        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   12.11      </ClCompile>
   12.12 @@ -183,7 +183,7 @@
   12.13        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   12.14        <CompileAsWinRT>false</CompileAsWinRT>
   12.15        <SDLCheck>true</SDLCheck>
   12.16 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   12.17 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   12.18        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   12.19        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   12.20      </ClCompile>
   12.21 @@ -199,7 +199,7 @@
   12.22        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   12.23        <CompileAsWinRT>false</CompileAsWinRT>
   12.24        <SDLCheck>true</SDLCheck>
   12.25 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   12.26 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   12.27        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   12.28        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   12.29      </ClCompile>
   12.30 @@ -215,7 +215,7 @@
   12.31        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   12.32        <CompileAsWinRT>false</CompileAsWinRT>
   12.33        <SDLCheck>true</SDLCheck>
   12.34 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   12.35 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   12.36        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   12.37        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   12.38      </ClCompile>
    13.1 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj	Sat Oct 21 15:43:15 2017 -0700
    13.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj	Sat Oct 21 22:28:18 2017 -0700
    13.3 @@ -106,7 +106,7 @@
    13.4        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    13.5        <CompileAsWinRT>false</CompileAsWinRT>
    13.6        <SDLCheck>true</SDLCheck>
    13.7 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    13.8 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    13.9        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   13.10        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   13.11      </ClCompile>
   13.12 @@ -122,7 +122,7 @@
   13.13        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   13.14        <CompileAsWinRT>false</CompileAsWinRT>
   13.15        <SDLCheck>true</SDLCheck>
   13.16 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   13.17 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   13.18        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   13.19        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   13.20      </ClCompile>
   13.21 @@ -138,7 +138,7 @@
   13.22        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   13.23        <CompileAsWinRT>false</CompileAsWinRT>
   13.24        <SDLCheck>true</SDLCheck>
   13.25 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   13.26 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   13.27        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   13.28        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   13.29      </ClCompile>
   13.30 @@ -154,7 +154,7 @@
   13.31        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   13.32        <CompileAsWinRT>false</CompileAsWinRT>
   13.33        <SDLCheck>true</SDLCheck>
   13.34 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   13.35 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   13.36        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   13.37        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   13.38      </ClCompile>
    14.1 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj	Sat Oct 21 15:43:15 2017 -0700
    14.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj	Sat Oct 21 22:28:18 2017 -0700
    14.3 @@ -60,6 +60,15 @@
    14.4      <ClCompile Include="..\..\music_smpeg.c" />
    14.5      <ClCompile Include="..\..\music_timidity.c" />
    14.6      <ClCompile Include="..\..\music_wav.c" />
    14.7 +    <ClCompile Include="..\..\timidity\common.c" />
    14.8 +    <ClCompile Include="..\..\timidity\instrum.c" />
    14.9 +    <ClCompile Include="..\..\timidity\mix.c" />
   14.10 +    <ClCompile Include="..\..\timidity\output.c" />
   14.11 +    <ClCompile Include="..\..\timidity\playmidi.c" />
   14.12 +    <ClCompile Include="..\..\timidity\readmidi.c" />
   14.13 +    <ClCompile Include="..\..\timidity\resample.c" />
   14.14 +    <ClCompile Include="..\..\timidity\tables.c" />
   14.15 +    <ClCompile Include="..\..\timidity\timidity.c" />
   14.16    </ItemGroup>
   14.17    <ItemGroup>
   14.18      <ClInclude Include="..\..\effects_internal.h" />
   14.19 @@ -80,6 +89,16 @@
   14.20      <ClInclude Include="..\..\music_timidity.h" />
   14.21      <ClInclude Include="..\..\music_wav.h" />
   14.22      <ClInclude Include="..\..\SDL_mixer.h" />
   14.23 +    <ClInclude Include="..\..\timidity\common.h" />
   14.24 +    <ClInclude Include="..\..\timidity\instrum.h" />
   14.25 +    <ClInclude Include="..\..\timidity\mix.h" />
   14.26 +    <ClInclude Include="..\..\timidity\options.h" />
   14.27 +    <ClInclude Include="..\..\timidity\output.h" />
   14.28 +    <ClInclude Include="..\..\timidity\playmidi.h" />
   14.29 +    <ClInclude Include="..\..\timidity\readmidi.h" />
   14.30 +    <ClInclude Include="..\..\timidity\resample.h" />
   14.31 +    <ClInclude Include="..\..\timidity\tables.h" />
   14.32 +    <ClInclude Include="..\..\timidity\timidity.h" />
   14.33    </ItemGroup>
   14.34    <PropertyGroup Label="Globals">
   14.35      <ProjectGuid>{06925935-b340-44e8-bddd-7c1b8d64ff76}</ProjectGuid>
   14.36 @@ -186,7 +205,7 @@
   14.37        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   14.38        <CompileAsWinRT>false</CompileAsWinRT>
   14.39        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   14.40 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.41 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.42      </ClCompile>
   14.43      <Link>
   14.44        <SubSystem>Console</SubSystem>
   14.45 @@ -199,7 +218,7 @@
   14.46        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   14.47        <CompileAsWinRT>false</CompileAsWinRT>
   14.48        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   14.49 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.50 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.51      </ClCompile>
   14.52      <Link>
   14.53        <SubSystem>Console</SubSystem>
   14.54 @@ -212,7 +231,7 @@
   14.55        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   14.56        <CompileAsWinRT>false</CompileAsWinRT>
   14.57        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   14.58 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.59 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.60      </ClCompile>
   14.61      <Link>
   14.62        <SubSystem>Console</SubSystem>
   14.63 @@ -225,7 +244,7 @@
   14.64        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   14.65        <CompileAsWinRT>false</CompileAsWinRT>
   14.66        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   14.67 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.68 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.69      </ClCompile>
   14.70      <Link>
   14.71        <SubSystem>Console</SubSystem>
   14.72 @@ -238,7 +257,7 @@
   14.73        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   14.74        <CompileAsWinRT>false</CompileAsWinRT>
   14.75        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   14.76 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.77 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.78      </ClCompile>
   14.79      <Link>
   14.80        <SubSystem>Console</SubSystem>
   14.81 @@ -251,7 +270,7 @@
   14.82        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   14.83        <CompileAsWinRT>false</CompileAsWinRT>
   14.84        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   14.85 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.86 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   14.87      </ClCompile>
   14.88      <Link>
   14.89        <SubSystem>Console</SubSystem>
   14.90 @@ -262,4 +281,4 @@
   14.91    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   14.92    <ImportGroup Label="ExtensionTargets">
   14.93    </ImportGroup>
   14.94 -</Project>
   14.95 +</Project>
   14.96 \ No newline at end of file
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters	Sat Oct 21 22:28:18 2017 -0700
    15.3 @@ -0,0 +1,106 @@
    15.4 +<?xml version="1.0" encoding="utf-8"?>
    15.5 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    15.6 +  <ItemGroup>
    15.7 +    <ClCompile Include="..\..\effects_internal.c" />
    15.8 +    <ClCompile Include="..\..\effect_position.c" />
    15.9 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
   15.10 +    <ClCompile Include="..\..\load_aiff.c" />
   15.11 +    <ClCompile Include="..\..\load_voc.c" />
   15.12 +    <ClCompile Include="..\..\mixer.c" />
   15.13 +    <ClCompile Include="..\..\music.c" />
   15.14 +    <ClCompile Include="..\..\music_cmd.c" />
   15.15 +    <ClCompile Include="..\..\music_flac.c" />
   15.16 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   15.17 +    <ClCompile Include="..\..\music_mad.c" />
   15.18 +    <ClCompile Include="..\..\music_mikmod.c" />
   15.19 +    <ClCompile Include="..\..\music_modplug.c" />
   15.20 +    <ClCompile Include="..\..\music_mpg123.c" />
   15.21 +    <ClCompile Include="..\..\music_nativemidi.c" />
   15.22 +    <ClCompile Include="..\..\music_ogg.c" />
   15.23 +    <ClCompile Include="..\..\music_smpeg.c" />
   15.24 +    <ClCompile Include="..\..\music_timidity.c" />
   15.25 +    <ClCompile Include="..\..\music_wav.c" />
   15.26 +    <ClCompile Include="..\..\timidity\common.c">
   15.27 +      <Filter>Timidity</Filter>
   15.28 +    </ClCompile>
   15.29 +    <ClCompile Include="..\..\timidity\instrum.c">
   15.30 +      <Filter>Timidity</Filter>
   15.31 +    </ClCompile>
   15.32 +    <ClCompile Include="..\..\timidity\mix.c">
   15.33 +      <Filter>Timidity</Filter>
   15.34 +    </ClCompile>
   15.35 +    <ClCompile Include="..\..\timidity\output.c">
   15.36 +      <Filter>Timidity</Filter>
   15.37 +    </ClCompile>
   15.38 +    <ClCompile Include="..\..\timidity\playmidi.c">
   15.39 +      <Filter>Timidity</Filter>
   15.40 +    </ClCompile>
   15.41 +    <ClCompile Include="..\..\timidity\readmidi.c">
   15.42 +      <Filter>Timidity</Filter>
   15.43 +    </ClCompile>
   15.44 +    <ClCompile Include="..\..\timidity\resample.c">
   15.45 +      <Filter>Timidity</Filter>
   15.46 +    </ClCompile>
   15.47 +    <ClCompile Include="..\..\timidity\tables.c">
   15.48 +      <Filter>Timidity</Filter>
   15.49 +    </ClCompile>
   15.50 +    <ClCompile Include="..\..\timidity\timidity.c">
   15.51 +      <Filter>Timidity</Filter>
   15.52 +    </ClCompile>
   15.53 +  </ItemGroup>
   15.54 +  <ItemGroup>
   15.55 +    <ClInclude Include="..\..\effects_internal.h" />
   15.56 +    <ClInclude Include="..\..\load_aiff.h" />
   15.57 +    <ClInclude Include="..\..\load_voc.h" />
   15.58 +    <ClInclude Include="..\..\mixer.h" />
   15.59 +    <ClInclude Include="..\..\music.h" />
   15.60 +    <ClInclude Include="..\..\music_cmd.h" />
   15.61 +    <ClInclude Include="..\..\music_flac.h" />
   15.62 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   15.63 +    <ClInclude Include="..\..\music_mad.h" />
   15.64 +    <ClInclude Include="..\..\music_mikmod.h" />
   15.65 +    <ClInclude Include="..\..\music_modplug.h" />
   15.66 +    <ClInclude Include="..\..\music_mpg123.h" />
   15.67 +    <ClInclude Include="..\..\music_nativemidi.h" />
   15.68 +    <ClInclude Include="..\..\music_ogg.h" />
   15.69 +    <ClInclude Include="..\..\music_smpeg.h" />
   15.70 +    <ClInclude Include="..\..\music_timidity.h" />
   15.71 +    <ClInclude Include="..\..\music_wav.h" />
   15.72 +    <ClInclude Include="..\..\SDL_mixer.h" />
   15.73 +    <ClInclude Include="..\..\timidity\common.h">
   15.74 +      <Filter>Timidity</Filter>
   15.75 +    </ClInclude>
   15.76 +    <ClInclude Include="..\..\timidity\instrum.h">
   15.77 +      <Filter>Timidity</Filter>
   15.78 +    </ClInclude>
   15.79 +    <ClInclude Include="..\..\timidity\mix.h">
   15.80 +      <Filter>Timidity</Filter>
   15.81 +    </ClInclude>
   15.82 +    <ClInclude Include="..\..\timidity\options.h">
   15.83 +      <Filter>Timidity</Filter>
   15.84 +    </ClInclude>
   15.85 +    <ClInclude Include="..\..\timidity\output.h">
   15.86 +      <Filter>Timidity</Filter>
   15.87 +    </ClInclude>
   15.88 +    <ClInclude Include="..\..\timidity\playmidi.h">
   15.89 +      <Filter>Timidity</Filter>
   15.90 +    </ClInclude>
   15.91 +    <ClInclude Include="..\..\timidity\readmidi.h">
   15.92 +      <Filter>Timidity</Filter>
   15.93 +    </ClInclude>
   15.94 +    <ClInclude Include="..\..\timidity\resample.h">
   15.95 +      <Filter>Timidity</Filter>
   15.96 +    </ClInclude>
   15.97 +    <ClInclude Include="..\..\timidity\tables.h">
   15.98 +      <Filter>Timidity</Filter>
   15.99 +    </ClInclude>
  15.100 +    <ClInclude Include="..\..\timidity\timidity.h">
  15.101 +      <Filter>Timidity</Filter>
  15.102 +    </ClInclude>
  15.103 +  </ItemGroup>
  15.104 +  <ItemGroup>
  15.105 +    <Filter Include="Timidity">
  15.106 +      <UniqueIdentifier>{76edff39-58d9-4391-b729-e34269a68b5a}</UniqueIdentifier>
  15.107 +    </Filter>
  15.108 +  </ItemGroup>
  15.109 +</Project>
  15.110 \ No newline at end of file
    16.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj	Sat Oct 21 15:43:15 2017 -0700
    16.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj	Sat Oct 21 22:28:18 2017 -0700
    16.3 @@ -60,6 +60,15 @@
    16.4      <ClCompile Include="..\..\music_smpeg.c" />
    16.5      <ClCompile Include="..\..\music_timidity.c" />
    16.6      <ClCompile Include="..\..\music_wav.c" />
    16.7 +    <ClCompile Include="..\..\timidity\common.c" />
    16.8 +    <ClCompile Include="..\..\timidity\instrum.c" />
    16.9 +    <ClCompile Include="..\..\timidity\mix.c" />
   16.10 +    <ClCompile Include="..\..\timidity\output.c" />
   16.11 +    <ClCompile Include="..\..\timidity\playmidi.c" />
   16.12 +    <ClCompile Include="..\..\timidity\readmidi.c" />
   16.13 +    <ClCompile Include="..\..\timidity\resample.c" />
   16.14 +    <ClCompile Include="..\..\timidity\tables.c" />
   16.15 +    <ClCompile Include="..\..\timidity\timidity.c" />
   16.16    </ItemGroup>
   16.17    <ItemGroup>
   16.18      <ClInclude Include="..\..\effects_internal.h" />
   16.19 @@ -80,6 +89,16 @@
   16.20      <ClInclude Include="..\..\music_timidity.h" />
   16.21      <ClInclude Include="..\..\music_wav.h" />
   16.22      <ClInclude Include="..\..\SDL_mixer.h" />
   16.23 +    <ClInclude Include="..\..\timidity\common.h" />
   16.24 +    <ClInclude Include="..\..\timidity\instrum.h" />
   16.25 +    <ClInclude Include="..\..\timidity\mix.h" />
   16.26 +    <ClInclude Include="..\..\timidity\options.h" />
   16.27 +    <ClInclude Include="..\..\timidity\output.h" />
   16.28 +    <ClInclude Include="..\..\timidity\playmidi.h" />
   16.29 +    <ClInclude Include="..\..\timidity\readmidi.h" />
   16.30 +    <ClInclude Include="..\..\timidity\resample.h" />
   16.31 +    <ClInclude Include="..\..\timidity\tables.h" />
   16.32 +    <ClInclude Include="..\..\timidity\timidity.h" />
   16.33    </ItemGroup>
   16.34    <PropertyGroup Label="Globals">
   16.35      <ProjectGuid>{3a833c7a-c776-4202-9dbd-bc879b23c605}</ProjectGuid>
   16.36 @@ -188,7 +207,7 @@
   16.37        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.38        <CompileAsWinRT>false</CompileAsWinRT>
   16.39        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.40 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.41 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.42      </ClCompile>
   16.43      <Link>
   16.44        <SubSystem>Console</SubSystem>
   16.45 @@ -201,7 +220,7 @@
   16.46        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.47        <CompileAsWinRT>false</CompileAsWinRT>
   16.48        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.49 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.50 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.51      </ClCompile>
   16.52      <Link>
   16.53        <SubSystem>Console</SubSystem>
   16.54 @@ -214,7 +233,7 @@
   16.55        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.56        <CompileAsWinRT>false</CompileAsWinRT>
   16.57        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.58 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.59 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.60      </ClCompile>
   16.61      <Link>
   16.62        <SubSystem>Console</SubSystem>
   16.63 @@ -227,7 +246,7 @@
   16.64        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.65        <CompileAsWinRT>false</CompileAsWinRT>
   16.66        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.67 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.68 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.69      </ClCompile>
   16.70      <Link>
   16.71        <SubSystem>Console</SubSystem>
   16.72 @@ -240,7 +259,7 @@
   16.73        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.74        <CompileAsWinRT>false</CompileAsWinRT>
   16.75        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.76 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.77 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.78      </ClCompile>
   16.79      <Link>
   16.80        <SubSystem>Console</SubSystem>
   16.81 @@ -253,7 +272,7 @@
   16.82        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.83        <CompileAsWinRT>false</CompileAsWinRT>
   16.84        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.85 -      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.86 +      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.87      </ClCompile>
   16.88      <Link>
   16.89        <SubSystem>Console</SubSystem>
   16.90 @@ -264,4 +283,4 @@
   16.91    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   16.92    <ImportGroup Label="ExtensionTargets">
   16.93    </ImportGroup>
   16.94 -</Project>
   16.95 +</Project>
   16.96 \ No newline at end of file
    17.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters	Sat Oct 21 15:43:15 2017 -0700
    17.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters	Sat Oct 21 22:28:18 2017 -0700
    17.3 @@ -20,6 +20,33 @@
    17.4      <ClCompile Include="..\..\music_smpeg.c" />
    17.5      <ClCompile Include="..\..\music_timidity.c" />
    17.6      <ClCompile Include="..\..\music_wav.c" />
    17.7 +    <ClCompile Include="..\..\timidity\common.c">
    17.8 +      <Filter>Timidity</Filter>
    17.9 +    </ClCompile>
   17.10 +    <ClCompile Include="..\..\timidity\instrum.c">
   17.11 +      <Filter>Timidity</Filter>
   17.12 +    </ClCompile>
   17.13 +    <ClCompile Include="..\..\timidity\mix.c">
   17.14 +      <Filter>Timidity</Filter>
   17.15 +    </ClCompile>
   17.16 +    <ClCompile Include="..\..\timidity\output.c">
   17.17 +      <Filter>Timidity</Filter>
   17.18 +    </ClCompile>
   17.19 +    <ClCompile Include="..\..\timidity\playmidi.c">
   17.20 +      <Filter>Timidity</Filter>
   17.21 +    </ClCompile>
   17.22 +    <ClCompile Include="..\..\timidity\readmidi.c">
   17.23 +      <Filter>Timidity</Filter>
   17.24 +    </ClCompile>
   17.25 +    <ClCompile Include="..\..\timidity\resample.c">
   17.26 +      <Filter>Timidity</Filter>
   17.27 +    </ClCompile>
   17.28 +    <ClCompile Include="..\..\timidity\tables.c">
   17.29 +      <Filter>Timidity</Filter>
   17.30 +    </ClCompile>
   17.31 +    <ClCompile Include="..\..\timidity\timidity.c">
   17.32 +      <Filter>Timidity</Filter>
   17.33 +    </ClCompile>
   17.34    </ItemGroup>
   17.35    <ItemGroup>
   17.36      <ClInclude Include="..\..\effects_internal.h" />
   17.37 @@ -40,5 +67,40 @@
   17.38      <ClInclude Include="..\..\music_timidity.h" />
   17.39      <ClInclude Include="..\..\music_wav.h" />
   17.40      <ClInclude Include="..\..\SDL_mixer.h" />
   17.41 +    <ClInclude Include="..\..\timidity\common.h">
   17.42 +      <Filter>Timidity</Filter>
   17.43 +    </ClInclude>
   17.44 +    <ClInclude Include="..\..\timidity\instrum.h">
   17.45 +      <Filter>Timidity</Filter>
   17.46 +    </ClInclude>
   17.47 +    <ClInclude Include="..\..\timidity\mix.h">
   17.48 +      <Filter>Timidity</Filter>
   17.49 +    </ClInclude>
   17.50 +    <ClInclude Include="..\..\timidity\options.h">
   17.51 +      <Filter>Timidity</Filter>
   17.52 +    </ClInclude>
   17.53 +    <ClInclude Include="..\..\timidity\output.h">
   17.54 +      <Filter>Timidity</Filter>
   17.55 +    </ClInclude>
   17.56 +    <ClInclude Include="..\..\timidity\playmidi.h">
   17.57 +      <Filter>Timidity</Filter>
   17.58 +    </ClInclude>
   17.59 +    <ClInclude Include="..\..\timidity\readmidi.h">
   17.60 +      <Filter>Timidity</Filter>
   17.61 +    </ClInclude>
   17.62 +    <ClInclude Include="..\..\timidity\resample.h">
   17.63 +      <Filter>Timidity</Filter>
   17.64 +    </ClInclude>
   17.65 +    <ClInclude Include="..\..\timidity\tables.h">
   17.66 +      <Filter>Timidity</Filter>
   17.67 +    </ClInclude>
   17.68 +    <ClInclude Include="..\..\timidity\timidity.h">
   17.69 +      <Filter>Timidity</Filter>
   17.70 +    </ClInclude>
   17.71 +  </ItemGroup>
   17.72 +  <ItemGroup>
   17.73 +    <Filter Include="Timidity">
   17.74 +      <UniqueIdentifier>{1a42c048-3a89-4691-8289-2eb5b280596f}</UniqueIdentifier>
   17.75 +    </Filter>
   17.76    </ItemGroup>
   17.77  </Project>
   17.78 \ No newline at end of file
    18.1 --- a/VisualC/SDL_mixer.vcxproj	Sat Oct 21 15:43:15 2017 -0700
    18.2 +++ b/VisualC/SDL_mixer.vcxproj	Sat Oct 21 22:28:18 2017 -0700
    18.3 @@ -93,7 +93,7 @@
    18.4        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
    18.5        <Optimization>Disabled</Optimization>
    18.6        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    18.7 -      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    18.8 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE</PreprocessorDefinitions>
    18.9        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   18.10        <WarningLevel>Level3</WarningLevel>
   18.11        <DebugInformationFormat>OldStyle</DebugInformationFormat>
   18.12 @@ -123,7 +123,7 @@
   18.13        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
   18.14        <Optimization>Disabled</Optimization>
   18.15        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.16 -      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.17 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE</PreprocessorDefinitions>
   18.18        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   18.19        <WarningLevel>Level3</WarningLevel>
   18.20        <DebugInformationFormat>OldStyle</DebugInformationFormat>
   18.21 @@ -152,7 +152,7 @@
   18.22      <ClCompile>
   18.23        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
   18.24        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.25 -      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.26 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.27        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   18.28        <WarningLevel>Level3</WarningLevel>
   18.29        <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
   18.30 @@ -179,7 +179,7 @@
   18.31      <ClCompile>
   18.32        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
   18.33        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.34 -      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.35 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_MPG123;MPG123_DYNAMIC="libmpg123-0.dll";MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.36        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   18.37        <WarningLevel>Level3</WarningLevel>
   18.38        <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
    19.1 --- a/timidity/timidity.c	Sat Oct 21 15:43:15 2017 -0700
    19.2 +++ b/timidity/timidity.c	Sat Oct 21 22:28:18 2017 -0700
    19.3 @@ -416,7 +416,7 @@
    19.4  
    19.5  int Timidity_Init()
    19.6  {
    19.7 -  const char *env = getenv("TIMIDITY_CFG");
    19.8 +  const char *env = SDL_getenv("TIMIDITY_CFG");
    19.9  
   19.10    /* !!! FIXME: This may be ugly, but slightly less so than requiring the
   19.11     *            default search path to have only one element. I think.