[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14058] branches/soc-2007-hcube: moved tinySND and libsamplerate to extern lib, blender audio system is in intern/soundsystem, added scons scripts too

Csaba Hruska csaba.hruska at gmail.com
Tue Mar 11 10:41:33 CET 2008 

Revision: 14058
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14058
Author:   hcube
Date:     2008-03-11 10:41:20 +0100 (Tue, 11 Mar 2008)

Log Message:
-----------
moved tinySND and libsamplerate to extern lib, blender audio system is in intern/soundsystem, added scons scripts too

Modified Paths:
--------------
    branches/soc-2007-hcube/config/darwin-config.py
    branches/soc-2007-hcube/config/linux2-config.py
    branches/soc-2007-hcube/config/linuxcross-config.py
    branches/soc-2007-hcube/config/openbsd3-config.py
    branches/soc-2007-hcube/config/sunos5-config.py
    branches/soc-2007-hcube/config/win32-mingw-config.py
    branches/soc-2007-hcube/config/win32-vc-config.py
    branches/soc-2007-hcube/extern/SConscript
    branches/soc-2007-hcube/intern/SConscript
    branches/soc-2007-hcube/source/blender/blenkernel/SConscript
    branches/soc-2007-hcube/source/blender/src/SConscript
    branches/soc-2007-hcube/tools/btools.py

Added Paths:
-----------
    branches/soc-2007-hcube/extern/samplerate/
    branches/soc-2007-hcube/extern/samplerate/AUTHORS
    branches/soc-2007-hcube/extern/samplerate/COPYING
    branches/soc-2007-hcube/extern/samplerate/ChangeLog
    branches/soc-2007-hcube/extern/samplerate/INSTALL
    branches/soc-2007-hcube/extern/samplerate/Make.bat
    branches/soc-2007-hcube/extern/samplerate/Makefile.am
    branches/soc-2007-hcube/extern/samplerate/Makefile.in
    branches/soc-2007-hcube/extern/samplerate/NEWS
    branches/soc-2007-hcube/extern/samplerate/README
    branches/soc-2007-hcube/extern/samplerate/SConscript
    branches/soc-2007-hcube/extern/samplerate/Win32/
    branches/soc-2007-hcube/extern/samplerate/Win32/Makefile.am
    branches/soc-2007-hcube/extern/samplerate/Win32/Makefile.in
    branches/soc-2007-hcube/extern/samplerate/Win32/Makefile.mingw.in
    branches/soc-2007-hcube/extern/samplerate/Win32/Makefile.msvc
    branches/soc-2007-hcube/extern/samplerate/Win32/config.h
    branches/soc-2007-hcube/extern/samplerate/Win32/libsamplerate.def
    branches/soc-2007-hcube/extern/samplerate/Win32/unistd.h
    branches/soc-2007-hcube/extern/samplerate/acinclude.m4
    branches/soc-2007-hcube/extern/samplerate/aclocal.m4
    branches/soc-2007-hcube/extern/samplerate/compile
    branches/soc-2007-hcube/extern/samplerate/config.guess
    branches/soc-2007-hcube/extern/samplerate/config.sub
    branches/soc-2007-hcube/extern/samplerate/configure
    branches/soc-2007-hcube/extern/samplerate/configure.ac
    branches/soc-2007-hcube/extern/samplerate/depcomp
    branches/soc-2007-hcube/extern/samplerate/doc/
    branches/soc-2007-hcube/extern/samplerate/doc/ChangeLog
    branches/soc-2007-hcube/extern/samplerate/doc/Makefile.am
    branches/soc-2007-hcube/extern/samplerate/doc/Makefile.in
    branches/soc-2007-hcube/extern/samplerate/doc/NEWS
    branches/soc-2007-hcube/extern/samplerate/doc/SRC.css
    branches/soc-2007-hcube/extern/samplerate/doc/SRC.png
    branches/soc-2007-hcube/extern/samplerate/doc/api.html
    branches/soc-2007-hcube/extern/samplerate/doc/download.html
    branches/soc-2007-hcube/extern/samplerate/doc/faq.html
    branches/soc-2007-hcube/extern/samplerate/doc/history.html
    branches/soc-2007-hcube/extern/samplerate/doc/index.html
    branches/soc-2007-hcube/extern/samplerate/doc/license.html
    branches/soc-2007-hcube/extern/samplerate/doc/lists.html
    branches/soc-2007-hcube/extern/samplerate/doc/quality.html
    branches/soc-2007-hcube/extern/samplerate/doc/win32.html
    branches/soc-2007-hcube/extern/samplerate/examples/
    branches/soc-2007-hcube/extern/samplerate/examples/Makefile.am
    branches/soc-2007-hcube/extern/samplerate/examples/Makefile.in
    branches/soc-2007-hcube/extern/samplerate/examples/audio_out.c
    branches/soc-2007-hcube/extern/samplerate/examples/audio_out.h
    branches/soc-2007-hcube/extern/samplerate/examples/sndfile-resample.c
    branches/soc-2007-hcube/extern/samplerate/examples/varispeed-play.c
    branches/soc-2007-hcube/extern/samplerate/install-sh
    branches/soc-2007-hcube/extern/samplerate/libsamplerate.spec.in
    branches/soc-2007-hcube/extern/samplerate/ltmain.sh
    branches/soc-2007-hcube/extern/samplerate/missing
    branches/soc-2007-hcube/extern/samplerate/mkinstalldirs
    branches/soc-2007-hcube/extern/samplerate/reconfigure.mk
    branches/soc-2007-hcube/extern/samplerate/samplerate.pc.in
    branches/soc-2007-hcube/extern/samplerate/src/
    branches/soc-2007-hcube/extern/samplerate/src/Makefile.am
    branches/soc-2007-hcube/extern/samplerate/src/Makefile.in
    branches/soc-2007-hcube/extern/samplerate/src/Version_script.in
    branches/soc-2007-hcube/extern/samplerate/src/check_asm.sh
    branches/soc-2007-hcube/extern/samplerate/src/common.h
    branches/soc-2007-hcube/extern/samplerate/src/config.h.in
    branches/soc-2007-hcube/extern/samplerate/src/fastest_coeffs.h
    branches/soc-2007-hcube/extern/samplerate/src/float_cast.h
    branches/soc-2007-hcube/extern/samplerate/src/high_qual_coeffs.h
    branches/soc-2007-hcube/extern/samplerate/src/mid_qual_coeffs.h
    branches/soc-2007-hcube/extern/samplerate/src/samplerate.c
    branches/soc-2007-hcube/extern/samplerate/src/samplerate.h
    branches/soc-2007-hcube/extern/samplerate/src/src_linear.c
    branches/soc-2007-hcube/extern/samplerate/src/src_sinc.c
    branches/soc-2007-hcube/extern/samplerate/src/src_zoh.c
    branches/soc-2007-hcube/extern/samplerate/tests/
    branches/soc-2007-hcube/extern/samplerate/tests/Makefile.am
    branches/soc-2007-hcube/extern/samplerate/tests/Makefile.in
    branches/soc-2007-hcube/extern/samplerate/tests/benchmark.c
    branches/soc-2007-hcube/extern/samplerate/tests/calc_snr.c
    branches/soc-2007-hcube/extern/samplerate/tests/calc_snr.h
    branches/soc-2007-hcube/extern/samplerate/tests/callback_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/float_short_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/misc_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/multi_channel_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/reset_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/simple_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/snr_bw_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/src-evaluate.c
    branches/soc-2007-hcube/extern/samplerate/tests/termination_test.c
    branches/soc-2007-hcube/extern/samplerate/tests/util.c
    branches/soc-2007-hcube/extern/samplerate/tests/util.h
    branches/soc-2007-hcube/extern/tinySND/
    branches/soc-2007-hcube/extern/tinySND/SConscript
    branches/soc-2007-hcube/extern/tinySND/core/
    branches/soc-2007-hcube/extern/tinySND/core/SND_AiffReader.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_AiffReader.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataCache.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataCache.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataConsumer.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataConsumer.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataMultiplexer.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataMultiplexer.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_DataProvider.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_Defines.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_Device.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_FXDuplicator.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_FXDuplicator.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_FXMixer.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_FXMixer.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_FXSample.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_FXSample.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_NullDevice.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_NullDevice.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_SoundInterface.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_SoundInterface.h
    branches/soc-2007-hcube/extern/tinySND/core/SND_WavReader.cpp
    branches/soc-2007-hcube/extern/tinySND/core/SND_WavReader.h
    branches/soc-2007-hcube/extern/tinySND/ffmpeg/
    branches/soc-2007-hcube/extern/tinySND/ffmpeg/ffmpegReader.cpp
    branches/soc-2007-hcube/extern/tinySND/ffmpeg/ffmpegReader.h
    branches/soc-2007-hcube/extern/tinySND/jack/
    branches/soc-2007-hcube/extern/tinySND/jack/jackDevice.cpp
    branches/soc-2007-hcube/extern/tinySND/jack/jackDevice.h
    branches/soc-2007-hcube/extern/tinySND/ladspa/
    branches/soc-2007-hcube/extern/tinySND/mad/
    branches/soc-2007-hcube/extern/tinySND/mad/madReader.cpp
    branches/soc-2007-hcube/extern/tinySND/mad/madReader.h
    branches/soc-2007-hcube/extern/tinySND/portaudio/
    branches/soc-2007-hcube/extern/tinySND/portaudio/portaudioDevice.cpp
    branches/soc-2007-hcube/extern/tinySND/portaudio/portaudioDevice.h
    branches/soc-2007-hcube/extern/tinySND/samplerate/
    branches/soc-2007-hcube/extern/tinySND/samplerate/SND_FXSRC.cpp
    branches/soc-2007-hcube/extern/tinySND/samplerate/SND_FXSRC.h
    branches/soc-2007-hcube/extern/tinySND/sdl/
    branches/soc-2007-hcube/extern/tinySND/sdl/sdlDevice.cpp
    branches/soc-2007-hcube/extern/tinySND/sdl/sdlDevice.h
    branches/soc-2007-hcube/extern/tinySND/sndfile/
    branches/soc-2007-hcube/extern/tinySND/sndfile/sndfileReader.cpp
    branches/soc-2007-hcube/extern/tinySND/sndfile/sndfileReader.h
    branches/soc-2007-hcube/extern/tinySND/sndfile/sndfileWriter.cpp
    branches/soc-2007-hcube/extern/tinySND/sndfile/sndfileWriter.h
    branches/soc-2007-hcube/extern/tinySND/vorbis/
    branches/soc-2007-hcube/extern/tinySND/vorbis/vorbisReader.cpp
    branches/soc-2007-hcube/extern/tinySND/vorbis/vorbisReader.h
    branches/soc-2007-hcube/extern/tinySND/wavpack/
    branches/soc-2007-hcube/extern/tinySND/wavpack/wavpackReader.cpp
    branches/soc-2007-hcube/extern/tinySND/wavpack/wavpackReader.h
    branches/soc-2007-hcube/intern/soundsystem/
    branches/soc-2007-hcube/intern/soundsystem/SConscript
    branches/soc-2007-hcube/intern/soundsystem/SND_C-api.h
    branches/soc-2007-hcube/intern/soundsystem/SND_device.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_factory.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_file.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_general.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_internal.h
    branches/soc-2007-hcube/intern/soundsystem/SND_mixbuffer.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_sound.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_soundattrs.cpp
    branches/soc-2007-hcube/intern/soundsystem/SND_soundvisual.cpp
    branches/soc-2007-hcube/intern/soundsystem/readme

