[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22715] branches/volume25: svn merge -r 22628:22714 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender

Matt Ebb matt at mke3.net
Sun Aug 23 05:33:35 CEST 2009


Revision: 22715
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22715
Author:   broken
Date:     2009-08-23 05:33:33 +0200 (Sun, 23 Aug 2009)

Log Message:
-----------
svn merge -r 22628:22714 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

Modified Paths:
--------------
    branches/volume25/CMake/macros.cmake
    branches/volume25/CMakeLists.txt
    branches/volume25/config/linux2-config.py
    branches/volume25/extern/CMakeLists.txt
    branches/volume25/extern/Makefile
    branches/volume25/extern/SConscript
    branches/volume25/intern/audaspace/CMakeLists.txt
    branches/volume25/intern/audaspace/Makefile
    branches/volume25/intern/audaspace/SDL/Makefile
    branches/volume25/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/volume25/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/volume25/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/volume25/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/volume25/intern/audaspace/ffmpeg/Makefile
    branches/volume25/intern/audaspace/intern/AUD_C-API.cpp
    branches/volume25/intern/audaspace/intern/Makefile
    branches/volume25/intern/audaspace/jack/AUD_JackDevice.h
    branches/volume25/intern/audaspace/jack/Makefile
    branches/volume25/intern/audaspace/make/msvc_9_0/audaspace.vcproj
    branches/volume25/intern/ghost/intern/GHOST_System.cpp
    branches/volume25/intern/smoke/extern/smoke_API.h
    branches/volume25/intern/smoke/intern/FLUID_3D.cpp
    branches/volume25/intern/smoke/intern/FLUID_3D.h
    branches/volume25/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
    branches/volume25/intern/smoke/intern/WTURBULENCE.cpp
    branches/volume25/intern/smoke/intern/WTURBULENCE.h
    branches/volume25/intern/smoke/intern/smoke_API.cpp
    branches/volume25/intern/string/STR_String.h
    branches/volume25/projectfiles_vc9/blender/blender.sln
    branches/volume25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/volume25/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/volume25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/volume25/release/io/engine_render_pov.py
    branches/volume25/release/ui/buttons_data_armature.py
    branches/volume25/release/ui/buttons_data_bone.py
    branches/volume25/release/ui/buttons_data_camera.py
    branches/volume25/release/ui/buttons_data_curve.py
    branches/volume25/release/ui/buttons_data_empty.py
    branches/volume25/release/ui/buttons_data_lamp.py
    branches/volume25/release/ui/buttons_data_lattice.py
    branches/volume25/release/ui/buttons_data_mesh.py
    branches/volume25/release/ui/buttons_data_metaball.py
    branches/volume25/release/ui/buttons_data_modifier.py
    branches/volume25/release/ui/buttons_data_text.py
    branches/volume25/release/ui/buttons_game.py
    branches/volume25/release/ui/buttons_material.py
    branches/volume25/release/ui/buttons_object.py
    branches/volume25/release/ui/buttons_object_constraint.py
    branches/volume25/release/ui/buttons_particle.py
    branches/volume25/release/ui/buttons_physics_cloth.py
    branches/volume25/release/ui/buttons_physics_field.py
    branches/volume25/release/ui/buttons_physics_fluid.py
    branches/volume25/release/ui/buttons_physics_smoke.py
    branches/volume25/release/ui/buttons_physics_softbody.py
    branches/volume25/release/ui/buttons_scene.py
    branches/volume25/release/ui/buttons_texture.py
    branches/volume25/release/ui/buttons_world.py
    branches/volume25/release/ui/space_buttons.py
    branches/volume25/release/ui/space_console.py
    branches/volume25/release/ui/space_filebrowser.py
    branches/volume25/release/ui/space_image.py
    branches/volume25/release/ui/space_info.py
    branches/volume25/release/ui/space_logic.py
    branches/volume25/release/ui/space_node.py
    branches/volume25/release/ui/space_outliner.py
    branches/volume25/release/ui/space_sequencer.py
    branches/volume25/release/ui/space_text.py
    branches/volume25/release/ui/space_time.py
    branches/volume25/release/ui/space_userpref.py
    branches/volume25/release/ui/space_view3d.py
    branches/volume25/release/ui/space_view3d_toolbar.py
    branches/volume25/source/Makefile
    branches/volume25/source/blender/blenfont/intern/blf_font.c
    branches/volume25/source/blender/blenkernel/BKE_brush.h
    branches/volume25/source/blender/blenkernel/BKE_modifier.h
    branches/volume25/source/blender/blenkernel/BKE_multires.h
    branches/volume25/source/blender/blenkernel/BKE_node.h
    branches/volume25/source/blender/blenkernel/BKE_paint.h
    branches/volume25/source/blender/blenkernel/BKE_pointcache.h
    branches/volume25/source/blender/blenkernel/BKE_smoke.h
    branches/volume25/source/blender/blenkernel/CMakeLists.txt
    branches/volume25/source/blender/blenkernel/SConscript
    branches/volume25/source/blender/blenkernel/intern/Makefile
    branches/volume25/source/blender/blenkernel/intern/action.c
    branches/volume25/source/blender/blenkernel/intern/blender.c
    branches/volume25/source/blender/blenkernel/intern/brush.c
    branches/volume25/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/volume25/source/blender/blenkernel/intern/material.c
    branches/volume25/source/blender/blenkernel/intern/modifier.c
    branches/volume25/source/blender/blenkernel/intern/multires.c
    branches/volume25/source/blender/blenkernel/intern/paint.c
    branches/volume25/source/blender/blenkernel/intern/pointcache.c
    branches/volume25/source/blender/blenkernel/intern/scene.c
    branches/volume25/source/blender/blenkernel/intern/smoke.c
    branches/volume25/source/blender/blenkernel/intern/softbody.c
    branches/volume25/source/blender/blenkernel/intern/sound.c
    branches/volume25/source/blender/blenlib/BLI_winstuff.h
    branches/volume25/source/blender/blenloader/intern/readfile.c
    branches/volume25/source/blender/blenloader/intern/writefile.c
    branches/volume25/source/blender/editors/animation/fmodifier_ui.c
    branches/volume25/source/blender/editors/curve/curve_ops.c
    branches/volume25/source/blender/editors/include/ED_fileselect.h
    branches/volume25/source/blender/editors/include/ED_screen.h
    branches/volume25/source/blender/editors/include/ED_view3d.h
    branches/volume25/source/blender/editors/include/UI_interface.h
    branches/volume25/source/blender/editors/interface/interface.c
    branches/volume25/source/blender/editors/interface/interface_handlers.c
    branches/volume25/source/blender/editors/interface/interface_intern.h
    branches/volume25/source/blender/editors/interface/interface_layout.c
    branches/volume25/source/blender/editors/interface/interface_regions.c
    branches/volume25/source/blender/editors/interface/interface_templates.c
    branches/volume25/source/blender/editors/interface/interface_utils.c
    branches/volume25/source/blender/editors/interface/interface_widgets.c
    branches/volume25/source/blender/editors/object/object_edit.c
    branches/volume25/source/blender/editors/object/object_intern.h
    branches/volume25/source/blender/editors/object/object_modifier.c
    branches/volume25/source/blender/editors/object/object_ops.c
    branches/volume25/source/blender/editors/preview/previewrender.c
    branches/volume25/source/blender/editors/screen/area.c
    branches/volume25/source/blender/editors/screen/screen_ops.c
    branches/volume25/source/blender/editors/sculpt_paint/paint_image.c
    branches/volume25/source/blender/editors/sculpt_paint/paint_intern.h
    branches/volume25/source/blender/editors/sculpt_paint/paint_ops.c
    branches/volume25/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/volume25/source/blender/editors/sculpt_paint/sculpt.c
    branches/volume25/source/blender/editors/space_action/action_header.c
    branches/volume25/source/blender/editors/space_buttons/buttons_context.c
    branches/volume25/source/blender/editors/space_file/file_draw.c
    branches/volume25/source/blender/editors/space_file/file_panels.c
    branches/volume25/source/blender/editors/space_file/filesel.c
    branches/volume25/source/blender/editors/space_file/space_file.c
    branches/volume25/source/blender/editors/space_graph/graph_header.c
    branches/volume25/source/blender/editors/space_info/space_info.c
    branches/volume25/source/blender/editors/space_nla/nla_buttons.c
    branches/volume25/source/blender/editors/space_nla/nla_header.c
    branches/volume25/source/blender/editors/space_node/drawnode.c
    branches/volume25/source/blender/editors/space_node/node_edit.c
    branches/volume25/source/blender/editors/space_node/space_node.c
    branches/volume25/source/blender/editors/space_text/space_text.c
    branches/volume25/source/blender/editors/space_time/space_time.c
    branches/volume25/source/blender/editors/space_view3d/drawobject.c
    branches/volume25/source/blender/editors/space_view3d/space_view3d.c
    branches/volume25/source/blender/editors/space_view3d/view3d_draw.c
    branches/volume25/source/blender/editors/space_view3d/view3d_edit.c
    branches/volume25/source/blender/editors/space_view3d/view3d_header.c
    branches/volume25/source/blender/editors/space_view3d/view3d_intern.h
    branches/volume25/source/blender/editors/space_view3d/view3d_ops.c
    branches/volume25/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/volume25/source/blender/editors/space_view3d/view3d_view.c
    branches/volume25/source/blender/gpu/GPU_draw.h
    branches/volume25/source/blender/gpu/GPU_extensions.h
    branches/volume25/source/blender/gpu/intern/gpu_draw.c
    branches/volume25/source/blender/gpu/intern/gpu_extensions.c
    branches/volume25/source/blender/makesdna/DNA_brush_types.h
    branches/volume25/source/blender/makesdna/DNA_modifier_types.h
    branches/volume25/source/blender/makesdna/DNA_object_types.h
    branches/volume25/source/blender/makesdna/DNA_scene_types.h
    branches/volume25/source/blender/makesdna/DNA_smoke_types.h
    branches/volume25/source/blender/makesdna/DNA_userdef_types.h
    branches/volume25/source/blender/makesrna/RNA_access.h
    branches/volume25/source/blender/makesrna/intern/makesrna.c
    branches/volume25/source/blender/makesrna/intern/rna_brush.c
    branches/volume25/source/blender/makesrna/intern/rna_define.c
    branches/volume25/source/blender/makesrna/intern/rna_modifier.c
    branches/volume25/source/blender/makesrna/intern/rna_scene.c
    branches/volume25/source/blender/makesrna/intern/rna_smoke.c
    branches/volume25/source/blender/makesrna/intern/rna_space.c
    branches/volume25/source/blender/makesrna/intern/rna_texture.c
    branches/volume25/source/blender/makesrna/intern/rna_ui_api.c
    branches/volume25/source/blender/makesrna/intern/rna_userdef.c
    branches/volume25/source/blender/nodes/intern/TEX_util.c
    branches/volume25/source/blender/nodes/intern/TEX_util.h
    branches/volume25/source/blender/python/intern/bpy_rna.c
    branches/volume25/source/blender/render/intern/source/Makefile
    branches/volume25/source/blender/render/intern/source/texture.c
    branches/volume25/source/blender/windowmanager/WM_types.h
    branches/volume25/source/blender/windowmanager/intern/Makefile
    branches/volume25/source/blender/windowmanager/intern/wm_event_system.c
    branches/volume25/source/blender/windowmanager/intern/wm_init_exit.c
    branches/volume25/source/blender/windowmanager/intern/wm_operators.c
    branches/volume25/source/blender/windowmanager/intern/wm_window.c
    branches/volume25/source/creator/CMakeLists.txt
    branches/volume25/source/creator/Makefile
    branches/volume25/source/creator/creator.c
    branches/volume25/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/volume25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/volume25/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/volume25/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/volume25/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/volume25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/volume25/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/volume25/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/volume25/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/volume25/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/volume25/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/volume25/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/volume25/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/volume25/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/volume25/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/volume25/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/volume25/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/volume25/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/volume25/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/volume25/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/volume25/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/volume25/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/volume25/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/volume25/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/volume25/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/volume25/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/volume25/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/volume25/source/gameengine/VideoTexture/Exception.cpp
    branches/volume25/source/gameengine/VideoTexture/ImageBase.cpp
    branches/volume25/source/nan_definitions.mk

