Revision: 21758
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21758
Author: jesterking
Date: 2009-07-21 13:34:55 +0200 (Tue, 21 Jul 2009)
Log Message:
-----------
some fixes so this compiles on windows.
Modified Paths:
--------------
branches/soundsystem/config/win32-vc-config.py
branches/soundsystem/intern/audaspace/FX/AUD_PitchReader.cpp
branches/soundsystem/intern/audaspace/SConscript
Modified: branches/soundsystem/config/win32-vc-config.py
===================================================================
--- branches/soundsystem/config/win32-vc-config.py 2009-07-21 11:03:07 UTC
(rev 21757)
+++ branches/soundsystem/config/win32-vc-config.py 2009-07-21 11:34:55 UTC
(rev 21758)
@@ -35,7 +35,7 @@
BF_ICONV_LIB = 'iconv'
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-BF_LIBSAMPLERATE = LIBDIR + '/SRC'
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
BF_LIBSAMPLERATE_LIB = 'samplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
Modified: branches/soundsystem/intern/audaspace/FX/AUD_PitchReader.cpp
===================================================================
--- branches/soundsystem/intern/audaspace/FX/AUD_PitchReader.cpp
2009-07-21 11:03:07 UTC (rev 21757)
+++ branches/soundsystem/intern/audaspace/FX/AUD_PitchReader.cpp
2009-07-21 11:34:55 UTC (rev 21758)
@@ -34,6 +34,6 @@
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;
}
Modified: branches/soundsystem/intern/audaspace/SConscript
===================================================================
--- branches/soundsystem/intern/audaspace/SConscript 2009-07-21 11:03:07 UTC
(rev 21757)
+++ branches/soundsystem/intern/audaspace/SConscript 2009-07-21 11:34:55 UTC
(rev 21758)
@@ -4,21 +4,21 @@
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] )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