Removed Paths:
-------------
    branches/soc-2007-hcube/intern/tinySND/

Modified: branches/soc-2007-hcube/config/darwin-config.py
===================================================================
--- branches/soc-2007-hcube/config/darwin-config.py	2008-03-11 09:00:09 UTC (rev 14057)
+++ branches/soc-2007-hcube/config/darwin-config.py	2008-03-11 09:41:20 UTC (rev 14058)
@@ -33,6 +33,19 @@
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/samplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
+
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
 #tinySND: portaudioDevice backend
 WITH_BF_PORTAUDIO = 'false'
 BF_PORTAUDIO = '/usr'
@@ -46,7 +59,7 @@
 BF_JACK_LIB = 'jack'
 
 #tinySND: sndfileReader, sndfileWriter
-WITH_BF_SNDFILE = 'true'
+WITH_BF_SNDFILE = 'false'
 BF_SNDFILE = '/usr/local'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
@@ -58,16 +71,11 @@
 BF_MAD_LIB = 'mad'
 
 #tinySND: ogg-vorbis support
-WITH_BF_VORBIS = 'true'
+WITH_BF_VORBIS = 'false'
 BF_VORBIS = '/usr/local'
 BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
 BF_VORBIS_LIB = 'vorbis vorbisfile ogg'
 