Added Paths:
-----------
    branches/volume25/extern/lzma/
    branches/volume25/extern/lzma/Alloc.c
    branches/volume25/extern/lzma/Alloc.h
    branches/volume25/extern/lzma/CMakeLists.txt
    branches/volume25/extern/lzma/LzFind.c
    branches/volume25/extern/lzma/LzFind.h
    branches/volume25/extern/lzma/LzHash.h
    branches/volume25/extern/lzma/LzmaDec.c
    branches/volume25/extern/lzma/LzmaDec.h
    branches/volume25/extern/lzma/LzmaEnc.c
    branches/volume25/extern/lzma/LzmaEnc.h
    branches/volume25/extern/lzma/LzmaLib.c
    branches/volume25/extern/lzma/LzmaLib.h
    branches/volume25/extern/lzma/Makefile
    branches/volume25/extern/lzma/SConscript
    branches/volume25/extern/lzma/Types.h
    branches/volume25/extern/lzma/history.txt
    branches/volume25/extern/lzma/lzma.txt
    branches/volume25/extern/lzma/make/
    branches/volume25/extern/lzma/make/msvc_9_0/
    branches/volume25/extern/lzma/make/msvc_9_0/lzma.vcproj
    branches/volume25/extern/lzo/
    branches/volume25/extern/lzo/CMakeLists.txt
    branches/volume25/extern/lzo/SConscript
    branches/volume25/extern/lzo/make/
    branches/volume25/extern/lzo/make/msvc_9_0/
    branches/volume25/extern/lzo/make/msvc_9_0/lzo.vcproj
    branches/volume25/extern/lzo/minilzo/
    branches/volume25/extern/lzo/minilzo/COPYING
    branches/volume25/extern/lzo/minilzo/Makefile
    branches/volume25/extern/lzo/minilzo/Makefile.bak
    branches/volume25/extern/lzo/minilzo/README.LZO
    branches/volume25/extern/lzo/minilzo/lzoconf.h
    branches/volume25/extern/lzo/minilzo/lzodefs.h
    branches/volume25/extern/lzo/minilzo/minilzo.c
    branches/volume25/extern/lzo/minilzo/minilzo.h
    branches/volume25/intern/audaspace/OpenAL/Makefile
    branches/volume25/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/volume25/intern/audaspace/intern/AUD_FileFactory.h
    branches/volume25/intern/audaspace/sndfile/
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/volume25/intern/audaspace/sndfile/Makefile
    branches/volume25/source/blender/blenkernel/intern/smokehighres.c
    branches/volume25/source/blender/editors/include/ED_info.h
    branches/volume25/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/volume25/source/blender/editors/space_info/info_stats.c
    branches/volume25/source/blender/editors/space_view3d/drawvolume.c

