shithub: duke3d

Download patch

ref: 28c20c61296f01bb6224dcf05b8609302bfc23ab
parent: f768d1838bb6ad7b646505861bcfe340339af93e
parent: edacaef2bf6a6879cff1ff5ae348e747a6871005
author: unknown <fabien@fabien-PC.(none)>
date: Thu Dec 13 16:45:26 EST 2012 

Merge branch 'master' of github.com:fabiensanglard/chocolate_duke3D


--- a/Game/src/audiolib/_multivc.h
+++ b/Game/src/audiolib/_multivc.h
@@ -206,7 +206,7 @@
 
 // typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ];
 
-static void MV_Mix( VoiceNode *voice, int buffer );
+static void MV_Mix( VoiceNode *voice);
 static void MV_PlayVoice( VoiceNode *voice );
 static void MV_StopVoice( VoiceNode *voice );
 static void MV_ServiceVoc( void );
--- a/Game/src/audiolib/fx_man.c
+++ b/Game/src/audiolib/fx_man.c
@@ -59,10 +59,7 @@
    number.  A -1 returns a pointer the current error.
 ---------------------------------------------------------------------*/
 
-char *FX_ErrorString
-   (
-   int ErrorNumber
-   )
+char *FX_ErrorString(int ErrorNumber)
 
    {
    char *ErrorString;
@@ -899,7 +896,7 @@
    int left,
    int right,
    int priority,
-   unsigned long callbackval
+   uint32_t callbackval
    )
 
    {
@@ -926,14 +923,14 @@
 int FX_PlayLoopedVOC
    (
    char *ptr,
-   long loopstart,
-   long loopend,
-   int pitchoffset,
-   int vol,
-   int left,
-   int right,
-   int priority,
-   unsigned long callbackval
+   int32_t loopstart,
+   int32_t loopend,
+   int32_t pitchoffset,
+   int32_t vol,
+   int32_t left,
+   int32_t right,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
@@ -960,12 +957,12 @@
 int FX_PlayWAV
    (
    char *ptr,
-   int pitchoffset,
-   int vol,
-   int left,
-   int right,
-   int priority,
-   unsigned long callbackval
+   int32_t pitchoffset,
+   int32_t vol,
+   int32_t left,
+   int32_t right,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
@@ -991,19 +988,19 @@
 
 int FX_PlayLoopedWAV
    (
-   uint8_t *ptr,
-   long loopstart,
-   long loopend,
-   int pitchoffset,
-   int vol,
-   int left,
-   int right,
-   int priority,
-   unsigned long callbackval
+   char *ptr,
+   int32_t loopstart,
+   int32_t loopend,
+   int32_t pitchoffset,
+   int32_t vol,
+   int32_t left,
+   int32_t right,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
-   int handle;
+   int32_t handle;
 
    handle = MV_PlayLoopedWAV( ptr, loopstart, loopend,
       pitchoffset, vol, left, right, priority, callbackval );
@@ -1027,11 +1024,11 @@
 int FX_PlayVOC3D
    (
    char *ptr,
-   int pitchoffset,
-   int angle,
-   int distance,
-   int priority,
-   unsigned long callbackval
+   int32_t pitchoffset,
+   int32_t angle,
+   int32_t distance,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
@@ -1059,11 +1056,11 @@
 int FX_PlayWAV3D
    (
    char *ptr,
-   int pitchoffset,
-   int angle,
-   int distance,
-   int priority,
-   unsigned long callbackval
+   int32_t pitchoffset,
+   int32_t angle,
+   int32_t distance,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
@@ -1090,14 +1087,14 @@
 int FX_PlayRaw
    (
    char *ptr,
-   unsigned long length,
-   unsigned rate,
-   int pitchoffset,
-   int vol,
-   int left,
-   int right,
-   int priority,
-   unsigned long callbackval
+   uint32_t length,
+   uint32_t rate,
+   int32_t pitchoffset,
+   int32_t vol,
+   int32_t left,
+   int32_t right,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
@@ -1124,16 +1121,16 @@
 int FX_PlayLoopedRaw
    (
    char *ptr,
-   unsigned long length,
-   char *loopstart,
-   char *loopend,
-   unsigned rate,
-   int pitchoffset,
-   int vol,
-   int left,
-   int right,
-   int priority,
-   unsigned long callbackval
+   uint32_t length,
+   uint8_t *loopstart,
+   uint8_t *loopend,
+   uint32_t rate,
+   int32_t pitchoffset,
+   int32_t vol,
+   int32_t left,
+   int32_t right,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
@@ -1269,14 +1266,14 @@
 
 int FX_StartDemandFeedPlayback
    (
-   void ( *function )( char **ptr, unsigned long *length ),
-   int rate,
-   int pitchoffset,
-   int vol,
-   int left,
-   int right,
-   int priority,
-   unsigned long callbackval
+   void ( *function )( char **ptr, uint32_t *length ),
+   int32_t rate,
+   int32_t pitchoffset,
+   int32_t vol,
+   int32_t left,
+   int32_t right,
+   int32_t priority,
+   uint32_t callbackval
    )
 
    {
--- a/Game/src/audiolib/fx_man.h
+++ b/Game/src/audiolib/fx_man.h
@@ -82,7 +82,7 @@
    };
 
 
-uint8_t *FX_ErrorString( int ErrorNumber );
+char *FX_ErrorString( int ErrorNumber );
 int   FX_SetupCard( int SoundCard, fx_device *device );
 int   FX_GetBlasterSettings( fx_blaster_config *blaster );
 int   FX_SetupSoundBlaster( fx_blaster_config blaster, int *MaxVoices, int *MaxSampleBits, int *MaxChannels );
@@ -106,35 +106,35 @@
 int FX_SetPitch( int handle, int pitchoffset );
 int FX_SetFrequency( int handle, int frequency );
 
-int FX_PlayVOC( uint8_t *ptr, int pitchoffset, int vol, int left, int right,
+int FX_PlayVOC( char *ptr, int pitchoffset, int vol, int left, int right,
        int priority, uint32_t callbackval );
-int FX_PlayLoopedVOC( uint8_t *ptr, int32_t loopstart, int32_t loopend,
+int FX_PlayLoopedVOC( char *ptr, int32_t loopstart, int32_t loopend,
        int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
        uint32_t callbackval );
-int FX_PlayWAV( uint8_t *ptr, int pitchoffset, int vol, int left, int right,
+int FX_PlayWAV( char *ptr, int pitchoffset, int vol, int left, int right,
        int priority, uint32_t callbackval );
-int FX_PlayLoopedWAV( uint8_t *ptr, int32_t loopstart, int32_t loopend,
-       int pitchoffset, int vol, int left, int right, int priority,
+int FX_PlayLoopedWAV( char *ptr, int32_t loopstart, int32_t loopend,
+       int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
        uint32_t callbackval );
-int FX_PlayVOC3D( uint8_t *ptr, int32_t pitchoffset, int32_t angle, int32_t distance,
+int FX_PlayVOC3D( char *ptr, int32_t pitchoffset, int32_t angle, int32_t distance,
+       int32_t priority, uint32_t callbackval );
+int FX_PlayWAV3D( char *ptr, int pitchoffset, int angle, int distance,
        int priority, uint32_t callbackval );
-int FX_PlayWAV3D( uint8_t *ptr, int pitchoffset, int angle, int distance,
-       int priority, uint32_t callbackval );
-int FX_PlayRaw( uint8_t *ptr, uint32_t length, uint32_t rate,
-       int pitchoffset, int vol, int left, int right, int priority,
+int FX_PlayRaw( char *ptr, uint32_t length, uint32_t rate,
+       int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
        uint32_t callbackval );
-int FX_PlayLoopedRaw( uint8_t *ptr, uint32_t length, uint8_t *loopstart,
-       uint8_t *loopend, unsigned rate, int pitchoffset, int vol, int left,
-       int right, int priority, uint32_t callbackval );
+int FX_PlayLoopedRaw( char *ptr, uint32_t length, uint8_t *loopstart,
+       uint8_t *loopend, uint32_t rate, int32_t pitchoffset, int32_t vol, int32_t left,
+       int32_t right, int32_t priority, uint32_t callbackval );
 int32_t FX_Pan3D( int handle, int angle, int distance );
 int32_t FX_SoundActive( int32_t handle );
 int32_t FX_SoundsPlaying( void );
 int32_t FX_StopSound( int handle );
 int32_t FX_StopAllSounds( void );
-int32_t FX_StartDemandFeedPlayback( void ( *function )( uint8_t **ptr, uint32_t *length ),
+int32_t FX_StartDemandFeedPlayback( void ( *function )( char **ptr, uint32_t *length ),
        int32_t rate, int32_t pitchoffset, int32_t vol, int32_t left, int32_t right,
        int32_t priority, uint32_t callbackval );
-int  FX_StartRecording( int MixRate, void ( *function )( uint8_t *ptr, int length ) );
+int  FX_StartRecording( int MixRate, void ( *function )( char *ptr, int length ) );
 void FX_StopRecord( void );
 
 #endif
--- a/Game/src/audiolib/multivoc.c
+++ b/Game/src/audiolib/multivoc.c
@@ -61,7 +61,7 @@
 #include "multivoc.h"
 #include "_multivc.h"
 #include "debugio.h"
-#include "..\sounddebugdefs.h"
+#include "../sounddebugdefs.h"
 
 // for the Mutex
 #include <SDL.h>
@@ -132,7 +132,7 @@
 
 static void ( *MV_CallBackFunc )( unsigned long ) = NULL;
 static void ( *MV_RecordFunc )( char *ptr, int length ) = NULL;
-static void ( *MV_MixFunction )( VoiceNode *voice/*, int buffer */);
+static void ( *MV_MixFunction )( VoiceNode *voice);
 
 int MV_MaxVolume = 63;
 
@@ -2536,7 +2536,7 @@
    int   left,
    int   right,
    int   priority,
-   unsigned long callbackval
+   uint32_t callbackval
    )
 
    {
--- a/Game/src/audiolib/multivoc.h
+++ b/Game/src/audiolib/multivoc.h
@@ -111,7 +111,7 @@
          int priority, unsigned long callbackval );
 int   MV_PlayLoopedVOC( char *ptr, long loopstart, long loopend,
          int pitchoffset, int vol, int left, int right, int priority,
-         unsigned long callbackval );
+         uint32_t callbackval );
 void  MV_CreateVolumeTable( int index, int volume, int MaxVolume );
 void  MV_SetVolume( int volume );
 int   MV_GetVolume( void );
--- a/Game/src/audiolib/mv_mix.c
+++ b/Game/src/audiolib/mv_mix.c
@@ -23,7 +23,7 @@
 #define gval0 MV_GVal[*MV_GPos&3]
 #define gval(x) MV_GVal[(*MV_GPos+x)&3]
 
-_inline int MV_cubic(int position)
+int MV_cubic(int position)
 {
 	int xd, fa;
 	xd = (position >> 1) & 0x7FFF;
--- a/Game/src/audiolib/mvreverb.c
+++ b/Game/src/audiolib/mvreverb.c
@@ -24,7 +24,7 @@
 
 static int cnv_offset(int src)
 {
-	__int64 temp = ((__int64)src * (__int64)MV_MixRate) / 22050;
+	int64_t temp = ((int64_t)src * (int64_t)MV_MixRate) / 22050;
 	return (int)temp;
 }
 
@@ -80,7 +80,7 @@
 
 }
 
-__inline double g_buffer(int iOff, double *ptr)                          // get_buffer content helper: takes care about wraps
+double g_buffer(int iOff, double *ptr)                          // get_buffer content helper: takes care about wraps
 {
 	int correctDelay = delay;
 	if(!correctDelay)
@@ -101,7 +101,7 @@
 	return (double)*(ptr+iOff);
 }
 
-__inline void s_buffer(int iOff,double iVal, double *ptr)                // set_buffer content helper: takes care about wraps and clipping
+void s_buffer(int iOff,double iVal, double *ptr)                // set_buffer content helper: takes care about wraps and clipping
 {
 	int correctDelay = delay;
 	if(!correctDelay)
@@ -122,7 +122,7 @@
 	*(ptr+iOff)=iVal;
 }
 
-__inline void s_buffer1(int iOff,double iVal, double *ptr)                // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+void s_buffer1(int iOff,double iVal, double *ptr)                // set_buffer (+1 sample) content helper: takes care about wraps and clipping
 {
 	int correctDelay = delay;
 	if(!correctDelay)
@@ -143,7 +143,7 @@
 	*(ptr+iOff)=iVal;
 }
 
-__inline double MixREVERBLeft(double INPUT_SAMPLE_L, double INPUT_SAMPLE_R, double *ptr)
+double MixREVERBLeft(double INPUT_SAMPLE_L, double INPUT_SAMPLE_R, double *ptr)
 {
 	double ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
 	
@@ -191,7 +191,7 @@
 	return (double)iRVBLeft;
 }
 
-__inline double MixREVERBRight(void)
+double MixREVERBRight(void)
 {
 	return (double)iRVBRight;
 }
--- a/Game/src/dummy_audiolib.c
+++ b/Game/src/dummy_audiolib.c
@@ -9,6 +9,7 @@
 #include "audiolib/fx_man.h"
 #include <inttypes.h>
 
+/*
 uint8_t  *FX_ErrorString( int ErrorNumber ){
    static uint8_t  nope = '\0';
     return &nope;
@@ -37,7 +38,7 @@
 int FX_SetPitch( int handle, int pitchoffset ){return 1;}
 int FX_SetFrequency( int handle, int frequency ){return 1;}
 
-int FX_PlayVOC( uint8_t  *ptr, int pitchoffset, int vol, int left, int right,
+int FX_PlayVOC( char  *ptr, int pitchoffset, int vol, int left, int right,
                int priority, uint32_t callbackval ){return FX_Ok;}
 int FX_PlayLoopedVOC( uint8_t  *ptr, int32_t loopstart, int32_t loopend,
                      int pitchoffset, int vol, int left, int right, int priority,
@@ -65,12 +66,12 @@
 int FX_StartDemandFeedPlayback( void ( *function )( uint8_t  **ptr, uint32_t *length ),
                                int rate, int pitchoffset, int vol, int left, int right,
                                int priority, uint32_t callbackval ){return 1;}
-int  FX_StartRecording( int MixRate, void ( *function )( uint8_t  *ptr, int length ) ){return 1;}
+int  FX_StartRecording( int MixRate, void ( *function )( char  *ptr, int length ) ){return 1;}
 void FX_StopRecord( void ){}
 
+ */
 
 
-
 //Dummy music
 #include "audiolib/music.h"
 
@@ -193,4 +194,5 @@
 {
         
 }
+
 
--- a/README.md
+++ b/README.md
@@ -11,6 +11,13 @@
 
 Cheers,
 
+Build :
+=======
+
+Windows : Use Visual Studio 2005 or Visual Studio 2012
+Mac OS X: Use Xcode 4.0
+Linux   : Never tested :/ !
+
 Fabien Sanglard
 
 
--- a/xcode/Duke3D.xcodeproj/project.pbxproj
+++ b/xcode/Duke3D.xcodeproj/project.pbxproj
@@ -47,6 +47,15 @@
 		2D7B630116791C0300E35E54 /* dummy_multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B630016791C0200E35E54 /* dummy_multi.c */; };
 		2D7B7AEE16792D6700DB503A /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B7AED16792D6700DB503A /* SDLMain.m */; };
 		2D7B7B121679325D00DB503A /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D7B7B111679325D00DB503A /* CoreFoundation.framework */; };
+		2D7C17D7167AD6A500E1BBA1 /* dsl.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17CE167AD6A500E1BBA1 /* dsl.c */; };
+		2D7C17D8167AD6A500E1BBA1 /* fx_man.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17CF167AD6A500E1BBA1 /* fx_man.c */; };
+		2D7C17D9167AD6A500E1BBA1 /* ll_man.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17D0167AD6A500E1BBA1 /* ll_man.c */; };
+		2D7C17DA167AD6A500E1BBA1 /* multivoc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17D1167AD6A500E1BBA1 /* multivoc.c */; };
+		2D7C17DB167AD6A500E1BBA1 /* mv_mix.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17D2167AD6A500E1BBA1 /* mv_mix.c */; };
+		2D7C17DC167AD6A500E1BBA1 /* mvreverb.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17D3167AD6A500E1BBA1 /* mvreverb.c */; };
+		2D7C17DD167AD6A500E1BBA1 /* nodpmi.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17D4167AD6A500E1BBA1 /* nodpmi.c */; };
+		2D7C17DE167AD6A500E1BBA1 /* user.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17D6167AD6A500E1BBA1 /* user.c */; };
+		2D7C17E0167ADE2000E1BBA1 /* pitch.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7C17DF167ADE1F00E1BBA1 /* pitch.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -160,6 +169,17 @@
 		2D7B7AED16792D6700DB503A /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = "<group>"; };
 		2D7B7AEF16792D8900DB503A /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = "<group>"; };
 		2D7B7B111679325D00DB503A /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		2D7C17CD167AD6A500E1BBA1 /* assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = assert.h; path = ../../Game/src/audiolib/assert.h; sourceTree = "<group>"; };
+		2D7C17CE167AD6A500E1BBA1 /* dsl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dsl.c; path = ../../Game/src/audiolib/dsl.c; sourceTree = "<group>"; };
+		2D7C17CF167AD6A500E1BBA1 /* fx_man.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fx_man.c; path = ../../Game/src/audiolib/fx_man.c; sourceTree = "<group>"; };
+		2D7C17D0167AD6A500E1BBA1 /* ll_man.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ll_man.c; path = ../../Game/src/audiolib/ll_man.c; sourceTree = "<group>"; };
+		2D7C17D1167AD6A500E1BBA1 /* multivoc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = multivoc.c; path = ../../Game/src/audiolib/multivoc.c; sourceTree = "<group>"; };
+		2D7C17D2167AD6A500E1BBA1 /* mv_mix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mv_mix.c; path = ../../Game/src/audiolib/mv_mix.c; sourceTree = "<group>"; };
+		2D7C17D3167AD6A500E1BBA1 /* mvreverb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mvreverb.c; path = ../../Game/src/audiolib/mvreverb.c; sourceTree = "<group>"; };
+		2D7C17D4167AD6A500E1BBA1 /* nodpmi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nodpmi.c; path = ../../Game/src/audiolib/nodpmi.c; sourceTree = "<group>"; };
+		2D7C17D5167AD6A500E1BBA1 /* pitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pitch.h; path = ../../Game/src/audiolib/pitch.h; sourceTree = "<group>"; };
+		2D7C17D6167AD6A500E1BBA1 /* user.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = user.c; path = ../../Game/src/audiolib/user.c; sourceTree = "<group>"; };
+		2D7C17DF167ADE1F00E1BBA1 /* pitch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pitch.c; path = ../../Game/src/audiolib/pitch.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -273,6 +293,7 @@
 		2D7B623916788F7900E35E54 /* Game */ = {
 			isa = PBXGroup;
 			children = (
+				2D7C17CC167AD65800E1BBA1 /* Audiolib */,
 				2D7B623A16788F9B00E35E54 /* _functio.h */,
 				2D7B623B16788F9B00E35E54 /* _rts.h */,
 				2D7B623C16788F9B00E35E54 /* actors.c */,
@@ -339,6 +360,24 @@
 			path = ../../Game/src/midi;
 			sourceTree = "<group>";
 		};
+		2D7C17CC167AD65800E1BBA1 /* Audiolib */ = {
+			isa = PBXGroup;
+			children = (
+				2D7C17DF167ADE1F00E1BBA1 /* pitch.c */,
+				2D7C17CD167AD6A500E1BBA1 /* assert.h */,
+				2D7C17CE167AD6A500E1BBA1 /* dsl.c */,
+				2D7C17CF167AD6A500E1BBA1 /* fx_man.c */,
+				2D7C17D0167AD6A500E1BBA1 /* ll_man.c */,
+				2D7C17D1167AD6A500E1BBA1 /* multivoc.c */,
+				2D7C17D2167AD6A500E1BBA1 /* mv_mix.c */,
+				2D7C17D3167AD6A500E1BBA1 /* mvreverb.c */,
+				2D7C17D4167AD6A500E1BBA1 /* nodpmi.c */,
+				2D7C17D5167AD6A500E1BBA1 /* pitch.h */,
+				2D7C17D6167AD6A500E1BBA1 /* user.c */,
+			);
+			name = Audiolib;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -426,6 +465,15 @@
 				2D7B62FF16790E8100E35E54 /* dummy_audiolib.c in Sources */,
 				2D7B630116791C0300E35E54 /* dummy_multi.c in Sources */,
 				2D7B7AEE16792D6700DB503A /* SDLMain.m in Sources */,
+				2D7C17D7167AD6A500E1BBA1 /* dsl.c in Sources */,
+				2D7C17D8167AD6A500E1BBA1 /* fx_man.c in Sources */,
+				2D7C17D9167AD6A500E1BBA1 /* ll_man.c in Sources */,
+				2D7C17DA167AD6A500E1BBA1 /* multivoc.c in Sources */,
+				2D7C17DB167AD6A500E1BBA1 /* mv_mix.c in Sources */,
+				2D7C17DC167AD6A500E1BBA1 /* mvreverb.c in Sources */,
+				2D7C17DD167AD6A500E1BBA1 /* nodpmi.c in Sources */,
+				2D7C17DE167AD6A500E1BBA1 /* user.c in Sources */,
+				2D7C17E0167ADE2000E1BBA1 /* pitch.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -454,7 +502,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "/Library/Frameworks/SDL.framework/Headers/**";
+				HEADER_SEARCH_PATHS = (
+					"/Library/Frameworks/SDL.framework/Headers/**",
+					"/Library/Frameworks/SDL_Mixer.framework/Headers/**",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -477,7 +528,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "/Library/Frameworks/SDL.framework/Headers/**";
+				HEADER_SEARCH_PATHS = (
+					"/Library/Frameworks/SDL.framework/Headers/**",
+					"/Library/Frameworks/SDL_Mixer.framework/Headers/**",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				SDKROOT = macosx;
 			};