diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-07-21 15:34:55 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-07-21 15:34:55 +0400 |
| commit | a1c270851d27429b931f15aa39b345cc4b3ae51a (patch) | |
| tree | 3ad17b3c4bd582ae8e841715f96a1ebfdf2937fa /intern | |
| parent | 79c9fce2d7e93ee589c0f0de6c7717411f319d03 (diff) | |
some fixes so this compiles on windows.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/FX/AUD_PitchReader.cpp | 2 | ||||
| -rw-r--r-- | intern/audaspace/SConscript | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/intern/audaspace/FX/AUD_PitchReader.cpp b/intern/audaspace/FX/AUD_PitchReader.cpp index d840f32fc10..c53264e1350 100644 --- a/intern/audaspace/FX/AUD_PitchReader.cpp +++ b/intern/audaspace/FX/AUD_PitchReader.cpp @@ -34,6 +34,6 @@ AUD_PitchReader::AUD_PitchReader(AUD_IReader* reader, float pitch) : AUD_Specs AUD_PitchReader::getSpecs() { AUD_Specs specs = m_reader->getSpecs(); - specs.rate = (AUD_SampleRate)(specs.rate * m_pitch); + specs.rate = (AUD_SampleRate)((int)(specs.rate * m_pitch)); return specs; } diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 7d8a803ff7e..4cb3e720d46 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -4,21 +4,21 @@ Import ('env') sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp') + env.Glob('SRC/*.cpp') incs = '. intern FX SRC ' + env['BF_PTHREADS_INC'] + ' ' + env['BF_LIBSAMPLERATE_INC'] -defs = '' +defs = [] if env['WITH_BF_FFMPEG']: sources += env.Glob('ffmpeg/*.cpp') incs += ' ffmpeg ' + env['BF_FFMPEG_INC'] - defs = 'WITH_FFMPEG' + defs.append('WITH_FFMPEG') if env['WITH_BF_SDL']: sources += env.Glob('SDL/*.cpp') incs += ' SDL ' + env['BF_SDL_INC'] - defs = 'WITH_SDL' + defs.append('WITH_SDL') if env['WITH_BF_OPENAL']: sources += env.Glob('OpenAL/*.cpp') incs += ' OpenAL ' + env['BF_OPENAL_INC'] - defs = 'WITH_OPENAL' + defs.append('WITH_OPENAL') -env.BlenderLib ('bf_audaspace', sources, Split(incs), Split(defs), libtype=['intern'], priority = [25] ) +env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] ) |