Removed Paths:
-------------
    branches/volume25/extern/lzma/Alloc.c
    branches/volume25/extern/lzma/Alloc.h
    branches/volume25/extern/lzma/CMakeLists.txt
    branches/volume25/extern/lzma/LzFind.c
    branches/volume25/extern/lzma/LzFind.h
    branches/volume25/extern/lzma/LzHash.h
    branches/volume25/extern/lzma/LzmaDec.c
    branches/volume25/extern/lzma/LzmaDec.h
    branches/volume25/extern/lzma/LzmaEnc.c
    branches/volume25/extern/lzma/LzmaEnc.h
    branches/volume25/extern/lzma/LzmaLib.c
    branches/volume25/extern/lzma/LzmaLib.h
    branches/volume25/extern/lzma/Makefile
    branches/volume25/extern/lzma/SConscript
    branches/volume25/extern/lzma/Types.h
    branches/volume25/extern/lzma/history.txt
    branches/volume25/extern/lzma/lzma.txt
    branches/volume25/extern/lzma/make/
    branches/volume25/extern/lzma/make/msvc_9_0/
    branches/volume25/extern/lzma/make/msvc_9_0/lzma.vcproj
    branches/volume25/extern/lzo/CMakeLists.txt
    branches/volume25/extern/lzo/SConscript
    branches/volume25/extern/lzo/make/
    branches/volume25/extern/lzo/make/msvc_9_0/
    branches/volume25/extern/lzo/make/msvc_9_0/lzo.vcproj
    branches/volume25/extern/lzo/minilzo/
    branches/volume25/extern/lzo/minilzo/COPYING
    branches/volume25/extern/lzo/minilzo/Makefile
    branches/volume25/extern/lzo/minilzo/Makefile.bak
    branches/volume25/extern/lzo/minilzo/README.LZO
    branches/volume25/extern/lzo/minilzo/lzoconf.h
    branches/volume25/extern/lzo/minilzo/lzodefs.h
    branches/volume25/extern/lzo/minilzo/minilzo.c
    branches/volume25/extern/lzo/minilzo/minilzo.h
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/volume25/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/volume25/intern/audaspace/sndfile/Makefile
    branches/volume25/release/scripts/help_getting_started.py
    branches/volume25/release/scripts/help_manual.py
    branches/volume25/release/scripts/help_release_notes.py
    branches/volume25/release/scripts/help_tutorials.py
    branches/volume25/release/scripts/help_web_blender.py
    branches/volume25/release/scripts/help_web_devcomm.py
    branches/volume25/release/scripts/help_web_eshop.py
    branches/volume25/release/scripts/help_web_usercomm.py

