[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11865] branches/soc-2007-hcube: added tinySND support into scons build system.
Csaba Hruska
csaba.hruska at gmail.com
Tue Aug 28 12:40:05 CEST 2007
Revision: 11865
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11865
Author: hcube
Date: 2007-08-28 12:40:05 +0200 (Tue, 28 Aug 2007)
Log Message:
-----------
added tinySND support into scons build system.
Modified Paths:
--------------
branches/soc-2007-hcube/SConstruct
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/intern/tinySND/SConscript
branches/soc-2007-hcube/intern/tinySND/jack/jackDevice.h
branches/soc-2007-hcube/intern/tinySND/portaudio/portaudioDevice.h
branches/soc-2007-hcube/intern/tinySND/vorbis/vorbisReader.h
branches/soc-2007-hcube/tools/Blender.py
branches/soc-2007-hcube/tools/btools.py
Modified: branches/soc-2007-hcube/SConstruct
===================================================================
--- branches/soc-2007-hcube/SConstruct 2007-08-28 10:07:08 UTC (rev 11864)
+++ branches/soc-2007-hcube/SConstruct 2007-08-28 10:40:05 UTC (rev 11865)
@@ -183,38 +183,6 @@
printdebug = B.arguments.get('BF_LISTDEBUG', 0)
-# see if this linux distro has libalut
-
-if env['OURPLATFORM'] == 'linux2' :
- if env['WITH_BF_OPENAL']:
- mylib_test_source_file = """
- #include "AL/alut.h"
- int main(int argc, char **argv)
- {
- alutGetMajorVersion();
- return 0;
- }
- """
-
- def CheckFreeAlut(context,env):
- context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC )
- env['LIBS'] = 'alut'
- result = context.TryLink(mylib_test_source_file, '.c')
- context.Result(result)
- return result
-
- env2 = env.Copy( LIBPATH = env['BF_OPENAL'] )
- conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, '.sconf_temp', '/dev/null' )
- if conf.CheckFreeAlut( env2 ):
- env['BF_OPENAL_LIB'] += ' alut'
- del env2
- for root, dirs, files in os.walk('.sconf_temp', topdown=False):
- for name in files:
- os.remove(os.path.join(root, name))
- for name in dirs:
- os.rmdir(os.path.join(root, name))
- os.rmdir(root)
-
if len(B.quickdebug) > 0 and printdebug != 0:
print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
for l in B.quickdebug:
Modified: branches/soc-2007-hcube/config/darwin-config.py
===================================================================
--- branches/soc-2007-hcube/config/darwin-config.py 2007-08-28 10:07:08 UTC (rev 11864)
+++ branches/soc-2007-hcube/config/darwin-config.py 2007-08-28 10:40:05 UTC (rev 11865)
@@ -27,26 +27,47 @@
BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python'
-WITH_BF_OPENAL = 'true'
-#different lib must be used following version of gcc
-# for gcc 3.3
-#BF_OPENAL = LIBDIR + '/openal'
-# for gcc 3.4
-BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
-
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
BF_SDL_LIBPATH = '${BF_SDL}/lib'
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'true'
+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'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'true'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'true'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'true'
+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 = '${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 2007-08-28 10:07:08 UTC (rev 11864)
+++ branches/soc-2007-hcube/config/linux2-config.py 2007-08-28 10:40:05 UTC (rev 11865)
@@ -11,27 +11,46 @@
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-WITH_BF_OPENAL = 'true'
-BF_OPENAL = '/usr'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# BF_OPENAL_LIB = 'openal alut'
-
WITH_BF_SDL = 'true'
BF_SDL = '/usr' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL portaudio portaudiocpp sndfile samplerate' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-#WITH_BF_TINYSND = 'true'
-#BF_TINYSND = '' #$(shell sdl-config --prefix)
-#BF_TINYSND_INC = '' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-#BF_TINYSND_LIB = 'SDL portaudio portaudiocpp sndfile'
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'true'
+BF_PORTAUDIO = '/usr'
+BF_PORTAUDIO_INC = '${BF_PORTAUDIO}/include ${BF_PORTAUDIO}/include/portaudiocpp'
+BF_PORTAUDIO_LIB = 'portaudio portaudiocpp'
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#tinySND: jackDevice backend
+WITH_BF_JACK = 'true'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'true'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'true'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'true'
+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 2007-08-28 10:07:08 UTC (rev 11864)
+++ branches/soc-2007-hcube/config/linuxcross-config.py 2007-08-28 10:40:05 UTC (rev 11865)
@@ -13,26 +13,52 @@
BF_PYTHON_LIB = 'python25'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-WITH_BF_OPENAL = 'true'
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal_static'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include'
BF_SDL_LIB = 'SDL'
BF_SDL_LIBPATH = '${BF_SDL}/lib'
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'true'
+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'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'true'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'true'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'true'
+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'
BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
-
WITH_BF_OPENEXR = 'true'
BF_OPENEXR = LIBDIR + '/gcc/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
Modified: branches/soc-2007-hcube/config/openbsd3-config.py
===================================================================
--- branches/soc-2007-hcube/config/openbsd3-config.py 2007-08-28 10:07:08 UTC (rev 11864)
+++ branches/soc-2007-hcube/config/openbsd3-config.py 2007-08-28 10:40:05 UTC (rev 11865)
@@ -8,21 +8,47 @@
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
-WITH_BF_OPENAL = 'false'
-#BF_OPENAL = LIBDIR + '/openal'
-#BF_OPENAL_INC = '${BF_OPENAL}/include'
-#BF_OPENAL_LIB = 'openal'
-#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
WITH_BF_SDL = 'true'
BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
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
BF_SDL_LIBPATH = '${BF_SDL}/lib'
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
+#tinySND: portaudioDevice backend
+WITH_BF_PORTAUDIO = 'true'
+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'
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+
+#tinySND: sndfileReader, sndfileWriter
+WITH_BF_SNDFILE = 'true'
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+
+#tinySND: mp3 support with libmad
+WITH_BF_MAD = 'true'
+BF_MAD = '/usr'
+BF_MAD_INC = '${BF_MAD}/include'
+BF_MAD_LIB = 'mad'
+
+#tinySND: ogg-vorbis support
+WITH_BF_VORBIS = 'true'
+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 2007-08-28 10:07:08 UTC (rev 11864)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list