From 3257e39bebd81359cbd89cadbaa6d9a7bbe939cb Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Tue, 11 Jun 2013 23:21:37 -0700 Subject: [PATCH] Add VS2010 and VS2012 projects; fix VS compile issues --- VisualC/SDL_mixer_VS2010.sln | 66 ++++ VisualC/SDL_mixer_VS2010.vcxproj | 312 +++++++++++++++++ VisualC/SDL_mixer_VS2012.sln | 66 ++++ VisualC/SDL_mixer_VS2012.vcxproj | 316 ++++++++++++++++++ VisualC/external/include/vorbis/vorbisfile.h | 30 +- .../native_midi/native_midi_VS2010.vcxproj | 198 +++++++++++ .../native_midi/native_midi_VS2012.vcxproj | 202 +++++++++++ VisualC/playmus/playmus_VS2010.vcxproj | 257 ++++++++++++++ VisualC/playmus/playmus_VS2012.vcxproj | 261 +++++++++++++++ VisualC/playwave/playwave_VS2010.vcxproj | 256 ++++++++++++++ VisualC/playwave/playwave_VS2012.vcxproj | 260 ++++++++++++++ VisualC/timidity/timidity_VS2010.vcxproj | 267 +++++++++++++++ VisualC/timidity/timidity_VS2012.vcxproj | 271 +++++++++++++++ dynamic_modplug.c | 1 + load_ogg.c | 16 +- music_flac.c | 2 +- music_ogg.c | 8 +- playmus.c | 3 + timidity/instrum.c | 13 +- wavestream.c | 12 +- 20 files changed, 2777 insertions(+), 40 deletions(-) create mode 100644 VisualC/SDL_mixer_VS2010.sln create mode 100644 VisualC/SDL_mixer_VS2010.vcxproj create mode 100644 VisualC/SDL_mixer_VS2012.sln create mode 100644 VisualC/SDL_mixer_VS2012.vcxproj create mode 100644 VisualC/native_midi/native_midi_VS2010.vcxproj create mode 100644 VisualC/native_midi/native_midi_VS2012.vcxproj create mode 100644 VisualC/playmus/playmus_VS2010.vcxproj create mode 100644 VisualC/playmus/playmus_VS2012.vcxproj create mode 100644 VisualC/playwave/playwave_VS2010.vcxproj create mode 100644 VisualC/playwave/playwave_VS2012.vcxproj create mode 100644 VisualC/timidity/timidity_VS2010.vcxproj create mode 100644 VisualC/timidity/timidity_VS2012.vcxproj diff --git a/VisualC/SDL_mixer_VS2010.sln b/VisualC/SDL_mixer_VS2010.sln new file mode 100644 index 00000000..5574971f --- /dev/null +++ b/VisualC/SDL_mixer_VS2010.sln @@ -0,0 +1,66 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer", "SDL_mixer_VS2010.vcxproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi_VS2010.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus_VS2010.vcxproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave_VS2010.vcxproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity_VS2010.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.Build.0 = Debug|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.ActiveCfg = Debug|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.Build.0 = Debug|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.ActiveCfg = Release|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.Build.0 = Release|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.ActiveCfg = Release|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.Build.0 = Release|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.ActiveCfg = Debug|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.Build.0 = Debug|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.ActiveCfg = Debug|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.Build.0 = Debug|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.ActiveCfg = Release|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.Build.0 = Release|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.ActiveCfg = Release|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.Build.0 = Release|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.Build.0 = Debug|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.ActiveCfg = Debug|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.Build.0 = Debug|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.ActiveCfg = Release|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.Build.0 = Release|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.ActiveCfg = Release|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.Build.0 = Release|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.Build.0 = Debug|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.ActiveCfg = Release|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.Build.0 = Release|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.ActiveCfg = Release|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/VisualC/SDL_mixer_VS2010.vcxproj b/VisualC/SDL_mixer_VS2010.vcxproj new file mode 100644 index 00000000..e301f1d6 --- /dev/null +++ b/VisualC/SDL_mixer_VS2010.vcxproj @@ -0,0 +1,312 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SDL2_mixer + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33} + SDL_mixer + + + + DynamicLibrary + false + + + DynamicLibrary + false + + + DynamicLibrary + false + + + DynamicLibrary + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + Disabled + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + Disabled + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f} + false + + + {b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/SDL_mixer_VS2012.sln b/VisualC/SDL_mixer_VS2012.sln new file mode 100644 index 00000000..038611e0 --- /dev/null +++ b/VisualC/SDL_mixer_VS2012.sln @@ -0,0 +1,66 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer", "SDL_mixer_VS2012.vcxproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi_VS2012.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus_VS2012.vcxproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave_VS2012.vcxproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity_VS2012.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.Build.0 = Debug|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.ActiveCfg = Debug|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.Build.0 = Debug|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.ActiveCfg = Release|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.Build.0 = Release|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.ActiveCfg = Release|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.Build.0 = Release|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.ActiveCfg = Debug|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.Build.0 = Debug|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.ActiveCfg = Debug|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.Build.0 = Debug|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.ActiveCfg = Release|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.Build.0 = Release|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.ActiveCfg = Release|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.Build.0 = Release|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.Build.0 = Debug|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.ActiveCfg = Debug|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.Build.0 = Debug|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.ActiveCfg = Release|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.Build.0 = Release|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.ActiveCfg = Release|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.Build.0 = Release|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.Build.0 = Debug|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.ActiveCfg = Release|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.Build.0 = Release|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.ActiveCfg = Release|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/VisualC/SDL_mixer_VS2012.vcxproj b/VisualC/SDL_mixer_VS2012.vcxproj new file mode 100644 index 00000000..b76c6d95 --- /dev/null +++ b/VisualC/SDL_mixer_VS2012.vcxproj @@ -0,0 +1,316 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SDL2_mixer + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33} + SDL_mixer + + + + DynamicLibrary + false + v110 + + + DynamicLibrary + false + v110 + + + DynamicLibrary + false + v110 + + + DynamicLibrary + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + Disabled + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + Disabled + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/SDL_mixer.tlb + + + + + /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/SDL_mixer.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;%(AdditionalDependencies) + ./$(Configuration)/$(Platform)/SDL_mixer.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/SDL_mixer.bsc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f} + false + + + {b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/external/include/vorbis/vorbisfile.h b/VisualC/external/include/vorbis/vorbisfile.h index 9271331e..b256a1ea 100755 --- a/VisualC/external/include/vorbis/vorbisfile.h +++ b/VisualC/external/include/vorbis/vorbisfile.h @@ -38,9 +38,9 @@ extern "C" */ typedef struct { size_t (*read_func) (void *ptr, size_t size, size_t nmemb, void *datasource); - int (*seek_func) (void *datasource, ogg_int64_t offset, int whence); - int (*close_func) (void *datasource); - long (*tell_func) (void *datasource); + Sint64 (*seek_func) (void *datasource, ogg_int64_t offset, int whence); + Sint64 (*close_func) (void *datasource); + Sint64 (*tell_func) (void *datasource); } ov_callbacks; #ifndef OV_EXCLUDE_STATIC_CALLBACKS @@ -74,30 +74,30 @@ static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){ static ov_callbacks OV_CALLBACKS_DEFAULT = { (size_t (*)(void *, size_t, size_t, void *)) fread, - (int (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, - (int (*)(void *)) fclose, - (long (*)(void *)) ftell + (Sint64 (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, + (Sint64 (*)(void *)) fclose, + (Sint64 (*)(void *)) ftell }; static ov_callbacks OV_CALLBACKS_NOCLOSE = { (size_t (*)(void *, size_t, size_t, void *)) fread, - (int (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, - (int (*)(void *)) NULL, - (long (*)(void *)) ftell + (Sint64 (*)(void *, ogg_int64_t, int)) _ov_header_fseek_wrap, + (Sint64 (*)(void *)) NULL, + (Sint64 (*)(void *)) ftell }; static ov_callbacks OV_CALLBACKS_STREAMONLY = { (size_t (*)(void *, size_t, size_t, void *)) fread, - (int (*)(void *, ogg_int64_t, int)) NULL, - (int (*)(void *)) fclose, - (long (*)(void *)) NULL + (Sint64 (*)(void *, ogg_int64_t, int)) NULL, + (Sint64 (*)(void *)) fclose, + (Sint64 (*)(void *)) NULL }; static ov_callbacks OV_CALLBACKS_STREAMONLY_NOCLOSE = { (size_t (*)(void *, size_t, size_t, void *)) fread, - (int (*)(void *, ogg_int64_t, int)) NULL, - (int (*)(void *)) NULL, - (long (*)(void *)) NULL + (Sint64 (*)(void *, ogg_int64_t, int)) NULL, + (Sint64 (*)(void *)) NULL, + (Sint64 (*)(void *)) NULL }; #endif diff --git a/VisualC/native_midi/native_midi_VS2010.vcxproj b/VisualC/native_midi/native_midi_VS2010.vcxproj new file mode 100644 index 00000000..7bb3605e --- /dev/null +++ b/VisualC/native_midi/native_midi_VS2010.vcxproj @@ -0,0 +1,198 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + native_midi + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F} + + + + StaticLibrary + false + + + StaticLibrary + false + + + StaticLibrary + false + + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Release\ + .\Release\ + .\Debug\ + .\Debug\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/native_midi.pch + Level3 + + + 0x0409 + + + true + .\Release/native_midi.bsc + + + + + Disabled + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/native_midi.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/native_midi.bsc + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/native_midi.pch + Level3 + + + 0x0409 + + + true + .\Release/native_midi.bsc + + + + + X64 + + + Disabled + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/native_midi.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/native_midi.bsc + + + + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + \ No newline at end of file diff --git a/VisualC/native_midi/native_midi_VS2012.vcxproj b/VisualC/native_midi/native_midi_VS2012.vcxproj new file mode 100644 index 00000000..fe32c4be --- /dev/null +++ b/VisualC/native_midi/native_midi_VS2012.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + native_midi + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F} + + + + StaticLibrary + false + v110 + + + StaticLibrary + false + v110 + + + StaticLibrary + false + v110 + + + StaticLibrary + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Release\ + .\Release\ + .\Debug\ + .\Debug\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/native_midi.pch + Level3 + + + 0x0409 + + + true + .\Release/native_midi.bsc + + + + + Disabled + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/native_midi.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/native_midi.bsc + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/native_midi.pch + Level3 + + + 0x0409 + + + true + .\Release/native_midi.bsc + + + + + X64 + + + Disabled + ..\..\..\SDL\include;..\..;..\..\native_midi;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/native_midi.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/native_midi.bsc + + + + + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + + \ No newline at end of file diff --git a/VisualC/playmus/playmus_VS2010.vcxproj b/VisualC/playmus/playmus_VS2010.vcxproj new file mode 100644 index 00000000..9597c41b --- /dev/null +++ b/VisualC/playmus/playmus_VS2010.vcxproj @@ -0,0 +1,257 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + playmus + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A} + + + + Application + false + + + Application + false + + + Application + false + + + Application + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + MaxSpeed + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/playmus/playmus_VS2012.vcxproj b/VisualC/playmus/playmus_VS2012.vcxproj new file mode 100644 index 00000000..aae1e4b4 --- /dev/null +++ b/VisualC/playmus/playmus_VS2012.vcxproj @@ -0,0 +1,261 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + playmus + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A} + + + + Application + false + v110 + + + Application + false + v110 + + + Application + false + v110 + + + Application + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + MaxSpeed + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playmus.tlb + + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playmus.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playmus.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playmus.bsc + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/playwave/playwave_VS2010.vcxproj b/VisualC/playwave/playwave_VS2010.vcxproj new file mode 100644 index 00000000..963d7f68 --- /dev/null +++ b/VisualC/playwave/playwave_VS2010.vcxproj @@ -0,0 +1,256 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + playwave + {AC86CEAA-9908-476F-B15F-C7193CEF81BD} + + + + Application + false + + + Application + false + + + Application + false + + + Application + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + MaxSpeed + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + MaxSpeed + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/playwave/playwave_VS2012.vcxproj b/VisualC/playwave/playwave_VS2012.vcxproj new file mode 100644 index 00000000..72502759 --- /dev/null +++ b/VisualC/playwave/playwave_VS2012.vcxproj @@ -0,0 +1,260 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + playwave + {AC86CEAA-9908-476F-B15F-C7193CEF81BD} + + + + Application + false + v110 + + + Application + false + v110 + + + Application + false + v110 + + + Application + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + MaxSpeed + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + MaxSpeed + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX86 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + ./$(Configuration)/$(Platform)/playwave.tlb + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ./$(Configuration)/$(Platform)/playwave.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + ./$(Configuration)/$(Platform)/playwave.pdb + Windows + MachineX64 + + + true + ./$(Configuration)/$(Platform)/playwave.bsc + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/timidity/timidity_VS2010.vcxproj b/VisualC/timidity/timidity_VS2010.vcxproj new file mode 100644 index 00000000..b462a48e --- /dev/null +++ b/VisualC/timidity/timidity_VS2010.vcxproj @@ -0,0 +1,267 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + timidity + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} + timidity + + + + StaticLibrary + false + + + StaticLibrary + false + + + StaticLibrary + false + + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Release\ + .\Release\ + .\Debug\ + .\Debug\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/timidity.pch + Level3 + + + 0x0409 + + + true + .\Release/timidity.bsc + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/timidity.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/timidity.bsc + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/timidity.pch + Level3 + + + 0x0409 + + + true + .\Release/timidity.bsc + + + + + X64 + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/timidity.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/timidity.bsc + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/timidity/timidity_VS2012.vcxproj b/VisualC/timidity/timidity_VS2012.vcxproj new file mode 100644 index 00000000..2dbeb293 --- /dev/null +++ b/VisualC/timidity/timidity_VS2012.vcxproj @@ -0,0 +1,271 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + timidity + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} + timidity + + + + StaticLibrary + false + v110 + + + StaticLibrary + false + v110 + + + StaticLibrary + false + v110 + + + StaticLibrary + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Release\ + .\Release\ + .\Debug\ + .\Debug\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/timidity.pch + Level3 + + + 0x0409 + + + true + .\Release/timidity.bsc + + + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/timidity.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/timidity.bsc + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/timidity.pch + Level3 + + + 0x0409 + + + true + .\Release/timidity.bsc + + + + + X64 + + + Disabled + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + .\Debug/timidity.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/timidity.bsc + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dynamic_modplug.c b/dynamic_modplug.c index 73105661..2f5c6945 100644 --- a/dynamic_modplug.c +++ b/dynamic_modplug.c @@ -70,6 +70,7 @@ int Mix_InitModPlug() return 0; } + void Mix_QuitModPlug() { if ( modplug.loaded == 0 ) { diff --git a/load_ogg.c b/load_ogg.c index 2c397f5f..4b92f448 100644 --- a/load_ogg.c +++ b/load_ogg.c @@ -43,24 +43,24 @@ static size_t sdl_read_func(void *ptr, size_t size, size_t nmemb, void *datasour return SDL_RWread((SDL_RWops*)datasource, ptr, size, nmemb); } -static int sdl_seek_func(void *datasource, ogg_int64_t offset, int whence) +static Sint64 sdl_seek_func(void *datasource, ogg_int64_t offset, int whence) { - return (int)SDL_RWseek((SDL_RWops*)datasource, (int)offset, whence); + return SDL_RWseek((SDL_RWops*)datasource, offset, whence); } -static int sdl_close_func_freesrc(void *datasource) +static Sint64 sdl_close_func_freesrc(void *datasource) { return SDL_RWclose((SDL_RWops*)datasource); } -static int sdl_close_func_nofreesrc(void *datasource) +static Sint64 sdl_close_func_nofreesrc(void *datasource) { - return (int)SDL_RWseek((SDL_RWops*)datasource, 0, RW_SEEK_SET); + return SDL_RWseek((SDL_RWops*)datasource, 0, RW_SEEK_SET); } -static long sdl_tell_func(void *datasource) +static Sint64 sdl_tell_func(void *datasource) { - return (long)SDL_RWtell((SDL_RWops*)datasource); + return SDL_RWtell((SDL_RWops*)datasource); } @@ -113,7 +113,7 @@ SDL_AudioSpec *Mix_LoadOGG_RW (SDL_RWops *src, int freesrc, samples = (long)vorbis.ov_pcm_total(&vf, -1); *audio_len = spec->size = samples * spec->channels * 2; - *audio_buf = SDL_malloc(*audio_len); + *audio_buf = (Uint8 *)SDL_malloc(*audio_len); if (*audio_buf == NULL) goto done; diff --git a/music_flac.c b/music_flac.c index 7f3f0d4d..ea81ceb5 100644 --- a/music_flac.c +++ b/music_flac.c @@ -399,7 +399,7 @@ static void FLAC_getsome(FLAC_music *music) if (music->flac_data.overflow) { size_t overflow_len = music->flac_data.overflow_read; - if (overflow_len > music->flac_data.max_to_read) { + if (overflow_len > (size_t)music->flac_data.max_to_read) { size_t overflow_extra_len = overflow_len - music->flac_data.max_to_read; diff --git a/music_ogg.c b/music_ogg.c index 28c37d6b..5997cc7c 100644 --- a/music_ogg.c +++ b/music_ogg.c @@ -56,14 +56,14 @@ static size_t sdl_read_func(void *ptr, size_t size, size_t nmemb, void *datasour return SDL_RWread((SDL_RWops*)datasource, ptr, size, nmemb); } -static int sdl_seek_func(void *datasource, ogg_int64_t offset, int whence) +static Sint64 sdl_seek_func(void *datasource, ogg_int64_t offset, int whence) { - return (int)SDL_RWseek((SDL_RWops*)datasource, (int)offset, whence); + return SDL_RWseek((SDL_RWops*)datasource, offset, whence); } -static long sdl_tell_func(void *datasource) +static Sint64 sdl_tell_func(void *datasource) { - return (long)SDL_RWtell((SDL_RWops*)datasource); + return SDL_RWtell((SDL_RWops*)datasource); } /* Load an OGG stream from an SDL_RWops object */ diff --git a/playmus.c b/playmus.c index 09ddd858..9562786e 100644 --- a/playmus.c +++ b/playmus.c @@ -19,6 +19,9 @@ 3. This notice may not be removed or altered from any source distribution. */ +/* Quiet windows compiler warnings */ +#define _CRT_SECURE_NO_WARNINGS + /* $Id$ */ #include diff --git a/timidity/instrum.c b/timidity/instrum.c index 25f6e9a3..a549f084 100644 --- a/timidity/instrum.c +++ b/timidity/instrum.c @@ -426,13 +426,13 @@ static InstrumentLayer *load_instrument(const char *name, int font_type, int per uint8 sf2delay = 0; #define READ_CHAR(thing) \ - if (1 != fread(&tmpchar, 1, 1, fp)) goto fail; \ + if ((size_t)1 != fread(&tmpchar, 1, 1, fp)) goto fail; \ thing = tmpchar; #define READ_SHORT(thing) \ - if (1 != fread(&tmpshort, 2, 1, fp)) goto fail; \ + if ((size_t)1 != fread(&tmpshort, 2, 1, fp)) goto fail; \ thing = LE_SHORT(tmpshort); #define READ_LONG(thing) \ - if (1 != fread(&tmplong, 4, 1, fp)) goto fail; \ + if ((size_t)1 != fread(&tmplong, 4, 1, fp)) goto fail; \ thing = LE_LONG(tmplong); /* @@ -555,7 +555,8 @@ static InstrumentLayer *load_instrument(const char *name, int font_type, int per } READ_CHAR(sp->modes); - READ_SHORT(sp->freq_center); + READ_SHORT(tmpshort); + sp->freq_center = (uint8)tmpshort; READ_SHORT(sp->freq_scale); if (sf2flag) @@ -669,7 +670,7 @@ static InstrumentLayer *load_instrument(const char *name, int font_type, int per { goto fail; } - sp->data = safe_malloc(sp->data_length + 1); + sp->data = (sample_t *)safe_malloc(sp->data_length + 1); lp->size += sp->data_length + 1; if (1 != fread(sp->data, sp->data_length, 1, fp)) @@ -680,7 +681,7 @@ static InstrumentLayer *load_instrument(const char *name, int font_type, int per int32 i=sp->data_length; uint8 *cp=(uint8 *)(sp->data); uint16 *tmp,*newdta; - tmp=newdta=safe_malloc(sp->data_length*2 + 2); + tmp=newdta=(uint16 *)safe_malloc(sp->data_length*2 + 2); while (i--) *tmp++ = (uint16)(*cp++) << 8; cp=(uint8 *)(sp->data); diff --git a/wavestream.c b/wavestream.c index bfd66e30..0934be23 100644 --- a/wavestream.c +++ b/wavestream.c @@ -184,7 +184,7 @@ int WAVStream_PlaySome(Uint8 *stream, int len) } if ( (music->stop - pos) < original_len ) { left = (original_len - (music->stop - pos)); - original_len -= left; + original_len -= (int)left; left = (int)((double)left*music->cvt.len_ratio); } original_len = SDL_RWread(music->src, music->cvt.buf,1,original_len); @@ -204,7 +204,7 @@ int WAVStream_PlaySome(Uint8 *stream, int len) Uint8 *data; if ( (music->stop - pos) < len ) { left = (len - (music->stop - pos)); - len -= left; + len -= (int)left; } data = SDL_stack_alloc(Uint8, len); if (data) @@ -215,7 +215,7 @@ int WAVStream_PlaySome(Uint8 *stream, int len) } } } - return left; + return (int)left; } /* Stop playback of a stream previously started with WAVStream_Start() */ @@ -343,14 +343,14 @@ static SDL_RWops *LoadWAVStream (SDL_RWops *src, SDL_AudioSpec *spec, /* Set the file offset to the DATA chunk data */ chunk.data = NULL; do { - *start = SDL_RWtell(src) + 2*sizeof(Uint32); + *start = (long)SDL_RWtell(src) + 2*sizeof(Uint32); lenread = ReadChunk(src, &chunk, 0); if ( lenread < 0 ) { was_error = 1; goto done; } } while ( chunk.magic != DATA ); - *stop = SDL_RWtell(src); + *stop = (long)SDL_RWtell(src); done: if ( format != NULL ) { @@ -446,7 +446,7 @@ static SDL_RWops *LoadAIFFStream (SDL_RWops *src, SDL_AudioSpec *spec, found_SSND = 1; offset = SDL_ReadBE32(src); blocksize = SDL_ReadBE32(src); - *start = SDL_RWtell(src) + offset; + *start = (long)SDL_RWtell(src) + offset; break; case COMM: