[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22326] branches/blender2.5/blender: 2.5: Sound branch merge!

Jörg Müller nexyon at gmail.com
Sun Aug 9 23:16:39 CEST 2009 

Revision: 22326
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22326
Author:   nexyon
Date:     2009-08-09 23:16:39 +0200 (Sun, 09 Aug 2009)

Log Message:
-----------
2.5: Sound branch merge!

See mailing list for additional information.

Modified Paths:
--------------
    branches/blender2.5/blender/CMake/macros.cmake
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/config/darwin-config.py
    branches/blender2.5/blender/config/irix6-config.py
    branches/blender2.5/blender/config/linux2-config.py
    branches/blender2.5/blender/config/linuxcross-config.py
    branches/blender2.5/blender/config/openbsd3-config.py
    branches/blender2.5/blender/config/sunos5-config.py
    branches/blender2.5/blender/config/win32-mingw-config.py
    branches/blender2.5/blender/config/win32-vc-config.py
    branches/blender2.5/blender/config/win64-vc-config.py
    branches/blender2.5/blender/intern/CMakeLists.txt
    branches/blender2.5/blender/intern/Makefile
    branches/blender2.5/blender/intern/SConscript
    branches/blender2.5/blender/source/blender/blenkernel/BKE_packedFile.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_sound.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_writeavi.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_writeframeserver.h
    branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenkernel/SConscript
    branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/library.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/writeavi.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
    branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
    branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
    branches/blender2.5/blender/source/blender/editors/animation/anim_ops.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
    branches/blender2.5/blender/source/blender/editors/screen/screendump.c
    branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
    branches/blender2.5/blender/source/blender/editors/space_logic/logic_window.c
    branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
    branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
    branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
    branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_select.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_actuator_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_sound_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sound.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/blender2.5/blender/source/creator/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/blender2.5/blender/source/gameengine/Converter/SConscript
    branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_Scene.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_Scene.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
    branches/blender2.5/blender/source/nan_definitions.mk
    branches/blender2.5/blender/tools/Blender.py
    branches/blender2.5/blender/tools/btools.py

Added Paths:
-----------
    branches/blender2.5/blender/intern/audaspace/
    branches/blender2.5/blender/intern/audaspace/AUD_C-API.h
    branches/blender2.5/blender/intern/audaspace/CMakeLists.txt
    branches/blender2.5/blender/intern/audaspace/COPYING
    branches/blender2.5/blender/intern/audaspace/COPYING.LESSER
    branches/blender2.5/blender/intern/audaspace/FX/
    branches/blender2.5/blender/intern/audaspace/FX/AUD_DelayFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_DelayFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_DelayReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_DelayReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_DoubleReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_EffectFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_EffectFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_EffectReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_EffectReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_FaderFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_FaderFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_FaderReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_FaderReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LimiterFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LimiterFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LimiterReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LimiterReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LoopFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LoopFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LoopReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_LoopReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_PingPongFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_PitchFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_PitchFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_PitchReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_PitchReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_ReverseFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_ReverseFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_ReverseReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_ReverseReader.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_VolumeFactory.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_VolumeFactory.h
    branches/blender2.5/blender/intern/audaspace/FX/AUD_VolumeReader.cpp
    branches/blender2.5/blender/intern/audaspace/FX/AUD_VolumeReader.h
    branches/blender2.5/blender/intern/audaspace/Makefile
    branches/blender2.5/blender/intern/audaspace/OpenAL/
    branches/blender2.5/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/blender2.5/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/blender2.5/blender/intern/audaspace/SConscript
    branches/blender2.5/blender/intern/audaspace/SDL/
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLDevice.cpp
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLDevice.h
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixer.cpp
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixer.h
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.h
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
    branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.h
    branches/blender2.5/blender/intern/audaspace/SDL/Makefile
    branches/blender2.5/blender/intern/audaspace/SRC/
    branches/blender2.5/blender/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
    branches/blender2.5/blender/intern/audaspace/SRC/AUD_SRCResampleFactory.h
    branches/blender2.5/blender/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
    branches/blender2.5/blender/intern/audaspace/SRC/AUD_SRCResampleReader.h
    branches/blender2.5/blender/intern/audaspace/ffmpeg/
    branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/blender2.5/blender/intern/audaspace/ffmpeg/Makefile
    branches/blender2.5/blender/intern/audaspace/intern/
    branches/blender2.5/blender/intern/audaspace/intern/AUD_Buffer.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_Buffer.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_BufferReader.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_C-API.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ChannelMapperReader.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterFactory.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterFunctions.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ConverterReader.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_FloatMixer.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_FloatMixer.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_I3DDevice.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_IDevice.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_IFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_IMixer.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_IReader.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_MixerFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_NULLDevice.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ReadDevice.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ReadDevice.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_Reference.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_ResampleFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SinusFactory.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SinusFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SinusReader.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SinusReader.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_SourceCaps.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_Space.h
    branches/blender2.5/blender/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/blender2.5/blender/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/blender2.5/blender/intern/audaspace/intern/Makefile

Modified: branches/blender2.5/blender/CMake/macros.cmake
===================================================================
--- branches/blender2.5/blender/CMake/macros.cmake	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/CMake/macros.cmake	2009-08-09 21:16:39 UTC (rev 22326)
@@ -43,7 +43,7 @@
     CMAKE_POLICY(SET CMP0003 NEW)
   endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
-  LINK_DIRECTORIES(${FREETYPE_LIBPATH})
+  LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
   ENDIF(WITH_INTERNATIONAL)
@@ -82,7 +82,7 @@
 
 
   TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
-  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
+  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB})
 
   # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
 

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-08-09 21:16:39 UTC (rev 22326)
@@ -165,6 +165,11 @@
 	  SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
 
+  SET(LIBSAMPLERATE /usr)
+  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+  SET(LIBSAMPLERATE_LIB samplerate)
+  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
   FIND_PACKAGE(JPEG REQUIRED)
 
   FIND_PACKAGE(PNG REQUIRED)
@@ -213,11 +218,11 @@
   IF(CMAKE_CL_64)
     SET(WITH_OPENAL OFF)
   ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-    SET(OPENAL_LIB openal_static)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	#SET(WITH_OPENAL ON)
+	SET(OPENAL ${LIBDIR}/openal)
+	SET(OPENAL_INC ${OPENAL}/include)
+	SET(OPENAL_LIB wrap_oal)
+	SET(OPENAL_LIBPATH ${OPENAL}/lib)
   ENDIF(CMAKE_CL_64)
 
   IF(CMAKE_CL_64)
@@ -286,15 +291,16 @@
   SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
+  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+  SET(LIBSAMPLERATE_LIB libsamplerate)
+  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
   IF(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
   ELSE(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   ENDIF(CMAKE_CL_64)
-  
-  IF(WITH_OPENAL)
-    SET(LLIBS ${LLIBS} dxguid)
-  ENDIF(WITH_OPENAL)
 
   SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
   SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)

Modified: branches/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/darwin-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -86,11 +86,6 @@
 BF_QUIET = '1'
 WITH_BF_OPENMP = '0'
 
-# Note : should be true, but openal simply dont work on intel
-if MAC_PROC == 'i386':
-	WITH_BF_OPENAL = False
-else:
-	WITH_BF_OPENAL = True
 #different lib must be used  following version of gcc
 # for gcc 3.3
 #BF_OPENAL = LIBDIR + '/openal'
@@ -112,7 +107,7 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
-BF_LIBSAMPLERATE = LIBDIR + '/SRC'
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
 BF_LIBSAMPLERATE_LIB = 'samplerate'
 BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
@@ -206,11 +201,6 @@
 BF_ICONV_LIB = 'iconv'
 #BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
-BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
-BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
-BF_LIBSAMPLERATE_LIB = 'samplerate'
-BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
-
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = True
 BF_OPENGL_LIB = 'GL GLU'

Modified: branches/blender2.5/blender/config/irix6-config.py
===================================================================
--- branches/blender2.5/blender/config/irix6-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/irix6-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -24,6 +24,11 @@
 WITH_BF_STATICCXX = 'false'
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = LCGDIR+'/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = 'true'
 BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)

Modified: branches/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/linux2-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -22,6 +22,11 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = '/usr'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 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)

Modified: branches/blender2.5/blender/config/linuxcross-config.py
===================================================================
--- branches/blender2.5/blender/config/linuxcross-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/linuxcross-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -22,6 +22,11 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'

Modified: branches/blender2.5/blender/config/openbsd3-config.py
===================================================================
--- branches/blender2.5/blender/config/openbsd3-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/openbsd3-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -16,6 +16,11 @@
 #BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 #BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
+BF_LIBSAMPLERATE = '/usr/local'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/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)

Modified: branches/blender2.5/blender/config/sunos5-config.py
===================================================================
--- branches/blender2.5/blender/config/sunos5-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/sunos5-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -22,6 +22,11 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = '/usr/local'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/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)
@@ -109,7 +114,7 @@
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = False  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
 BF_FFMPEG = '/usr/local'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'

Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/win32-mingw-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -18,7 +18,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = False
@@ -26,6 +26,11 @@
 BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'libsamplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'

Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py	2009-08-09 18:14:07 UTC (rev 22325)
+++ branches/blender2.5/blender/config/win32-vc-config.py	2009-08-09 21:16:39 UTC (rev 22326)
@@ -17,8 +17,8 @@
 
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_INC = '${BF_OPENAL}/include '
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 # TODO - are these useful on win32?
@@ -32,6 +32,11 @@
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'libsamplerate'

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list