From d030f9e77dbc57ac9bee7199b5ce300fd3d33cd1 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 21 Oct 2017 22:28:18 -0700 Subject: [PATCH] Updated Windows RT projects and added Timidity MIDI playback --- .hgignore | 6 + .../UWP_VS2015/SDL_mixer-UWP.vcxproj | 22 +-- .../UWP_VS2015/SDL_mixer-UWP.vcxproj.filters | 64 +++----- .../SDL_mixer-WinPhone80.sln | 56 +++++++ .../SDL_mixer-WinPhone80.vcxproj | 99 +++++++----- .../SDL_mixer-WinPhone80.vcxproj.filters | 96 +++++++++--- .../libogg_dynamic-WinPhone80.vcxproj | 28 ++-- .../libvorbis_dynamic-WinPhone80.vcxproj | 146 +++++++++--------- .../libvorbisfile_dynamic-WinPhone80.vcxproj | 22 +-- .../SDL_mixer-WinPhone81.vcxproj | 37 +++-- .../SDL_mixer-WinPhone81.vcxproj.filters | 62 ++++++++ .../libvorbis_dynamic-WinPhone81.vcxproj | 8 +- .../libvorbisfile_dynamic-WinPhone81.vcxproj | 8 +- .../WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj | 33 +++- .../SDL_mixer-WinRT80.vcxproj.filters | 106 +++++++++++++ .../WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj | 33 +++- .../SDL_mixer-WinRT81.vcxproj.filters | 62 ++++++++ VisualC/SDL_mixer.vcxproj | 8 +- timidity/timidity.c | 2 +- 19 files changed, 650 insertions(+), 248 deletions(-) create mode 100644 VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln create mode 100644 VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters diff --git a/.hgignore b/.hgignore index 11834bdd..8c63f132 100644 --- a/.hgignore +++ b/.hgignore @@ -13,6 +13,12 @@ libtool *.o *.la *.lai +Debug +Release +*.user +*.ncb +*.suo +*.sdf .DS_Store xcuserdata *.xcworkspace diff --git a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj index 83d14649..a2384d11 100644 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj @@ -47,27 +47,21 @@ - - - - - - - + @@ -200,7 +194,7 @@ NotUsing false ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -213,7 +207,7 @@ NotUsing false ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -226,7 +220,7 @@ NotUsing false ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -239,7 +233,7 @@ NotUsing false ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -252,7 +246,7 @@ NotUsing false ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -265,7 +259,7 @@ NotUsing false ..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -276,4 +270,4 @@ - + \ No newline at end of file diff --git a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters index caed8e32..344db2da 100644 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters @@ -1,15 +1,28 @@  + + + + + + + + + + + + + + + + + + + Timidity - - Timidity - - - Timidity - Timidity @@ -28,58 +41,27 @@ Timidity - - Timidity - - - Timidity - Timidity Timidity - - - - - - - - - - - - - - - - - - - Timidity - - Timidity - - - Timidity - - - Timidity - Timidity Timidity + + Timidity + Timidity @@ -104,4 +86,4 @@ {660dbe57-4c07-417e-9609-12b312726942} - + \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln new file mode 100644 index 00000000..2cfb6855 --- /dev/null +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.sln @@ -0,0 +1,56 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinPhone80", "SDL_mixer-WinPhone80.vcxproj", "{1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinPhone80", "libogg_dynamic-WinPhone80.vcxproj", "{DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinPhone80", "libvorbis_dynamic-WinPhone80.vcxproj", "{8859E555-5684-436D-AD14-4E8CEB11EAD1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinPhone80", "libvorbisfile_dynamic-WinPhone80.vcxproj", "{E1553EFC-2C62-41AE-ABA3-D933D66D435D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|ARM.ActiveCfg = Debug|ARM + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|ARM.Build.0 = Debug|ARM + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Debug|Win32.Build.0 = Debug|Win32 + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|ARM.ActiveCfg = Release|ARM + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|ARM.Build.0 = Release|ARM + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|Win32.ActiveCfg = Release|Win32 + {1F710837-D5C0-4E7F-ABEA-FBFF64722E7E}.Release|Win32.Build.0 = Release|Win32 + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|ARM.ActiveCfg = Debug|ARM + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|ARM.Build.0 = Debug|ARM + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|Win32.ActiveCfg = Debug|Win32 + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Debug|Win32.Build.0 = Debug|Win32 + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|ARM.ActiveCfg = Release|ARM + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|ARM.Build.0 = Release|ARM + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|Win32.ActiveCfg = Release|Win32 + {DDB6F9C3-25D1-43C1-B439-20F2016D2F2E}.Release|Win32.Build.0 = Release|Win32 + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|ARM.ActiveCfg = Debug|ARM + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|ARM.Build.0 = Debug|ARM + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|Win32.ActiveCfg = Debug|Win32 + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Debug|Win32.Build.0 = Debug|Win32 + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|ARM.ActiveCfg = Release|ARM + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|ARM.Build.0 = Release|ARM + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|Win32.ActiveCfg = Release|Win32 + {8859E555-5684-436D-AD14-4E8CEB11EAD1}.Release|Win32.Build.0 = Release|Win32 + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|ARM.ActiveCfg = Debug|ARM + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|ARM.Build.0 = Debug|ARM + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|Win32.ActiveCfg = Debug|Win32 + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Debug|Win32.Build.0 = Debug|Win32 + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|ARM.ActiveCfg = Release|ARM + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|ARM.Build.0 = Release|ARM + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|Win32.ActiveCfg = Release|Win32 + {E1553EFC-2C62-41AE-ABA3-D933D66D435D}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj index e54976cc..ecbb2495 100644 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj @@ -78,12 +78,12 @@ - _USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include Console @@ -94,12 +94,12 @@ - _USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include Console @@ -110,12 +110,12 @@ - _USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include Console @@ -126,12 +126,12 @@ - _USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include Console @@ -150,64 +150,81 @@ - - - - - + + {33048af1-031a-4ce6-b61e-fad2db832e9e} + + + {ddb6f9c3-25d1-43c1-b439-20f2016d2f2e} + + + {e1553efc-2c62-41ae-aba3-d933d66d435d} + + + {8859e555-5684-436d-ad14-4e8ceb11ead1} + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + - + + - - - - {33048af1-031a-4ce6-b61e-fad2db832e9e} - - - {ddb6f9c3-25d1-43c1-b439-20f2016d2f2e} - - - {e1553efc-2c62-41ae-aba3-d933d66d435d} - - - {8859e555-5684-436d-ad14-4e8ceb11ead1} - + + + + + + + + + + + - + \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters index 795cae44..e998b914 100644 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters @@ -1,46 +1,106 @@  - - - - - - - - + + + + + + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + - - - - - - - - + + + + + + - + + + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + + + {ba754ab5-5a7c-4e3c-9a2f-a1a8cf93fa90} + - + \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj index 1a2df683..fba1ad82 100644 --- a/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj +++ b/VisualC-WinRT/WinPhone80_VS2012/libogg_dynamic-WinPhone80.vcxproj @@ -83,7 +83,7 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include + ..\..\external\libogg-1.3.2\include 4244 @@ -91,7 +91,7 @@ false false true - ..\..\external\libogg-1.3.1\win32\ogg.def + ..\..\external\libogg-1.3.2\win32\ogg.def @@ -101,7 +101,7 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include + ..\..\external\libogg-1.3.2\include 4244 @@ -109,7 +109,7 @@ false false true - ..\..\external\libogg-1.3.1\win32\ogg.def + ..\..\external\libogg-1.3.2\win32\ogg.def @@ -119,7 +119,7 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include + ..\..\external\libogg-1.3.2\include 4244 @@ -127,7 +127,7 @@ false false true - ..\..\external\libogg-1.3.1\win32\ogg.def + ..\..\external\libogg-1.3.2\win32\ogg.def @@ -137,7 +137,7 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libogg-1.3.1\include + ..\..\external\libogg-1.3.2\include 4244 @@ -145,7 +145,7 @@ false false true - ..\..\external\libogg-1.3.1\win32\ogg.def + ..\..\external\libogg-1.3.2\win32\ogg.def @@ -158,18 +158,18 @@ - - + + - + - - + + - \ No newline at end of file + diff --git a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj index bf445d27..6439efd4 100644 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj +++ b/VisualC-WinRT/WinPhone80_VS2012/libvorbis_dynamic-WinPhone80.vcxproj @@ -83,14 +83,14 @@ false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbis.def + ..\..\external\libvorbis-1.3.5\win32\vorbis.def @@ -101,14 +101,14 @@ false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbis.def + ..\..\external\libvorbis-1.3.5\win32\vorbis.def @@ -119,14 +119,14 @@ false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbis.def + ..\..\external\libvorbis-1.3.5\win32\vorbis.def @@ -137,14 +137,14 @@ false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) 4244;4100;4267;4189;4305;4127;4706 - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbis.def + ..\..\external\libvorbis-1.3.5\win32\vorbis.def @@ -157,74 +157,74 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -235,4 +235,4 @@ - \ No newline at end of file + diff --git a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj index b4bbd6bc..75f29394 100644 --- a/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj +++ b/VisualC-WinRT/WinPhone80_VS2012/libvorbisfile_dynamic-WinPhone80.vcxproj @@ -82,14 +82,14 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbisfile.def + ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def @@ -99,14 +99,14 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbisfile.def + ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def @@ -116,14 +116,14 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbisfile.def + ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def @@ -133,14 +133,14 @@ pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include Console false false true - ..\..\external\libvorbis-1.3.3\win32\vorbisfile.def + ..\..\external\libvorbis-1.3.5\win32\vorbisfile.def @@ -153,10 +153,10 @@ - + - + @@ -170,4 +170,4 @@ - \ No newline at end of file + diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj index 08e2bb6e..94325240 100644 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj @@ -52,6 +52,15 @@ + + + + + + + + + @@ -72,6 +81,16 @@ + + + + + + + + + + {fb75c3d3-d261-4575-9d17-9e88e09568ba} @@ -147,8 +166,8 @@ NotUsing false true - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -161,8 +180,8 @@ NotUsing false true - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -175,8 +194,8 @@ NotUsing false true - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -189,8 +208,8 @@ NotUsing false true - ..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -201,4 +220,4 @@ - \ No newline at end of file + diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters index 294df567..814b8f79 100644 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters @@ -20,6 +20,33 @@ + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + @@ -40,5 +67,40 @@ + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + + + {3f55d8a7-802e-40cd-8b4e-b87e9fe24589} + \ No newline at end of file diff --git a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj index 77581975..c41e3bef 100644 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj +++ b/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj @@ -167,7 +167,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4244;4100;4267;4189;4305;4127;4706 @@ -183,7 +183,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4244;4100;4267;4189;4305;4127;4706 @@ -199,7 +199,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) 4244;4100;4267;4189;4305;4127;4706 @@ -215,7 +215,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions) 4244;4100;4267;4189;4305;4127;4706 diff --git a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj index 4d16df1e..35b9a304 100644 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj +++ b/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj @@ -106,7 +106,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions) 4244;4101 @@ -122,7 +122,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) 4244;4101 @@ -138,7 +138,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions) 4244;4101 @@ -154,7 +154,7 @@ NotUsing false true - ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories) + ..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions) 4244;4101 diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj index 09a5583a..6201615e 100644 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj @@ -60,6 +60,15 @@ + + + + + + + + + @@ -80,6 +89,16 @@ + + + + + + + + + + {06925935-b340-44e8-bddd-7c1b8d64ff76} @@ -186,7 +205,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -199,7 +218,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -212,7 +231,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -225,7 +244,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -238,7 +257,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -251,7 +270,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -262,4 +281,4 @@ - + \ No newline at end of file diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters new file mode 100644 index 00000000..463712c3 --- /dev/null +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + + + + + + + + + + + + + + + + + + + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + + + {76edff39-58d9-4391-b729-e34269a68b5a} + + + \ No newline at end of file diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj index b48021cd..8524c128 100644 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj @@ -60,6 +60,15 @@ + + + + + + + + + @@ -80,6 +89,16 @@ + + + + + + + + + + {3a833c7a-c776-4202-9dbd-bc879b23c605} @@ -188,7 +207,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -201,7 +220,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -214,7 +233,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -227,7 +246,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -240,7 +259,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;%(PreprocessorDefinitions) Console @@ -253,7 +272,7 @@ NotUsing false ..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories) - MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";MUSIC_MID_TIMIDITY;NDEBUG;%(PreprocessorDefinitions) Console @@ -264,4 +283,4 @@ - + \ No newline at end of file diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters index 294df567..3b9c3e81 100644 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters @@ -20,6 +20,33 @@ + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + @@ -40,5 +67,40 @@ + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + Timidity + + + + + {1a42c048-3a89-4691-8289-2eb5b280596f} + \ No newline at end of file diff --git a/VisualC/SDL_mixer.vcxproj b/VisualC/SDL_mixer.vcxproj index bcbcd5c2..6759d2ea 100644 --- a/VisualC/SDL_mixer.vcxproj +++ b/VisualC/SDL_mixer.vcxproj @@ -93,7 +93,7 @@ /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) Disabled ..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) - _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) + _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 MultiThreadedDLL Level3 OldStyle @@ -123,7 +123,7 @@ /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) Disabled ..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) - _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) + _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 MultiThreadedDLL Level3 OldStyle @@ -152,7 +152,7 @@ /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) ..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) - 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) + 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) MultiThreadedDLL Level3 StreamingSIMDExtensions @@ -179,7 +179,7 @@ /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) ..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) - 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) + 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) MultiThreadedDLL Level3 StreamingSIMDExtensions diff --git a/timidity/timidity.c b/timidity/timidity.c index c8d0d97b..5cf5c9a0 100644 --- a/timidity/timidity.c +++ b/timidity/timidity.c @@ -416,7 +416,7 @@ int Timidity_Init_NoConfig() int Timidity_Init() { - const char *env = getenv("TIMIDITY_CFG"); + const char *env = SDL_getenv("TIMIDITY_CFG"); /* !!! FIXME: This may be ugly, but slightly less so than requiring the * default search path to have only one element. I think.