[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22325] branches/soundsystem: Sound Branch :
Jörg Müller
nexyon at gmail.com
Sun Aug 9 20:14:08 CEST 2009
Revision: 22325
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22325
Author: nexyon
Date: 2009-08-09 20:14:07 +0200 (Sun, 09 Aug 2009)
Log Message:
-----------
Sound Branch:
* Last commit before merge to 2.5
* Merge until revision 22324 of 2.5 branch
* Fixes for some compiler warnings
* Updated some build system files
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22324
Modified Paths:
--------------
branches/soundsystem/CMake/macros.cmake
branches/soundsystem/CMakeLists.txt
branches/soundsystem/config/darwin-config.py
branches/soundsystem/config/irix6-config.py
branches/soundsystem/config/linux2-config.py
branches/soundsystem/config/linuxcross-config.py
branches/soundsystem/config/win32-mingw-config.py
branches/soundsystem/config/win32-vc-config.py
branches/soundsystem/config/win64-vc-config.py
branches/soundsystem/extern/ffmpeg/SConscript
branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soundsystem/intern/audaspace/intern/AUD_C-API.cpp
branches/soundsystem/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soundsystem/intern/smoke/CMakeLists.txt
branches/soundsystem/intern/smoke/SConscript
branches/soundsystem/intern/smoke/extern/smoke_API.h
branches/soundsystem/intern/smoke/intern/FFT_NOISE.h
branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp
branches/soundsystem/intern/smoke/intern/FLUID_3D.h
branches/soundsystem/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soundsystem/intern/smoke/intern/WTURBULENCE.cpp
branches/soundsystem/intern/smoke/intern/WTURBULENCE.h
branches/soundsystem/intern/smoke/intern/smoke_API.cpp
branches/soundsystem/release/io/engine_render_pov.py
branches/soundsystem/release/scripts/export_map.py
branches/soundsystem/release/scripts/md2_export.py
branches/soundsystem/release/ui/buttons_data_camera.py
branches/soundsystem/release/ui/buttons_data_mesh.py
branches/soundsystem/release/ui/buttons_data_metaball.py
branches/soundsystem/release/ui/buttons_data_modifier.py
branches/soundsystem/release/ui/buttons_game.py
branches/soundsystem/release/ui/buttons_material.py
branches/soundsystem/release/ui/buttons_object_constraint.py
branches/soundsystem/release/ui/buttons_physics_cloth.py
branches/soundsystem/release/ui/buttons_physics_fluid.py
branches/soundsystem/release/ui/buttons_physics_softbody.py
branches/soundsystem/release/ui/buttons_texture.py
branches/soundsystem/release/ui/space_image.py
branches/soundsystem/release/ui/space_info.py
branches/soundsystem/release/ui/space_text.py
branches/soundsystem/release/ui/space_view3d.py
branches/soundsystem/release/ui/space_view3d_toolbar.py
branches/soundsystem/source/blender/blenfont/BLF_api.h
branches/soundsystem/source/blender/blenfont/intern/blf.c
branches/soundsystem/source/blender/blenfont/intern/blf_font.c
branches/soundsystem/source/blender/blenfont/intern/blf_glyph.c
branches/soundsystem/source/blender/blenfont/intern/blf_internal_types.h
branches/soundsystem/source/blender/blenkernel/BKE_library.h
branches/soundsystem/source/blender/blenkernel/BKE_sculpt.h
branches/soundsystem/source/blender/blenkernel/intern/library.c
branches/soundsystem/source/blender/blenkernel/intern/scene.c
branches/soundsystem/source/blender/blenkernel/intern/smoke.c
branches/soundsystem/source/blender/blenkernel/intern/sound.c
branches/soundsystem/source/blender/blenloader/intern/readfile.c
branches/soundsystem/source/blender/editors/interface/interface_style.c
branches/soundsystem/source/blender/editors/interface/interface_templates.c
branches/soundsystem/source/blender/editors/mesh/editmesh_mods.c
branches/soundsystem/source/blender/editors/sculpt_paint/sculpt.c
branches/soundsystem/source/blender/editors/space_buttons/buttons_context.c
branches/soundsystem/source/blender/editors/space_view3d/drawobject.c
branches/soundsystem/source/blender/makesdna/DNA_brush_types.h
branches/soundsystem/source/blender/makesdna/DNA_material_types.h
branches/soundsystem/source/blender/makesdna/DNA_mesh_types.h
branches/soundsystem/source/blender/makesdna/DNA_smoke_types.h
branches/soundsystem/source/blender/makesdna/DNA_texture_types.h
branches/soundsystem/source/blender/makesrna/SConscript
branches/soundsystem/source/blender/makesrna/intern/CMakeLists.txt
branches/soundsystem/source/blender/makesrna/intern/SConscript
branches/soundsystem/source/blender/makesrna/intern/rna_brush.c
branches/soundsystem/source/blender/makesrna/intern/rna_define.c
branches/soundsystem/source/blender/makesrna/intern/rna_internal.h
branches/soundsystem/source/blender/makesrna/intern/rna_material.c
branches/soundsystem/source/blender/makesrna/intern/rna_mesh.c
branches/soundsystem/source/blender/makesrna/intern/rna_meta.c
branches/soundsystem/source/blender/makesrna/intern/rna_modifier.c
branches/soundsystem/source/blender/makesrna/intern/rna_smoke.c
branches/soundsystem/source/blender/makesrna/intern/rna_texture.c
branches/soundsystem/source/blender/python/intern/bpy_interface.c
branches/soundsystem/source/blender/python/intern/bpy_operator_wrap.c
branches/soundsystem/source/blender/python/intern/bpy_rna.c
branches/soundsystem/source/blender/python/intern/bpy_util.h
branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soundsystem/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soundsystem/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soundsystem/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_Scene.cpp
branches/soundsystem/tools/Blender.py
branches/soundsystem/tools/btools.py
Added Paths:
-----------
branches/soundsystem/release/ui/buttons_physics_smoke.py
Modified: branches/soundsystem/CMake/macros.cmake
===================================================================
--- branches/soundsystem/CMake/macros.cmake 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/CMake/macros.cmake 2009-08-09 18:14:07 UTC (rev 22325)
@@ -50,6 +50,9 @@
IF(WITH_OPENAL)
LINK_DIRECTORIES(${OPENAL_LIBPATH})
ENDIF(WITH_OPENAL)
+ IF(WITH_FFTW3)
+ LINK_DIRECTORIES(${FFTW3_LIBPATH})
+ ENDIF(WITH_FFTW3)
IF(WIN32)
LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -61,7 +64,7 @@
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
#TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
Modified: branches/soundsystem/CMakeLists.txt
===================================================================
--- branches/soundsystem/CMakeLists.txt 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/CMakeLists.txt 2009-08-09 18:14:07 UTC (rev 22325)
@@ -68,6 +68,7 @@
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
+OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -156,6 +157,13 @@
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+
+ IF(WITH_FFTW3)
+ SET(FFTW3 /usr)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB fftw3)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ ENDIF(WITH_FFTW3)
SET(LIBSAMPLERATE /usr)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
@@ -212,7 +220,7 @@
ELSE(CMAKE_CL_64)
#SET(WITH_OPENAL ON)
SET(OPENAL ${LIBDIR}/openal)
- SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
+ SET(OPENAL_INC ${OPENAL}/include)
SET(OPENAL_LIB wrap_oal)
SET(OPENAL_LIBPATH ${OPENAL}/lib)
ENDIF(CMAKE_CL_64)
@@ -239,6 +247,13 @@
SET(ICONV_LIB iconv)
SET(ICONV_LIBPATH ${ICONV}/lib)
+ IF(WITH_FFTW3)
+ SET(FFTW3 ${LIBDIR}/fftw3)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ ENDIF(WITH_FFTW3)
+
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC ${GETTEXT}/include)
IF(CMAKE_CL_64)
@@ -287,10 +302,6 @@
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)
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -377,6 +388,13 @@
SET(GETTEXT_INC "${GETTEXT}/include")
SET(GETTEXT_LIB intl iconv)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+
+ IF(WITH_FFTW3)
+ SET(FFTW3 ${LIBDIR}/fftw3)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ ENDIF(WITH_FFTW3)
SET(PNG_LIBRARIES png)
SET(JPEG_LIBRARY jpeg)
Modified: branches/soundsystem/config/darwin-config.py
===================================================================
--- branches/soundsystem/config/darwin-config.py 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/config/darwin-config.py 2009-08-09 18:14:07 UTC (rev 22325)
@@ -32,22 +32,28 @@
if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-elif MAC_CUR_VER=='10.4':
+else:
MAC_MIN_VERS = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
-else:
- MAC_MIN_VERS = '10.5'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = "#extern/ffmpeg"
-BF_FFMPEG_INC = '${BF_FFMPEG}'
-if USE_SDK==True:
- BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
-#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+FFMPEG_PRECOMPILED = False
+if FFMPEG_PRECOMPILED:
+ # use precompiled ffmpeg in /lib
+ BF_FFMPEG = LIBDIR + '/ffmpeg'
+ BF_FFMPEG_INC = "#extern/ffmpeg"
+ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+ BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore'
+else:
+ # use ffmpeg in extern
+ BF_FFMPEG = "#extern/ffmpeg"
+ BF_FFMPEG_INC = '${BF_FFMPEG}'
+ if USE_SDK==True:
+ BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
+ BF_XVIDCORE_CONFIG = '--disable-assembly' # currently causes errors, even with yasm installed
+ BF_X264_CONFIG = '--disable-pthread'
if BF_PYTHON_VERSION=='3.1':
# python 3.1 uses precompiled libraries in bf svn /lib by default
@@ -80,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'
@@ -106,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'
@@ -163,6 +164,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
@@ -194,6 +201,11 @@
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/soundsystem/config/irix6-config.py
===================================================================
--- branches/soundsystem/config/irix6-config.py 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/config/irix6-config.py 2009-08-09 18:14:07 UTC (rev 22325)
@@ -24,7 +24,7 @@
WITH_BF_STATICCXX = 'false'
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-BF_LIBSAMPLERATE = LCGDIR+'/SRC'
+BF_LIBSAMPLERATE = LCGDIR+'/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
BF_LIBSAMPLERATE_LIB = 'samplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
Modified: branches/soundsystem/config/linux2-config.py
===================================================================
--- branches/soundsystem/config/linux2-config.py 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/config/linux2-config.py 2009-08-09 18:14:07 UTC (rev 22325)
@@ -135,6 +135,12 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/usr'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
WITH_BF_REDCODE = False
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
Modified: branches/soundsystem/config/linuxcross-config.py
===================================================================
--- branches/soundsystem/config/linuxcross-config.py 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/config/linuxcross-config.py 2009-08-09 18:14:07 UTC (rev 22325)
@@ -22,7 +22,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'
Modified: branches/soundsystem/config/win32-mingw-config.py
===================================================================
--- branches/soundsystem/config/win32-mingw-config.py 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/config/win32-mingw-config.py 2009-08-09 18:14:07 UTC (rev 22325)
@@ -16,13 +16,10 @@
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'dxguid openal_static'
+BF_OPENAL_LIB = 'wrap_oal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
WITH_BF_FFMPEG = True
BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
Modified: branches/soundsystem/config/win32-vc-config.py
===================================================================
--- branches/soundsystem/config/win32-vc-config.py 2009-08-09 17:21:40 UTC (rev 22324)
+++ branches/soundsystem/config/win32-vc-config.py 2009-08-09 18:14:07 UTC (rev 22325)
@@ -16,13 +16,10 @@
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list