[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51988] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 51985.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Wed Nov 7 23:12:24 CET 2012
Revision: 51988
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51988
Author: kjym3
Date: 2012-11-07 22:12:19 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 51985.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51985
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_clang_array.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_smatch.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_splint.py
branches/soc-2008-mxcurioni/build_files/scons/config/Modules/FindPython.py
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.constraints.rst
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
branches/soc-2008-mxcurioni/extern/carve/lib/intersect_face_division.cpp
branches/soc-2008-mxcurioni/extern/glew/src/glew.c
branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.h
branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.cpp
branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.h
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DelayReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DoubleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EffectReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_FaderReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LimiterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PingPongFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_PitchReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_ReverseReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SquareFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SumFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SumFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_SuperposeReader.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_VolumeFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2008-mxcurioni/intern/audaspace/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileWriter.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_IFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Mixer.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_MixerFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_NULLDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ResampleReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ResampleReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerEntry.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerEntry.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerHandle.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SilenceFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SinusFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/AUD_SndFileReader.h
branches/soc-2008-mxcurioni/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/enums.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_intern.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf_ward.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/background.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_geometry.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/image.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.h
branches/soc-2008-mxcurioni/intern/cycles/render/tile.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_attribute.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_types.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/itasc/kdl/chain.hpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/tree.hpp
branches/soc-2008-mxcurioni/release/datafiles/blender_icons.png
branches/soc-2008-mxcurioni/release/datafiles/prvicons.png
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_quadric.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/quadric.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/smallhash.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_decimate_collapse.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_group.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mask.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_socket.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_socket.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.h
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_engine.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/build_environment/
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Sequencer.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Sequencer.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_tangent.osl
branches/soc-2008-mxcurioni/intern/cycles/util/util_stats.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tangent.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CharacterWrapper.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_ICharacter.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Reference.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReferenceHandler.cpp
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-51863
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-51985
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-11-07 22:12:19 UTC (rev 51988)
@@ -291,7 +291,7 @@
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking happens
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE) # 10.6 is our min. target, if you use higher sdk, weak linking happens - with 10.5 we have still not solved problems, build those with 10.5.sdk for now !!!
endif()
if(${CMAKE_GENERATOR} MATCHES "Xcode")
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-i686.py 2012-11-07 22:12:19 UTC (rev 51988)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-glibc27-x86_64.py 2012-11-07 22:12:19 UTC (rev 51988)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-i686.py 2012-11-07 22:12:19 UTC (rev 51988)
@@ -93,6 +93,14 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/lib/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
+ '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
WITH_BF_STATICJACK = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2012-11-07 22:12:19 UTC (rev 51988)
@@ -93,6 +93,14 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/lib/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
+ '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
WITH_BF_STATICJACK = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-i686.py 2012-11-07 22:12:19 UTC (rev 51988)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
@@ -90,6 +90,13 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-glibc27-x86_64.py 2012-11-07 22:12:19 UTC (rev 51988)
@@ -3,8 +3,8 @@
BF_NUMJOBS = 2
# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON_VERSION = '3.3'
+BF_PYTHON_ABI_FLAGS = 'm'
BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
@@ -90,6 +90,13 @@
BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# JACK
WITH_BF_JACK = True
Modified: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2012-11-07 21:19:43 UTC (rev 51987)
+++ branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2012-11-07 22:12:19 UTC (rev 51988)
@@ -9,6 +9,7 @@
# This module defines
# PYTHON_VERSION
# PYTHON_INCLUDE_DIRS
+# PYTHON_INCLUDE_CONFIG_DIRS
# PYTHON_LIBRARIES
# PYTHON_LIBPATH, Used for installation
# PYTHON_LINKFLAGS
@@ -34,7 +35,7 @@
SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
ENDIF()
-SET(PYTHON_VERSION 3.2 CACHE STRING "Python Version (major and minor only)")
+SET(PYTHON_VERSION 3.3 CACHE STRING "Python Version (major and minor only)")
MARK_AS_ADVANCED(PYTHON_VERSION)
@@ -46,17 +47,25 @@
# if the user passes these defines as args, we dont want to overwrite
SET(_IS_INC_DEF OFF)
+SET(_IS_INC_CONF_DEF OFF)
SET(_IS_LIB_DEF OFF)
+SET(_IS_LIB_PATH_DEF OFF)
IF(DEFINED PYTHON_INCLUDE_DIR)
SET(_IS_INC_DEF ON)
ENDIF()
+IF(DEFINED PYTHON_INCLUDE_CONFIG_DIR)
+ SET(_IS_INC_CONF_DEF ON)
+ENDIF()
IF(DEFINED PYTHON_LIBRARY)
SET(_IS_LIB_DEF ON)
ENDIF()
+IF(DEFINED PYTHON_LIBPATH)
+ SET(_IS_LIB_PATH_DEF ON)
+ENDIF()
# only search for the dirs if we havn't already
-IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
+IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF))
SET(_python_ABI_FLAGS
"m;mu;u; " # release
@@ -85,9 +94,26 @@
${_python_SEARCH_DIRS}
PATH_SUFFIXES
include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
+ include/${CMAKE_LIBRARY_ARCHITECTURE}/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
)
ENDIF()
+ IF(NOT DEFINED PYTHON_INCLUDE_CONFIG_DIR)
+ FIND_PATH(PYTHON_INCLUDE_CONFIG_DIR
+ NAMES
+ pyconfig.h
+ HINTS
+ ${_python_SEARCH_DIRS}
+ PATH_SUFFIXES
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list