[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39737] branches/particles-2010: svn merge -r39477:39735 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Lukas Toenne lukas.toenne at googlemail.com
Sat Aug 27 10:56:56 CEST 2011 

Revision: 39737
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39737
Author:   lukastoenne
Date:     2011-08-27 08:56:55 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
svn merge -r39477:39735 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39477

Modified Paths:
--------------
    branches/particles-2010/CMakeLists.txt
    branches/particles-2010/SConstruct
    branches/particles-2010/build_files/buildbot/config/user-config-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-player-x86_64.py
    branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py
    branches/particles-2010/build_files/buildbot/slave_compile.py
    branches/particles-2010/build_files/buildbot/slave_pack.py
    branches/particles-2010/build_files/cmake/buildinfo.cmake
    branches/particles-2010/build_files/cmake/config/blender_lite.cmake
    branches/particles-2010/build_files/cmake/macros.cmake
    branches/particles-2010/build_files/cmake/packaging.cmake
    branches/particles-2010/build_files/package_spec/rpm/blender.spec.in
    branches/particles-2010/build_files/scons/config/darwin-config.py
    branches/particles-2010/build_files/scons/config/linuxcross-config.py
    branches/particles-2010/build_files/scons/config/win32-mingw-config.py
    branches/particles-2010/build_files/scons/config/win32-vc-config.py
    branches/particles-2010/build_files/scons/config/win64-vc-config.py
    branches/particles-2010/build_files/scons/tools/Blender.py
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/doc/build_systems/scons-dev.txt
    branches/particles-2010/doc/build_systems/scons.txt
    branches/particles-2010/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
    branches/particles-2010/doc/python_api/sphinx_doc_gen.py
    branches/particles-2010/doc/python_api/sphinx_doc_gen.sh
    branches/particles-2010/extern/bullet2/src/SConscript
    branches/particles-2010/extern/eltopo/SConscript
    branches/particles-2010/intern/ghost/SConscript
    branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/particles-2010/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/particles-2010/intern/itasc/kdl/frames_io.cpp
    branches/particles-2010/release/scripts/modules/bpy_types.py
    branches/particles-2010/release/scripts/modules/console_python.py
    branches/particles-2010/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/particles-2010/release/scripts/startup/bl_operators/mesh.py
    branches/particles-2010/release/scripts/startup/bl_operators/nla.py
    branches/particles-2010/release/scripts/startup/bl_operators/object.py
    branches/particles-2010/release/scripts/startup/bl_operators/object_align.py
    branches/particles-2010/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/particles-2010/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/particles-2010/release/scripts/startup/bl_operators/sequencer.py
    branches/particles-2010/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/particles-2010/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/particles-2010/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/particles-2010/release/scripts/startup/bl_operators/wm.py
    branches/particles-2010/release/scripts/startup/bl_ui/__init__.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_particle.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_texture.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_console.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_image.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_info.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_userpref.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_view3d.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/particles-2010/release/scripts/templates/addon_add_object.py
    branches/particles-2010/release/scripts/templates/operator_export.py
    branches/particles-2010/release/scripts/templates/operator_mesh_add.py
    branches/particles-2010/release/scripts/templates/operator_modal_view3d.py
    branches/particles-2010/release/scripts/templates/operator_simple.py
    branches/particles-2010/source/blender/avi/intern/avi.c
    branches/particles-2010/source/blender/blenkernel/intern/anim.c
    branches/particles-2010/source/blender/blenkernel/intern/cloth.c
    branches/particles-2010/source/blender/blenkernel/intern/library.c
    branches/particles-2010/source/blender/blenkernel/intern/mesh_validate.c
    branches/particles-2010/source/blender/blenkernel/intern/multires.c
    branches/particles-2010/source/blender/blenkernel/intern/object.c
    branches/particles-2010/source/blender/blenkernel/intern/particle.c
    branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
    branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c
    branches/particles-2010/source/blender/blenlib/BLI_math_rotation.h
    branches/particles-2010/source/blender/blenlib/BLI_math_vector.h
    branches/particles-2010/source/blender/blenlib/BLI_string.h
    branches/particles-2010/source/blender/blenlib/BLI_utildefines.h
    branches/particles-2010/source/blender/blenlib/intern/fileops.c
    branches/particles-2010/source/blender/blenlib/intern/jitter.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom.c
    branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
    branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
    branches/particles-2010/source/blender/blenlib/intern/rct.c
    branches/particles-2010/source/blender/blenlib/intern/scanfill.c
    branches/particles-2010/source/blender/blenlib/intern/string.c
    branches/particles-2010/source/blender/blenloader/CMakeLists.txt
    branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/blenloader/intern/writefile.c
    branches/particles-2010/source/blender/blenpluginapi/SConscript
    branches/particles-2010/source/blender/collada/CMakeLists.txt
    branches/particles-2010/source/blender/collada/DocumentExporter.cpp
    branches/particles-2010/source/blender/collada/SConscript
    branches/particles-2010/source/blender/editors/animation/anim_markers.c
    branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
    branches/particles-2010/source/blender/editors/armature/SConscript
    branches/particles-2010/source/blender/editors/armature/editarmature.c
    branches/particles-2010/source/blender/editors/interface/interface.c
    branches/particles-2010/source/blender/editors/interface/interface_draw.c
    branches/particles-2010/source/blender/editors/interface/interface_handlers.c
    branches/particles-2010/source/blender/editors/interface/interface_icons.c
    branches/particles-2010/source/blender/editors/interface/interface_intern.h
    branches/particles-2010/source/blender/editors/interface/interface_layout.c
    branches/particles-2010/source/blender/editors/interface/interface_widgets.c
    branches/particles-2010/source/blender/editors/mesh/SConscript
    branches/particles-2010/source/blender/editors/object/SConscript
    branches/particles-2010/source/blender/editors/object/object_add.c
    branches/particles-2010/source/blender/editors/object/object_bake.c
    branches/particles-2010/source/blender/editors/object/object_modifier.c
    branches/particles-2010/source/blender/editors/physics/SConscript
    branches/particles-2010/source/blender/editors/physics/physics_pointcache.c
    branches/particles-2010/source/blender/editors/render/SConscript
    branches/particles-2010/source/blender/editors/render/render_shading.c
    branches/particles-2010/source/blender/editors/screen/SConscript
    branches/particles-2010/source/blender/editors/screen/area.c
    branches/particles-2010/source/blender/editors/screen/screen_edit.c
    branches/particles-2010/source/blender/editors/screen/screen_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/SConscript
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
    branches/particles-2010/source/blender/editors/space_buttons/buttons_context.c
    branches/particles-2010/source/blender/editors/space_buttons/buttons_header.c
    branches/particles-2010/source/blender/editors/space_console/space_console.c
    branches/particles-2010/source/blender/editors/space_file/SConscript
    branches/particles-2010/source/blender/editors/space_file/file_ops.c
    branches/particles-2010/source/blender/editors/space_file/fsmenu.c
    branches/particles-2010/source/blender/editors/space_image/image_ops.c
    branches/particles-2010/source/blender/editors/space_info/info_ops.c
    branches/particles-2010/source/blender/editors/space_node/SConscript
    branches/particles-2010/source/blender/editors/space_node/node_edit.c
    branches/particles-2010/source/blender/editors/space_outliner/outliner_intern.h
    branches/particles-2010/source/blender/editors/space_outliner/outliner_select.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
    branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_fly.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_ops.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_select.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
    branches/particles-2010/source/blender/gpu/intern/gpu_material.c
    branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/particles-2010/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/particles-2010/source/blender/imbuf/intern/filter.c
    branches/particles-2010/source/blender/imbuf/intern/tiff.c
    branches/particles-2010/source/blender/makesdna/DNA_sdna_types.h
    branches/particles-2010/source/blender/makesdna/DNA_sequence_types.h
    branches/particles-2010/source/blender/makesdna/DNA_space_types.h
    branches/particles-2010/source/blender/makesdna/DNA_texture_types.h
    branches/particles-2010/source/blender/makesdna/DNA_view3d_types.h
    branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
    branches/particles-2010/source/blender/makesdna/intern/CMakeLists.txt
    branches/particles-2010/source/blender/makesdna/intern/SConscript
    branches/particles-2010/source/blender/makesdna/intern/dna_genfile.c
    branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
    branches/particles-2010/source/blender/makesrna/SConscript
    branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
    branches/particles-2010/source/blender/makesrna/intern/SConscript
    branches/particles-2010/source/blender/makesrna/intern/makesrna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_cloth.c
    branches/particles-2010/source/blender/makesrna/intern/rna_define.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sensor.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
    branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
    branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
    branches/particles-2010/source/blender/nodes/SConscript
    branches/particles-2010/source/blender/python/generic/noise_py_api.c
    branches/particles-2010/source/blender/python/intern/bpy_interface.c
    branches/particles-2010/source/blender/python/intern/bpy_operator.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.c
    branches/particles-2010/source/blender/python/intern/bpy_traceback.c
    branches/particles-2010/source/blender/python/intern/bpy_util.h
    branches/particles-2010/source/blender/render/SConscript
    branches/particles-2010/source/blender/render/intern/source/convertblender.c
    branches/particles-2010/source/blender/render/intern/source/envmap.c
    branches/particles-2010/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/particles-2010/source/blender/render/intern/source/initrender.c
    branches/particles-2010/source/blender/render/intern/source/occlusion.c
    branches/particles-2010/source/blender/render/intern/source/pixelblending.c
    branches/particles-2010/source/blender/render/intern/source/pixelshading.c
    branches/particles-2010/source/blender/render/intern/source/rayshade.c
    branches/particles-2010/source/blender/render/intern/source/render_texture.c
    branches/particles-2010/source/blender/render/intern/source/rendercore.c
    branches/particles-2010/source/blender/render/intern/source/renderdatabase.c
    branches/particles-2010/source/blender/render/intern/source/shadbuf.c
    branches/particles-2010/source/blender/render/intern/source/sss.c
    branches/particles-2010/source/blender/render/intern/source/strand.c
    branches/particles-2010/source/blender/render/intern/source/sunsky.c
    branches/particles-2010/source/blender/render/intern/source/volume_precache.c
    branches/particles-2010/source/blender/render/intern/source/volumetric.c
    branches/particles-2010/source/blender/render/intern/source/voxeldata.c
    branches/particles-2010/source/blender/render/intern/source/zbuf.c
    branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
    branches/particles-2010/source/blender/windowmanager/SConscript
    branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/particles-2010/source/creator/CMakeLists.txt
    branches/particles-2010/source/creator/buildinfo.c
    branches/particles-2010/source/creator/creator.c
    branches/particles-2010/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/particles-2010/source/gameengine/Ketsji/BL_Material.h
    branches/particles-2010/source/gameengine/Ketsji/BL_Shader.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/particles-2010/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/particles-2010/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/particles-2010/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/particles-2010/source/gameengine/VideoTexture/Exception.cpp

