From 201c752eae3d1f294a6b38dcd377895ca94c6f71 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 19 Aug 2001 21:19:17 +0000 Subject: [PATCH] Sam Lantinga - Sun Aug 19 02:20:55 PDT 2001 * Added Project Builder projects for building MacOS X framework --- CHANGES | 2 ++ Makefile.am | 1 + PBProjects.tar.gz | Bin 0 -> 6946 bytes SDL_mixer.h | 2 +- voc.c | 4 ---- wavestream.c | 2 -- 6 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 PBProjects.tar.gz diff --git a/CHANGES b/CHANGES index 684f57ea..1f1eee56 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ 1.2.1: +Sam Lantinga - Sun Aug 19 02:20:55 PDT 2001 + * Added Project Builder projects for building MacOS X framework Darrell Walisser - Sun Aug 19 00:47:22 PDT 2001 * Fixed compilation problems with mikmod under MacOS X Torbjörn Andersson - Sun, 19 Aug 2001 16:03:30 diff --git a/Makefile.am b/Makefile.am index fb84bae8..b23bf856 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ endif EXTRA_DIST = \ CHANGES \ VisualC.zip \ + PBProjects.tar.gz \ MPWmake.sea.bin \ CWprojects.sea.hqx \ SDL_mixer.spec \ diff --git a/PBProjects.tar.gz b/PBProjects.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c1d17775c26bf0a393b32de302ed92cda0a4d535 GIT binary patch literal 6946 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 U{l_<)yyMwazeW?n83Mxp0Hb&5BLDyZ literal 0 HcmV?d00001 diff --git a/SDL_mixer.h b/SDL_mixer.h index 0a0d3eab..7b0638aa 100644 --- a/SDL_mixer.h +++ b/SDL_mixer.h @@ -93,7 +93,7 @@ extern DECLSPEC Mix_Music *Mix_LoadMUS(const char *file); #if 0 /* This hasn't been hooked into music.c yet */ /* Load a music file from an SDL_RWop object (MikMod-specific currently) Matt Campbell (matt@campbellhome.dhs.org) April 2000 */ -extern DECLSPEC Mix_Music *Mix_LoadMUS_RW(SDL_RWops *rw); +extern no_parse_DECLSPEC Mix_Music *Mix_LoadMUS_RW(SDL_RWops *rw); #endif /* Load a wave file of the mixer format from a memory buffer */ diff --git a/voc.c b/voc.c index bf0cb536..84362f22 100644 --- a/voc.c +++ b/voc.c @@ -329,9 +329,6 @@ static int voc_get_block(SDL_RWops *src, vs_t *v, SDL_AudioSpec *spec) static int voc_read(SDL_RWops *src, vs_t *v, Uint8 *buf, SDL_AudioSpec *spec) { int done = 0; - int rc; - Uint16 us; - Uint8 uc; Uint8 silence = 0x80; if (v->rest == 0) @@ -381,7 +378,6 @@ SDL_AudioSpec *Mix_LoadVOC_RW (SDL_RWops *src, int freesrc, { vs_t v; int was_error = 1; - int lenread; int samplesize; Uint8 *fillptr; void *ptr; diff --git a/wavestream.c b/wavestream.c index 5674f693..8d5ab9eb 100644 --- a/wavestream.c +++ b/wavestream.c @@ -380,11 +380,9 @@ static FILE *LoadAIFFStream (const char *file, SDL_AudioSpec *spec, Uint32 FORMchunk; Uint32 AIFFmagic; /* SSND chunk */ - Uint32 SSNDchunk; Uint32 offset; Uint32 blocksize; /* COMM format chunk */ - Uint32 COMMchunk; Uint16 channels; Uint32 numsamples; Uint16 samplesize;