zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use -rdynamic on platforms that don't necessarily support it.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1771 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2011-01-16 07:20:11 +00:00
parent 7812be9b67
commit 517bb2aa50
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
polymer/eduke32/source/jaudiolib/src/vorbis.c
View file

@ -24,6 +24,8 @@
#ifdef HAVE_VORBIS #ifdef HAVE_VORBIS
#define OV_EXCLUDE_STATIC_CALLBACKS
#ifdef __APPLE__ #ifdef __APPLE__
# include <vorbis/vorbisfile.h> # include <vorbis/vorbisfile.h>
#else #else
@ -41,12 +43,12 @@
#include "multivoc.h" #include "multivoc.h"
#include "_multivc.h" #include "_multivc.h"
#ifndef min #ifndef min
#define min(x,y) ((x) < (y) ? (x) : (y)) #define min(x,y) ((x) < (y) ? (x) : (y))
#endif #endif
#ifndef max #ifndef max
#define max(x,y) ((x) > (y) ? (x) : (y)) #define max(x,y) ((x) > (y) ? (x) : (y))
#endif #endif
#define BLOCKSIZE 0x8000 #define BLOCKSIZE 0x8000
@ -80,9 +82,9 @@ static size_t read_vorbis(void * ptr, size_t size, size_t nmemb, void * datasour
bytes = size; bytes = size;
} }
memcpy(ptr, (uint8_t *)vorb->ptr + vorb->pos, bytes); memcpy(ptr, (uint8_t *)vorb->ptr + vorb->pos, bytes);
vorb->pos += bytes; vorb->pos += bytes;
ptr = (uint8_t *)ptr + bytes; ptr = (uint8_t *)ptr + bytes;
if (vorb->length == vorb->pos) { if (vorb->length == vorb->pos) {
nread++; nread++;
@ -193,7 +195,7 @@ static playbackstatus MV_GetNextVorbisBlock
voice->channels = vi->channels; voice->channels = vi->channels;
voice->SamplingRate = vi->rate; voice->SamplingRate = vi->rate;
voice->RateScale = ( voice->SamplingRate * voice->PitchScale ) / MV_MixRate; voice->RateScale = ( voice->SamplingRate * voice->PitchScale ) / MV_MixRate;
voice->FixedPointBufferSize = ( voice->RateScale * MixBufferSize ) - voice->RateScale; voice->FixedPointBufferSize = ( voice->RateScale * MixBufferSize ) - voice->RateScale;
MV_SetVoiceMixMode( voice ); MV_SetVoiceMixMode( voice );
vd->lastbitstream = bitstream; vd->lastbitstream = bitstream;
} }