Added Paths:
-----------
    branches/particles-2010/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/particles-2010/build_files/scons/config/linux-config.py
    branches/particles-2010/doc/python_api/examples/bpy.types.ID.user_clear.1.py
    branches/particles-2010/doc/python_api/rst/info_gotcha.rst
    branches/particles-2010/doc/python_api/rst/info_overview.rst
    branches/particles-2010/doc/python_api/rst/info_quickstart.rst

Removed Paths:
-------------
    branches/particles-2010/build_files/scons/config/linux2-config.py

Property Changed:
----------------
    branches/particles-2010/
    branches/particles-2010/source/blender/editors/render/render_update.c
    branches/particles-2010/source/blender/editors/space_outliner/
    branches/particles-2010/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:33741-39477
   + /trunk/blender:33741-39735

Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt	2011-08-27 08:19:26 UTC (rev 39736)
+++ branches/particles-2010/CMakeLists.txt	2011-08-27 08:56:55 UTC (rev 39737)
@@ -63,6 +63,22 @@
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
 #-----------------------------------------------------------------------------
+# Set policy
+
+# see "cmake --help-policy CMP0003"
+# So library linking is more sane
+cmake_policy(SET CMP0003 NEW)
+
+# So BUILDINFO and BLENDERPATH strings are automatically quoted
+cmake_policy(SET CMP0005 NEW)
+
+# So syntax problems are errors
+cmake_policy(SET CMP0010 NEW)
+
+# Input directories must have CMakeLists.txt
+cmake_policy(SET CMP0014 NEW)
+
+#-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
 