-#tinySND deps: samplerate
-BF_SAMPLERATE = '/usr/local'
-BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include'
-BF_SAMPLERATE_LIB = 'samplerate'
-
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '${LCGDIR}/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'

Modified: branches/soc-2007-hcube/config/linux2-config.py
===================================================================
--- branches/soc-2007-hcube/config/linux2-config.py	2008-03-11 09:00:09 UTC (rev 14057)
+++ branches/soc-2007-hcube/config/linux2-config.py	2008-03-11 09:41:20 UTC (rev 14058)
@@ -16,41 +16,49 @@
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/samplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
+
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
 #tinySND: portaudioDevice backend
-WITH_BF_PORTAUDIO = 'true'
+WITH_BF_PORTAUDIO = 'false'
 BF_PORTAUDIO = '/usr'
 BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
 BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
 
 #tinySND: jackDevice backend
-WITH_BF_JACK = 'true'
+WITH_BF_JACK = 'false'
 BF_JACK = '/usr'
 BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 
 #tinySND: sndfileReader, sndfileWriter
-WITH_BF_SNDFILE = 'true'
+WITH_BF_SNDFILE = 'false'
 BF_SNDFILE = '/usr'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
 
 #tinySND: mp3 support with libmad
-WITH_BF_MAD = 'true'
+WITH_BF_MAD = 'false'
 BF_MAD = '/usr'
 BF_MAD_INC = '${BF_MAD}/include'
 BF_MAD_LIB = 'mad'
 
 #tinySND: ogg-vorbis support
-WITH_BF_VORBIS = 'true'
+WITH_BF_VORBIS = 'false'
 BF_VORBIS = '/usr'
 BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
 BF_VORBIS_LIB = 'vorbis vorbisfile'
 
-#tinySND deps: samplerate
-BF_SAMPLERATE = '/usr'
-BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include'
-BF_SAMPLERATE_LIB = 'samplerate'
-
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'

Modified: branches/soc-2007-hcube/config/linuxcross-config.py
===================================================================
--- branches/soc-2007-hcube/config/linuxcross-config.py	2008-03-11 09:00:09 UTC (rev 14057)
+++ branches/soc-2007-hcube/config/linuxcross-config.py	2008-03-11 09:41:20 UTC (rev 14058)
@@ -19,41 +19,49 @@
 BF_SDL_LIB = 'SDL'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/samplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
+
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
 #tinySND: portaudioDevice backend
-WITH_BF_PORTAUDIO = 'true'
+WITH_BF_PORTAUDIO = 'false'
 BF_PORTAUDIO = '/usr'
 BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
 BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
 
 #tinySND: jackDevice backend
-WITH_BF_JACK = 'true'
+WITH_BF_JACK = 'false'
 BF_JACK = '/usr'
 BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 
 #tinySND: sndfileReader, sndfileWriter
-WITH_BF_SNDFILE = 'true'
+WITH_BF_SNDFILE = 'false'
 BF_SNDFILE = '/usr'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
 
 #tinySND: mp3 support with libmad
-WITH_BF_MAD = 'true'
+WITH_BF_MAD = 'false'
 BF_MAD = '/usr'
 BF_MAD_INC = '${BF_MAD}/include'
 BF_MAD_LIB = 'mad'
 
 #tinySND: ogg-vorbis support
-WITH_BF_VORBIS = 'true'
+WITH_BF_VORBIS = 'false'
 BF_VORBIS = '/usr'
 BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
 BF_VORBIS_LIB = 'vorbis vorbisfile'
 
-#tinySND deps: samplerate
-BF_SAMPLERATE = '/usr'
-BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include'
-BF_SAMPLERATE_LIB = 'samplerate'
-
 BF_PTHREADS = LIBDIR + '/pthreads'
 BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'

Modified: branches/soc-2007-hcube/config/openbsd3-config.py
===================================================================
--- branches/soc-2007-hcube/config/openbsd3-config.py	2008-03-11 09:00:09 UTC (rev 14057)
+++ branches/soc-2007-hcube/config/openbsd3-config.py	2008-03-11 09:41:20 UTC (rev 14058)
@@ -14,41 +14,49 @@
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/samplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
+
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
 #tinySND: portaudioDevice backend
-WITH_BF_PORTAUDIO = 'true'
+WITH_BF_PORTAUDIO = 'false'
 BF_PORTAUDIO = '/usr'
 BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
 BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
 
 #tinySND: jackDevice backend
