Skip to content

Commit

Permalink
Updated SDL_mixer with new versions of audio libraries, including SMP…
Browse files Browse the repository at this point in the history 
…EG 2.0, and fixed Visual C++ build.
  • Loading branch information
@slouken
slouken committed Jun 1, 2013
1 parent cd76a4f commit 02f6f98
Show file tree
Hide file tree
Showing 57 changed files with 358 additions and 822 deletions.
10 changes: 5 additions & 5 deletions VisualC/SDL_mixer.sln → VisualC/SDL_mixer_VS2008.sln
View file
@@ -1,25 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_mixer", "SDL_mixer.vcproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_mixer", "SDL_mixer_VS2008.vcproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}"
ProjectSection(ProjectDependencies) = postProject
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} = {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F} = {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi.vcproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi_VS2008.vcproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus.vcproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus_VS2008.vcproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}"
ProjectSection(ProjectDependencies) = postProject
{F7E944B3-0815-40CD-B3E4-90B2A15B0E33} = {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave.vcproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave_VS2008.vcproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}"
ProjectSection(ProjectDependencies) = postProject
{F7E944B3-0815-40CD-B3E4-90B2A15B0E33} = {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity.vcproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity_VS2008.vcproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
48 changes: 24 additions & 24 deletions VisualC/SDL_mixer.vcproj → VisualC/SDL_mixer_VS2008.vcproj
View file
Expand Up @@ -45,18 +45,18 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Debug/SDL_mixer.tlb"
TypeLibraryName=".\Debug/SDL2_mixer.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg2.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
MinimalRebuild="true"
RuntimeLibrary="2"
PrecompiledHeaderFile=".\Debug/SDL_mixer.pch"
PrecompiledHeaderFile=".\Debug/SDL2_mixer.pch"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
Expand All @@ -74,10 +74,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib SDL.lib"
AdditionalDependencies="winmm.lib SDL2.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL_mixer.pdb"
ProgramDatabaseFile=".\Debug/SDL2_mixer.pdb"
SubSystem="2"
TargetMachine="1"
/>
Expand All @@ -93,7 +93,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Debug/SDL_mixer.bsc"
OutputFile=".\Debug/SDL2_mixer.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand Down Expand Up @@ -132,18 +132,18 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Debug/SDL_mixer.tlb"
TypeLibraryName=".\Debug/SDL2_mixer.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg2.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
MinimalRebuild="true"
RuntimeLibrary="2"
PrecompiledHeaderFile=".\Debug/SDL_mixer.pch"
PrecompiledHeaderFile=".\Debug/SDL2_mixer.pch"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
Expand All @@ -161,10 +161,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib SDL.lib"
AdditionalDependencies="winmm.lib SDL2.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL_mixer.pdb"
ProgramDatabaseFile=".\Debug/SDL2_mixer.pdb"
SubSystem="2"
TargetMachine="17"
/>
Expand All @@ -180,7 +180,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Debug/SDL_mixer.bsc"
OutputFile=".\Debug/SDL2_mixer.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand Down Expand Up @@ -219,7 +219,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Release/SDL_mixer.tlb"
TypeLibraryName=".\Release/SDL2_mixer.tlb"
HeaderFileName=""
/>
<Tool
Expand All @@ -228,11 +228,11 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg2.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/SDL_mixer.pch"
PrecompiledHeaderFile=".\Release/SDL2_mixer.pch"
WarningLevel="3"
/>
<Tool
Expand All @@ -248,9 +248,9 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib SDL.lib"
AdditionalDependencies="winmm.lib SDL2.lib"
LinkIncremental="1"
ProgramDatabaseFile=".\Release/SDL_mixer.pdb"
ProgramDatabaseFile=".\Release/SDL2_mixer.pdb"
SubSystem="2"
TargetMachine="1"
/>
Expand All @@ -266,7 +266,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/SDL_mixer.bsc"
OutputFile=".\Release/SDL2_mixer.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand Down Expand Up @@ -305,7 +305,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Release/SDL_mixer.tlb"
TypeLibraryName=".\Release/SDL2_mixer.tlb"
HeaderFileName=""
/>
<Tool
Expand All @@ -314,11 +314,11 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg2.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/SDL_mixer.pch"
PrecompiledHeaderFile=".\Release/SDL2_mixer.pch"
WarningLevel="3"
/>
<Tool
Expand All @@ -334,9 +334,9 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib SDL.lib"
AdditionalDependencies="winmm.lib SDL2.lib"
LinkIncremental="1"
ProgramDatabaseFile=".\Release/SDL_mixer.pdb"
ProgramDatabaseFile=".\Release/SDL2_mixer.pdb"
SubSystem="2"
TargetMachine="17"
/>
Expand All @@ -352,7 +352,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/SDL_mixer.bsc"
OutputFile=".\Release/SDL2_mixer.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand Down
67 changes: 0 additions & 67 deletions VisualC/external/include/MPEGfilter.h
View file

This file was deleted.

33 changes: 33 additions & 0 deletions VisualC/external/include/MPEGframe.h
View file
@@ -0,0 +1,33 @@
/*
SMPEG - SDL MPEG Player Library
Copyright (C) 1999 Loki Entertainment Software
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

/* MPEG video frame */

#ifndef _MPEGFRAME_H_
#define _MPEGFRAME_H_

/* A YV12 format video frame */
typedef struct SMPEG_Frame {
unsigned int w, h;
unsigned int image_width;
unsigned int image_height;
Uint8 *image;
} SMPEG_Frame;

#endif /* _MPEGFRAME_H_ */
18 changes: 13 additions & 5 deletions VisualC/external/include/mikmod.h
View file
Expand Up @@ -74,7 +74,17 @@ MIKMODAPI extern long MikMod_GetVersion(void);
#include <windows.h>
#include <io.h>
#include <mmsystem.h>
#endif

/* Avoid conflicts with windef.h */
#define SBYTE _mm_SBYTE
#define UBYTE _mm_UBYTE
#define SWORD _mm_SWORD
#define UWORD _mm_UWORD
#define SLONG _mm_SLONG
#define ULONG _mm_ULONG
#define BOOL _mm_BOOL

#endif /* WIN32 */

#if defined(__OS2__)||defined(__EMX__)
#define INCL_DOSSEMAPHORES
Expand All @@ -92,8 +102,8 @@ typedef signed char SBYTE; /* 1 byte, signed */
typedef unsigned char UBYTE; /* 1 byte, unsigned */
typedef signed short SWORD; /* 2 bytes, signed */
typedef unsigned short UWORD; /* 2 bytes, unsigned */
typedef signed long SLONG; /* 4 bytes, signed */
typedef unsigned long ULONG; /* 4 bytes, unsigned */
typedef signed int SLONG; /* 4 bytes, signed */
typedef unsigned int ULONG; /* 4 bytes, unsigned */
typedef int BOOL; /* 0=false, <>0 true */

#else
Expand All @@ -104,11 +114,9 @@ typedef unsigned char UBYTE; /* 1 byte, unsigned */
typedef signed short SWORD; /* 2 bytes, signed */
typedef unsigned short UWORD; /* 2 bytes, unsigned */
typedef signed long SLONG; /* 4 bytes, signed */
#if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32)
typedef unsigned long ULONG; /* 4 bytes, unsigned */
typedef int BOOL; /* 0=false, <>0 true */
#endif
#endif

/*
* ========== Error codes
Expand Down
10 changes: 5 additions & 5 deletions VisualC/external/include/ogg/config_types.h
View file
Expand Up @@ -16,10 +16,10 @@
# include <sys/types.h>
#endif

typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
typedef int ogg_int32_t;
typedef unsigned int ogg_uint32_t;
typedef long long ogg_int64_t;
typedef int16_t ogg_int16_t;
typedef uint16_t ogg_uint16_t;
typedef int32_t ogg_int32_t;
typedef uint32_t ogg_uint32_t;
typedef int64_t ogg_int64_t;

#endif

0 comments on commit 02f6f98

Please sign in to comment.