@@ -258,6 +274,11 @@
 
 TEST_SSE_SUPPORT()
 
+# don't store paths to libs for portable distrobution
+if(WITH_INSTALL_PORTABLE)
+	set(CMAKE_SKIP_BUILD_RPATH TRUE)
+endif()
+
 #-----------------------------------------------------------------------------
 # Initialize un-cached vars, avoid unused warning
 
@@ -429,21 +450,20 @@
 	endif()
 
 	if(WITH_OPENCOLLADA)
-		set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
-		mark_as_advanced(OPENCOLLADA)
-		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-		set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
-		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
+		find_package(OpenCOLLADA)
+		if(OPENCOLLADA_FOUND)
+			set(PCRE /usr CACHE PATH "PCRE Directory")
+			mark_as_advanced(PCRE)
+			set(PCRE_LIBPATH ${PCRE}/lib)
+			set(PCRE_LIB pcre)
 
-		set(PCRE /usr CACHE PATH "PCRE Directory")
-		mark_as_advanced(PCRE)
-		set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
-
-		set(EXPAT /usr CACHE PATH "Expat Directory")
-		mark_as_advanced(EXPAT)
-		set(EXPAT_LIBPATH ${EXPAT}/lib)
-		set(EXPAT_LIB expat)
+			set(EXPAT /usr CACHE PATH "Expat Directory")
+			mark_as_advanced(EXPAT)
+			set(EXPAT_LIBPATH ${EXPAT}/lib)
+			set(EXPAT_LIB expat)
+		else()
+			set(WITH_OPENCOLLADA OFF)
+		endif()
 	endif()
 
 	if(WITH_MEM_JEMALLOC)