-WITH_BF_JACK = 'true'
+WITH_BF_JACK = 'false'
 BF_JACK = '/usr'
 BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 
 #tinySND: sndfileReader, sndfileWriter
-WITH_BF_SNDFILE = 'true'
+WITH_BF_SNDFILE = 'false'
 BF_SNDFILE = '/usr'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
 
 #tinySND: mp3 support with libmad
-WITH_BF_MAD = 'true'
+WITH_BF_MAD = 'false'
 BF_MAD = '/usr'
 BF_MAD_INC = '${BF_MAD}/include'
 BF_MAD_LIB = 'mad'
 
 #tinySND: ogg-vorbis support
-WITH_BF_VORBIS = 'true'
+WITH_BF_VORBIS = 'false'
 BF_VORBIS = '/usr'
 BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
 BF_VORBIS_LIB = 'vorbis vorbisfile'
 
-#tinySND deps: samplerate
-BF_SAMPLERATE = '/usr'
-BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include'
-BF_SAMPLERATE_LIB = 'samplerate'
-
 WITH_BF_OPENEXR = 'false'
 BF_OPENEXR = '/usr/local'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'

Modified: branches/soc-2007-hcube/config/sunos5-config.py
===================================================================
--- branches/soc-2007-hcube/config/sunos5-config.py	2008-03-11 09:00:09 UTC (rev 14057)
+++ branches/soc-2007-hcube/config/sunos5-config.py	2008-03-11 09:41:20 UTC (rev 14058)
@@ -14,41 +14,49 @@
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/samplerate'
+BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include/samplerate'
+BF_SAMPLERATE_LIB = ''
+
+#tinySND, placed in extern
+WITH_BF_TINYSND = 'true'
+BF_TINYSND = '#extern/tinySND'
+BF_TINYSND_INC = ''
+for s in ['core', 'ffmpeg', 'jack', 'ladspa', 'mad', 'portaudio', 'samplerate', 'sdl', 'sndfile', 'vorbis', 'wavpack']:
+    BF_TINYSND_INC += "${BF_TINYSND}/%s " % s
+
 #tinySND: portaudioDevice backend
-WITH_BF_PORTAUDIO = 'true'
+WITH_BF_PORTAUDIO = 'false'
 BF_PORTAUDIO = '/usr'
 BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
 BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
 
 #tinySND: jackDevice backend
-WITH_BF_JACK = 'true'
+WITH_BF_JACK = 'false'
 BF_JACK = '/usr'
 BF_JACK_INC = '${BF_JACK}/include/jack'
 BF_JACK_LIB = 'jack'
 
 #tinySND: sndfileReader, sndfileWriter
-WITH_BF_SNDFILE = 'true'
+WITH_BF_SNDFILE = 'false'
 BF_SNDFILE = '/usr'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
 
 #tinySND: mp3 support with libmad
-WITH_BF_MAD = 'true'
+WITH_BF_MAD = 'false'
 BF_MAD = '/usr'
 BF_MAD_INC = '${BF_MAD}/include'
 BF_MAD_LIB = 'mad'
 
 #tinySND: ogg-vorbis support
-WITH_BF_VORBIS = 'true'
+WITH_BF_VORBIS = 'false'
 BF_VORBIS = '/usr'
 BF_VORBIS_INC = '${BF_VORBIS}/include/vorbis'
 BF_VORBIS_LIB = 'vorbis vorbisfile'
 
-#tinySND deps: samplerate
-BF_SAMPLERATE = '/usr'
-BF_SAMPLERATE_INC = '${BF_SAMPLERATE}/include'
-BF_SAMPLERATE_LIB = 'samplerate'
-
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr/local'
 BF_OPENEXR_INC = ['${BF_OPENEXR}/include', '${BF_OPENEXR}/include/OpenEXR' ]

Modified: branches/soc-2007-hcube/config/win32-mingw-config.py
===================================================================
--- branches/soc-2007-hcube/config/win32-mingw-config.py	2008-03-11 09:00:09 UTC (rev 14057)
+++ branches/soc-2007-hcube/config/win32-mingw-config.py	2008-03-11 09:41:20 UTC (rev 14058)
@@ -22,41 +22,49 @@
 BF_SDL_LIB = 'SDL'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
+#samplerate, placed in extern
+WITH_BF_SAMPLERATE = 'true'
+BF_SAMPLERATE = '#extern/samplerate'

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list