teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@1113 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-10-24 01:33:53 +00:00
parent 059a4f3513
commit 1a7365826c
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/Makefile
View file

@ -11,9 +11,14 @@ PRETTY_OUTPUT = 1
DXROOT=../sdk/dx DXROOT=../sdk/dx
ALROOT = AL ALROOT = AL
SDLROOT = /usr/local
SDLCONFIG = /usr/local/bin/sdl-config SDLCONFIG = /usr/local/bin/sdl-config
# SDLCONFIG = sdl-config
ifeq ($(wildcard $(SDLCONFIG)),$(SDLCONFIG))
SDLROOT = /usr/local
else
SDLCONFIG = sdl-config
endif
# Engine options # Engine options
SUPERBUILD = 1 SUPERBUILD = 1

10
polymer/eduke32/build/Makefile.shared
View file

@ -3,8 +3,14 @@
ENGINELIB=libengine.a ENGINELIB=libengine.a
EDITORLIB=libbuild.a EDITORLIB=libbuild.a
SDLCONFIG=/usr/local/bin/sdl-config SDLCONFIG = /usr/local/bin/sdl-config
# SDLCONFIG=sdl-config
ifeq ($(wildcard $(SDLCONFIG)),$(SDLCONFIG))
SDLROOT = /usr/local
else
SDLCONFIG = sdl-config
endif
SDL_FRAMEWORK = 0 SDL_FRAMEWORK = 0
# Overridden for OSes that don't have the cutdown stdc++ that is supc++ # Overridden for OSes that don't have the cutdown stdc++ that is supc++

8
polymer/eduke32/source/jaudiolib/dsl.c
View file

@ -40,7 +40,6 @@ static int interrupts_disabled = 0;
static int(*_DSL_CallBackFunc)(int); static int(*_DSL_CallBackFunc)(int);
static volatile char *_DSL_BufferStart; static volatile char *_DSL_BufferStart;
static int _DSL_BufferSize; static int _DSL_BufferSize;
static int _DSL_NumDivisions;
static int _DSL_SampleRate; static int _DSL_SampleRate;
static int _DSL_remainder; static int _DSL_remainder;
static Uint16 _DSL_format; static Uint16 _DSL_format;
@ -184,7 +183,6 @@ int DSL_BeginBufferedPlayback(char *BufferStart, int(*CallBackFunc)(int), int Bu
_DSL_CallBackFunc = CallBackFunc; _DSL_CallBackFunc = CallBackFunc;
_DSL_BufferStart = BufferStart; _DSL_BufferStart = BufferStart;
_DSL_BufferSize = (BufferSize / NumDivisions); _DSL_BufferSize = (BufferSize / NumDivisions);
_DSL_NumDivisions = NumDivisions;
_DSL_remainder = 0; _DSL_remainder = 0;
@ -198,12 +196,6 @@ int DSL_BeginBufferedPlayback(char *BufferStart, int(*CallBackFunc)(int), int Bu
if (_DSL_SampleRate >= 16000) chunksize *= 2; if (_DSL_SampleRate >= 16000) chunksize *= 2;
if (_DSL_SampleRate >= 32000) chunksize *= 2; if (_DSL_SampleRate >= 32000) chunksize *= 2;
/*
// SDL mixer does this already
if (MixMode & SIXTEEN_BIT) chunksize *= 2;
if (MixMode & STEREO) chunksize *= 2;
*/
if (Mix_OpenAudio(_DSL_SampleRate, _DSL_format, _DSL_channels, chunksize) < 0) if (Mix_OpenAudio(_DSL_SampleRate, _DSL_format, _DSL_channels, chunksize) < 0)
{ {
DSL_SetErrorCode(DSL_MixerInitFailure); DSL_SetErrorCode(DSL_MixerInitFailure);