@@ -499,6 +519,9 @@
 	# GNU Compiler
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	# CLang is the same as GCC for now.
+	elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken
@@ -665,9 +688,15 @@
 		endif()
 
 		if(WITH_OPENCOLLADA)
-			set(OPENCOLLADA_INCLUDE_DIR
-				${LIBDIR}/opencollada/include
+
+			set(OPENCOLLADA_INCLUDE_DIRS
+				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
+				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
+				${LIBDIR}/opencollada/include/COLLADAFramework/include
+				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
+				${LIBDIR}/opencollada/include/GeneratedSaxParser/include			
 			)
+
 			set(OPENCOLLADA_LIBRARIES
 				${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
 				${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
@@ -691,11 +720,11 @@
 				${LIBDIR}/ffmpeg/include/msvc
 			)
 			set(FFMPEG_LIBRARIES
-				${LIBDIR}/ffmpeg/lib/avcodec-52.lib
-				${LIBDIR}/ffmpeg/lib/avformat-52.lib
-				${LIBDIR}/ffmpeg/lib/avdevice-52.lib
-				${LIBDIR}/ffmpeg/lib/avutil-50.lib
-				${LIBDIR}/ffmpeg/lib/swscale-0.lib
+				${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+				${LIBDIR}/ffmpeg/lib/avformat-53.lib
+				${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+				${LIBDIR}/ffmpeg/lib/avutil-51.lib
+				${LIBDIR}/ffmpeg/lib/swscale-2.lib
 			)
 		endif()
 
@@ -813,7 +842,13 @@
 
 		if(WITH_OPENCOLLADA)
 			set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
-			set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+			set(OPENCOLLADA_INCLUDE_DIRS
+				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
+				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
+				${LIBDIR}/opencollada/include/COLLADAFramework/include
+				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
+				${LIBDIR}/opencollada/include/GeneratedSaxParser/include			
+			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
 			set(PCRE_LIB pcre)
@@ -822,7 +857,7 @@
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
-			set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+			set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
 			set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		endif()
 
@@ -1024,7 +1059,15 @@
 
 	if(WITH_OPENCOLLADA)
 		set(OPENCOLLADA ${LIBDIR}/opencollada)
-		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+
+		set(OPENCOLLADA_INCLUDE_DIRS
+			${LIBDIR}/opencollada/include/COLLADAStreamWriter
+			${LIBDIR}/opencollada/include/COLLADABaseUtils
+			${LIBDIR}/opencollada/include/COLLADAFramework
+			${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
+			${LIBDIR}/opencollada/include/GeneratedSaxParser
+		)
+
 		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
 		set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
 		#pcre is bundled with openCollada

Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct	2011-08-27 08:19:26 UTC (rev 39736)
+++ branches/particles-2010/SConstruct	2011-08-27 08:56:55 UTC (rev 39737)
@@ -166,6 +166,13 @@
 
 env.SConscriptChdir(0)
 
+# Remove major kernel version from linux platform.
+# After Linus switched kernel to new version model this major version
+# shouldn't take much sense for building rules.
+
+if re.match('linux[0-9]+', platform):
+    platform = 'linux'
+
 crossbuild = B.arguments.get('BF_CROSS', None)
 if crossbuild and platform not in ('win32-vc', 'win64-vc'):
     platform = 'linuxcross'
@@ -262,16 +269,16 @@
     else:
         print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
 
-    # for now, Mac builders must download and install the driver framework from 3Dconnexion
+    # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
     # necessary header file lives here when installed:
     # /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
-    if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
-        print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
-        env['WITH_BF_3DMOUSE'] = 0
-    else:
-        env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
+    if env['WITH_BF_3DMOUSE'] == 1:
+        if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
+            print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
+            env['WITH_BF_3DMOUSE'] = 0
+        else:
+            env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
 
-
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                 env['CCFLAGS'].append('/openmp')
@@ -551,7 +558,7 @@
                     scriptinstall.append(env.Install(dir=dir,source=source))
 
 #-- icons
-if env['OURPLATFORM']=='linux2':
+if env['OURPLATFORM']=='linux':
     iconlist = []
     icontargetlist = []
 
@@ -630,7 +637,7 @@
 
 if  env['OURPLATFORM']=='darwin':
         allinstall = [blenderinstall, plugininstall, textinstall]
-elif env['OURPLATFORM']=='linux2':
+elif env['OURPLATFORM']=='linux':
         allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
 else:
         allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]

Modified: branches/particles-2010/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/particles-2010/build_files/buildbot/config/user-config-i686.py	2011-08-27 08:19:26 UTC (rev 39736)
+++ branches/particles-2010/build_files/buildbot/config/user-config-i686.py	2011-08-27 08:56:55 UTC (rev 39737)
@@ -22,7 +22,7 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
 BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
     '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \

Modified: branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py	2011-08-27 08:19:26 UTC (rev 39736)
+++ branches/particles-2010/build_files/buildbot/config/user-config-player-i686.py	2011-08-27 08:56:55 UTC (rev 39737)
@@ -16,7 +16,7 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg-0.8'
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
 BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
     '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \

Modified: branches/particles-2010/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list