Modified: branches/volume25/CMake/macros.cmake
===================================================================
--- branches/volume25/CMake/macros.cmake	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/CMake/macros.cmake	2009-08-23 03:33:33 UTC (rev 22715)
@@ -70,6 +70,9 @@
   IF(WITH_JACK)
     LINK_DIRECTORIES(${JACK_LIBPATH})
   ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+  ENDIF(WITH_SNDFILE)
   IF(WITH_FFTW3)
     LINK_DIRECTORIES(${FFTW3_LIBPATH})
   ENDIF(WITH_FFTW3)
@@ -118,6 +121,9 @@
   IF(WITH_JACK)
     TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
   ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+  ENDIF(WITH_SNDFILE)
   IF(WITH_SDL)
     TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
   ENDIF(WITH_SDL)

Modified: branches/volume25/CMakeLists.txt
===================================================================
--- branches/volume25/CMakeLists.txt	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/CMakeLists.txt	2009-08-23 03:33:33 UTC (rev 22715)
@@ -70,7 +70,9 @@
 OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
+# OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -109,6 +111,13 @@
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS
@@ -204,7 +213,7 @@
   SET(PLATFORM_LINKFLAGS "-pthread")
 
   # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
+  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
   SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
@@ -247,6 +256,13 @@
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE ${LIBDIR}/sndfile)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   IF(CMAKE_CL_64)
     SET(PNG_LIBRARIES libpng)
   ELSE(CMAKE_CL_64)
@@ -256,7 +272,11 @@
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
-  SET(ZLIB_LIBRARIES zlib)
+  IF(CMAKE_CL_64)
+    SET(ZLIB_LIBRARIES libz)
+  ELSE(CMAKE_CL_64)
+    SET(ZLIB_LIBRARIES zlib)
+  ENDIF(CMAKE_CL_64)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
@@ -279,7 +299,7 @@
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
   IF(CMAKE_CL_64)
-    SET(GETTEXT_LIB gettextlib)
+    SET(GETTEXT_LIB gettext)
   ELSE(CMAKE_CL_64)
     SET(GETTEXT_LIB gnu_gettext)
   ENDIF(CMAKE_CL_64)
@@ -388,6 +408,13 @@
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   SET(PYTHON_VERSION 3.1)
 
   IF(PYTHON_VERSION MATCHES 3.1)
@@ -485,6 +512,17 @@
   SET(BINRELOC_INC ${BINRELOC}/include)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
+
+# TODO - buildinfo
+# IF(UNIX)
+#   IF(WITH_BUILDINFO)
+#     EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
+#     EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
+#     EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+#     SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+#   ENDIF(WITH_BUILDINFO)
+# ENDIF(UNIX)
+
 #-----------------------------------------------------------------------------
 # Common.
 

Modified: branches/volume25/config/linux2-config.py
===================================================================
--- branches/volume25/config/linux2-config.py	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/config/linux2-config.py	2009-08-23 03:33:33 UTC (rev 22715)
@@ -181,9 +181,10 @@
 ##ARFLAGSQUIET = ru
 ##
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
-
 CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
 
+
 ##FIX_STUBS_WARNINGS = -Wno-unused
 
 LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']

Modified: branches/volume25/extern/CMakeLists.txt
===================================================================
--- branches/volume25/extern/CMakeLists.txt	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/extern/CMakeLists.txt	2009-08-23 03:33:33 UTC (rev 22715)
@@ -37,3 +37,6 @@
 IF(WITH_OPENJPEG)
   ADD_SUBDIRECTORY(libopenjpeg)
 ENDIF(WITH_OPENJPEG)
+
+ADD_SUBDIRECTORY(lzo)
+ADD_SUBDIRECTORY(lzma)

Modified: branches/volume25/extern/Makefile
===================================================================
--- branches/volume25/extern/Makefile	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/extern/Makefile	2009-08-23 03:33:33 UTC (rev 22715)
@@ -54,6 +54,14 @@
     DIRS += libopenjpeg
 endif
 
+ifeq ($(WITH_LZO), true)
+    DIRS += lzo/minilzo
+endif
+
+ifeq ($(WITH_LZMA), true)
+    DIRS += lzma
+endif
+
 TARGET = solid
 
 all::

Modified: branches/volume25/extern/SConscript
===================================================================
--- branches/volume25/extern/SConscript	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/extern/SConscript	2009-08-23 03:33:33 UTC (rev 22715)
@@ -22,5 +22,5 @@
 if env['OURPLATFORM'] == 'linux2':
     SConscript(['binreloc/SConscript']);
 
-# FFTW not needed atm - dg
-# SConscript(['fftw/SConscript'])
+SConscript(['lzo/SConscript'])
+SConscript(['lzma/SConscript'])

Copied: branches/volume25/extern/lzma (from rev 22714, branches/blender2.5/blender/extern/lzma)

Deleted: branches/volume25/extern/lzma/Alloc.c
===================================================================
--- branches/blender2.5/blender/extern/lzma/Alloc.c	2009-08-23 02:59:18 UTC (rev 22714)
+++ branches/volume25/extern/lzma/Alloc.c	2009-08-23 03:33:33 UTC (rev 22715)
@@ -1,127 +0,0 @@
-/* Alloc.c -- Memory allocation functions
-2008-09-24
-Igor Pavlov
-Public domain */
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <stdlib.h>
-
-#include "Alloc.h"
-
-/* #define _SZ_ALLOC_DEBUG */
-
-/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
-#ifdef _SZ_ALLOC_DEBUG
-#include <stdio.h>
-int g_allocCount = 0;
-int g_allocCountMid = 0;
-int g_allocCountBig = 0;
-#endif
-
-void *MyAlloc(size_t size)
-{
-  if (size == 0)
-    return 0;
-  #ifdef _SZ_ALLOC_DEBUG
-  {
-    void *p = malloc(size);
-    fprintf(stderr, "\nAlloc %10d bytes, count = %10d,  addr = %8X", size, g_allocCount++, (unsigned)p);
-    return p;
-  }
-  #else
-  return malloc(size);
-  #endif
-}
-
-void MyFree(void *address)
-{
-  #ifdef _SZ_ALLOC_DEBUG
-  if (address != 0)
-    fprintf(stderr, "\nFree; count = %10d,  addr = %8X", --g_allocCount, (unsigned)address);
-  #endif
-  free(address);
-}
-
-#ifdef _WIN32
-
-void *MidAlloc(size_t size)
-{
-  if (size == 0)
-    return 0;
-  #ifdef _SZ_ALLOC_DEBUG
-  fprintf(stderr, "\nAlloc_Mid %10d bytes;  count = %10d", size, g_allocCountMid++);
-  #endif
-  return VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
-}
-
-void MidFree(void *address)
-{
-  #ifdef _SZ_ALLOC_DEBUG
-  if (address != 0)
-    fprintf(stderr, "\nFree_Mid; count = %10d", --g_allocCountMid);
-  #endif
-  if (address == 0)
-    return;
-  VirtualFree(address, 0, MEM_RELEASE);
-}
-
-#ifndef MEM_LARGE_PAGES
-#undef _7ZIP_LARGE_PAGES
-#endif
-
-#ifdef _7ZIP_LARGE_PAGES
-SIZE_T g_LargePageSize = 0;
-typedef SIZE_T (WINAPI *GetLargePageMinimumP)();
-#endif
-
-void SetLargePageSize()
-{
-  #ifdef _7ZIP_LARGE_PAGES
-  SIZE_T size = 0;
-  GetLargePageMinimumP largePageMinimum = (GetLargePageMinimumP)
-        GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "GetLargePageMinimum");
-  if (largePageMinimum == 0)
-    return;
-  size = largePageMinimum();
-  if (size == 0 || (size & (size - 1)) != 0)
-    return;
-  g_LargePageSize = size;
-  #endif
-}
-
-
-void *BigAlloc(size_t size)
-{
-  if (size == 0)
-    return 0;
-  #ifdef _SZ_ALLOC_DEBUG
-  fprintf(stderr, "\nAlloc_Big %10d bytes;  count = %10d", size, g_allocCountBig++);
-  #endif
-  
-  #ifdef _7ZIP_LARGE_PAGES
-  if (g_LargePageSize != 0 && g_LargePageSize <= (1 << 30) && size >= (1 << 18))
-  {
-    void *res = VirtualAlloc(0, (size + g_LargePageSize - 1) & (~(g_LargePageSize - 1)),
-        MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
-    if (res != 0)
-      return res;
-  }
-  #endif
-  return VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
-}
-
-void BigFree(void *address)
-{
-  #ifdef _SZ_ALLOC_DEBUG
-  if (address != 0)
-    fprintf(stderr, "\nFree_Big; count = %10d", --g_allocCountBig);
-  #endif
-  
-  if (address == 0)
-    return;
-  VirtualFree(address, 0, MEM_RELEASE);
-}
-
-#endif

Copied: branches/volume25/extern/lzma/Alloc.c (from rev 22714, branches/blender2.5/blender/extern/lzma/Alloc.c)
===================================================================
--- branches/volume25/extern/lzma/Alloc.c	                        (rev 0)
+++ branches/volume25/extern/lzma/Alloc.c	2009-08-23 03:33:33 UTC (rev 22715)
@@ -0,0 +1,127 @@
+/* Alloc.c -- Memory allocation functions
+2008-09-24
+Igor Pavlov
+Public domain */
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#include <stdlib.h>
+
+#include "Alloc.h"
+
+/* #define _SZ_ALLOC_DEBUG */
+
+/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
+#ifdef _SZ_ALLOC_DEBUG
+#include <stdio.h>
+int g_allocCount = 0;
+int g_allocCountMid = 0;
+int g_allocCountBig = 0;
+#endif
+
+void *MyAlloc(size_t size)
+{
+  if (size == 0)
+    return 0;
+  #ifdef _SZ_ALLOC_DEBUG
+  {
+    void *p = malloc(size);
+    fprintf(stderr, "\nAlloc %10d bytes, count = %10d,  addr = %8X", size, g_allocCount++, (unsigned)p);
+    return p;
+  }
+  #else
+  return malloc(size);
+  #endif
+}
+
+void MyFree(void *address)
+{
+  #ifdef _SZ_ALLOC_DEBUG
+  if (address != 0)
+    fprintf(stderr, "\nFree; count = %10d,  addr = %8X", --g_allocCount, (unsigned)address);
+  #endif
+  free(address);
+}

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list