mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-11 07:11:39 +00:00
Don't use -rdynamic on platforms that don't necessarily support it.
git-svn-id: https://svn.eduke32.com/eduke32@1771 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
7812be9b67
commit
517bb2aa50
1 changed files with 12 additions and 10 deletions
|
@ -24,6 +24,8 @@
|
|||
|
||||
#ifdef HAVE_VORBIS
|
||||
|
||||
#define OV_EXCLUDE_STATIC_CALLBACKS
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <vorbis/vorbisfile.h>
|
||||
#else
|
||||
|
@ -41,12 +43,12 @@
|
|||
#include "multivoc.h"
|
||||
#include "_multivc.h"
|
||||
|
||||
#ifndef min
|
||||
#define min(x,y) ((x) < (y) ? (x) : (y))
|
||||
#endif
|
||||
#ifndef max
|
||||
#define max(x,y) ((x) > (y) ? (x) : (y))
|
||||
#endif
|
||||
#ifndef min
|
||||
#define min(x,y) ((x) < (y) ? (x) : (y))
|
||||
#endif
|
||||
#ifndef max
|
||||
#define max(x,y) ((x) > (y) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#define BLOCKSIZE 0x8000
|
||||
|
||||
|
@ -80,9 +82,9 @@ static size_t read_vorbis(void * ptr, size_t size, size_t nmemb, void * datasour
|
|||
bytes = size;
|
||||
}
|
||||
|
||||
memcpy(ptr, (uint8_t *)vorb->ptr + vorb->pos, bytes);
|
||||
vorb->pos += bytes;
|
||||
ptr = (uint8_t *)ptr + bytes;
|
||||
memcpy(ptr, (uint8_t *)vorb->ptr + vorb->pos, bytes);
|
||||
vorb->pos += bytes;
|
||||
ptr = (uint8_t *)ptr + bytes;
|
||||
|
||||
if (vorb->length == vorb->pos) {
|
||||
nread++;
|
||||
|
@ -193,7 +195,7 @@ static playbackstatus MV_GetNextVorbisBlock
|
|||
voice->channels = vi->channels;
|
||||
voice->SamplingRate = vi->rate;
|
||||
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 );
|
||||
vd->lastbitstream = bitstream;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue