[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57615] branches/soc-2013-vse: Merging r57385 through r57614 trunk into soc-2013-vse

Alexander Kuznetsov kuzsasha at gmail.com
Thu Jun 20 17:57:30 CEST 2013


Revision: 57615
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57615
Author:   alexk
Date:     2013-06-20 15:57:30 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
Merging r57385 through r57614 trunk into soc-2013-vse

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

Modified Paths:
--------------
    branches/soc-2013-vse/CMakeLists.txt
    branches/soc-2013-vse/SConstruct
    branches/soc-2013-vse/build_files/build_environment/install_deps.sh
    branches/soc-2013-vse/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
    branches/soc-2013-vse/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
    branches/soc-2013-vse/build_files/buildbot/config/user-config-mac-i386.py
    branches/soc-2013-vse/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/soc-2013-vse/build_files/buildbot/slave_compile.py
    branches/soc-2013-vse/build_files/buildbot/slave_pack.py
    branches/soc-2013-vse/build_files/cmake/Modules/FindOpenEXR.cmake
    branches/soc-2013-vse/build_files/cmake/macros.cmake
    branches/soc-2013-vse/build_files/scons/config/darwin-config.py
    branches/soc-2013-vse/build_files/scons/config/linux-config.py
    branches/soc-2013-vse/build_files/scons/config/win32-mingw-config.py
    branches/soc-2013-vse/build_files/scons/config/win32-vc-config.py
    branches/soc-2013-vse/build_files/scons/config/win64-mingw-config.py
    branches/soc-2013-vse/build_files/scons/config/win64-vc-config.py
    branches/soc-2013-vse/build_files/scons/tools/btools.py
    branches/soc-2013-vse/intern/audaspace/intern/AUD_Sequencer.cpp
    branches/soc-2013-vse/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2013-vse/intern/cycles/CMakeLists.txt
    branches/soc-2013-vse/intern/cycles/SConscript
    branches/soc-2013-vse/intern/cycles/blender/addon/__init__.py
    branches/soc-2013-vse/intern/cycles/blender/addon/properties.py
    branches/soc-2013-vse/intern/cycles/blender/addon/ui.py
    branches/soc-2013-vse/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-vse/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-vse/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-vse/intern/cycles/blender/blender_sync.h
    branches/soc-2013-vse/intern/cycles/bvh/bvh.cpp
    branches/soc-2013-vse/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-vse/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-vse/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-vse/intern/cycles/kernel/SConscript
    branches/soc-2013-vse/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_emission.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_projection.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-vse/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-vse/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-vse/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/soc-2013-vse/intern/cycles/kernel/svm/svm.h
    branches/soc-2013-vse/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2013-vse/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2013-vse/intern/cycles/render/light.cpp
    branches/soc-2013-vse/intern/cycles/render/object.cpp
    branches/soc-2013-vse/intern/cycles/render/osl.cpp
    branches/soc-2013-vse/intern/cycles/render/shader.cpp
    branches/soc-2013-vse/intern/cycles/render/shader.h
    branches/soc-2013-vse/intern/cycles/render/svm.cpp
    branches/soc-2013-vse/intern/cycles/util/util_cuda.cpp
    branches/soc-2013-vse/intern/cycles/util/util_cuda.h
    branches/soc-2013-vse/intern/cycles/util/util_math.h
    branches/soc-2013-vse/intern/cycles/util/util_opencl.cpp
    branches/soc-2013-vse/intern/cycles/util/util_system.cpp
    branches/soc-2013-vse/intern/cycles/util/util_types.h
    branches/soc-2013-vse/release/datafiles/blender_icons.svg
    branches/soc-2013-vse/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/soc-2013-vse/release/scripts/modules/addon_utils.py
    branches/soc-2013-vse/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2013-vse/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-vse/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2013-vse/release/scripts/startup/bl_operators/wm.py
    branches/soc-2013-vse/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2013-vse/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/soc-2013-vse/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/soc-2013-vse/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-vse/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-vse/scons/scons-time.py
    branches/soc-2013-vse/scons/scons.py
    branches/soc-2013-vse/scons/sconsign.py
    branches/soc-2013-vse/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-vse/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2013-vse/source/blender/blenkernel/BKE_node.h
    branches/soc-2013-vse/source/blender/blenkernel/BKE_scene.h
    branches/soc-2013-vse/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2013-vse/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-vse/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/lamp.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/library.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/material.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/modifier.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/nla.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/node.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/texture.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/world.c
    branches/soc-2013-vse/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2013-vse/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2013-vse/source/blender/blenlib/BLI_path_util.h
    branches/soc-2013-vse/source/blender/blenlib/BLI_string.h
    branches/soc-2013-vse/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2013-vse/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-vse/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2013-vse/source/blender/blenlib/intern/string.c
    branches/soc-2013-vse/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-vse/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-vse/source/blender/bmesh/bmesh_class.h
    branches/soc-2013-vse/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2013-vse/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-vse/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2013-vse/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-vse/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2013-vse/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2013-vse/source/blender/bmesh/tools/bmesh_path.c
    branches/soc-2013-vse/source/blender/collada/TransformWriter.cpp
    branches/soc-2013-vse/source/blender/collada/collada_utils.cpp
    branches/soc-2013-vse/source/blender/compositor/intern/COM_compositor.cpp
    branches/soc-2013-vse/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/soc-2013-vse/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
    branches/soc-2013-vse/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/soc-2013-vse/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/soc-2013-vse/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2013-vse/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-vse/source/blender/editors/include/ED_object.h
    branches/soc-2013-vse/source/blender/editors/include/ED_transform.h
    branches/soc-2013-vse/source/blender/editors/include/UI_icons.h
    branches/soc-2013-vse/source/blender/editors/include/UI_interface.h
    branches/soc-2013-vse/source/blender/editors/interface/interface.c
    branches/soc-2013-vse/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-vse/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-vse/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-vse/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-vse/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-vse/source/blender/editors/mesh/editface.c
    branches/soc-2013-vse/source/blender/editors/mesh/editmesh_extrude.c
    branches/soc-2013-vse/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2013-vse/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-vse/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-vse/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-vse/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-vse/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-vse/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-vse/source/blender/editors/object/object_bake.c
    branches/soc-2013-vse/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-vse/source/blender/editors/screen/screendump.c
    branches/soc-2013-vse/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2013-vse/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-vse/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-vse/source/blender/editors/sound/sound_ops.c
    branches/soc-2013-vse/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2013-vse/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2013-vse/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2013-vse/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2013-vse/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2013-vse/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-vse/source/blender/editors/space_file/file_intern.h
    branches/soc-2013-vse/source/blender/editors/space_file/filesel.c
    branches/soc-2013-vse/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2013-vse/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-vse/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2013-vse/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-vse/source/blender/editors/space_node/node_add.c
    branches/soc-2013-vse/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2013-vse/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-vse/source/blender/editors/transform/transform.c
    branches/soc-2013-vse/source/blender/editors/transform/transform.h
    branches/soc-2013-vse/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-vse/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-vse/source/blender/editors/transform/transform_ops.c
    branches/soc-2013-vse/source/blender/editors/transform/transform_snap.c
    branches/soc-2013-vse/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2013-vse/source/blender/freestyle/CMakeLists.txt
    branches/soc-2013-vse/source/blender/freestyle/intern/application/AppCanvas.cpp
    branches/soc-2013-vse/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
    branches/soc-2013-vse/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
    branches/soc-2013-vse/source/blender/freestyle/intern/view_map/Silhouette.h
    branches/soc-2013-vse/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-vse/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2013-vse/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2013-vse/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2013-vse/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-vse/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2013-vse/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2013-vse/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2013-vse/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2013-vse/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2013-vse/source/blender/nodes/NOD_composite.h
    branches/soc-2013-vse/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2013-vse/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2013-vse/source/blender/python/intern/bpy_rna.c
    branches/soc-2013-vse/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-vse/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-vse/source/blender/render/intern/source/shadeinput.c
    branches/soc-2013-vse/source/blender/render/intern/source/sss.c
    branches/soc-2013-vse/source/blender/render/intern/source/zbuf.c
    branches/soc-2013-vse/source/blender/windowmanager/WM_api.h
    branches/soc-2013-vse/source/blender/windowmanager/WM_types.h
    branches/soc-2013-vse/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2013-vse/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-vse/source/creator/CMakeLists.txt
    branches/soc-2013-vse/source/creator/creator.c
    branches/soc-2013-vse/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2013-vse/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2013-vse/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2013-vse/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    branches/soc-2013-vse/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2013-vse/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2013-vse/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2013-vse/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-vse/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2013-vse/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2013-vse/source/gameengine/VideoTexture/ImageRender.cpp

Added Paths:
-----------
    branches/soc-2013-vse/release/scripts/startup/bl_ui/space_properties.py
    branches/soc-2013-vse/scons/scons-local/
    branches/soc-2013-vse/source/blender/blenkernel/BKE_autoexec.h
    branches/soc-2013-vse/source/blender/blenkernel/intern/autoexec.c

Removed Paths:
-------------
    branches/soc-2013-vse/scons/scons-local-1.2.0.d20090223/
    branches/soc-2013-vse/source/blender/editors/space_buttons/buttons_header.c

Property Changed:
----------------
    branches/soc-2013-vse/
    branches/soc-2013-vse/source/blender/editors/interface/interface.c
    branches/soc-2013-vse/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-vse
___________________________________________________________________
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,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
   + /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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57385-57614

Modified: branches/soc-2013-vse/CMakeLists.txt
===================================================================
--- branches/soc-2013-vse/CMakeLists.txt	2013-06-20 15:30:18 UTC (rev 57614)
+++ branches/soc-2013-vse/CMakeLists.txt	2013-06-20 15:57:30 UTC (rev 57615)
@@ -264,7 +264,7 @@
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 
@@ -562,12 +562,12 @@
 if(UNIX AND NOT APPLE)
 	macro(find_package_wrapper)
 		string(TOUPPER ${ARGV0} _NAME_UPPER)
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
 			set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
 		endif()
 		find_package(${ARGV})
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
 			unset(_cmake_find_library_suffixes_back)
 		endif()
@@ -707,7 +707,7 @@
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			if(${WITH_STATIC_LIBS})
+			if(WITH_STATIC_LIBS)
 				set(Boost_USE_STATIC_LIBS ON)
 			endif()
 			set(Boost_USE_MULTITHREADED ON)
@@ -1124,26 +1124,22 @@
 				${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
 				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
-			set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
 			set(OPENCOLLADA_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+				${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+				${OPENCOLLADA}/lib/opencollada/xml.lib
+				${OPENCOLLADA}/lib/opencollada/buffer.lib
+				${OPENCOLLADA}/lib/opencollada/ftoa.lib
+				${OPENCOLLADA}/lib/opencollada/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+				${OPENCOLLADA}/lib/opencollada/pcre.lib
 			)
-			
-			unset(OPENCOLLADA_LIBPATH)
-			
 		endif()
 
 		if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			set_lib_path(OPENEXR "openexr")
+			set(OPENEXR ${LIBDIR}/openexr)
 			set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1199,18 +1195,11 @@
 		endif()
 
 		if(WITH_PYTHON)
-			# normally cached but not since we include them with blender
-			if(MSVC10)
-				set(PYTHON_VERSION 3.3) # CACHE STRING)
-			else()
-				set(PYTHON_VERSION 3.3) # CACHE STRING)
-			endif()
+			set(PYTHON_VERSION 3.3) # CACHE STRING)
 
-			set_lib_path(PYTHON "python")
 			string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 			# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
 			set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
-			# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
 			unset(_PYTHON_VERSION_NO_DOTS)
 
 			# Shared includes for both vc2008 and vc2010
@@ -1228,10 +1217,6 @@
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
 				set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
-			elseif(MSVC10)
-				set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
-				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
-				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2084,13 +2069,6 @@
 
 endif()
 
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
-	if(WITH_OPENCOLLADA)
-		message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
-	endif()
-endif()
-
 # ensure python header is found since detection can fail, this could happen
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.

Modified: branches/soc-2013-vse/SConstruct
===================================================================
--- branches/soc-2013-vse/SConstruct	2013-06-20 15:30:18 UTC (rev 57614)
+++ branches/soc-2013-vse/SConstruct	2013-06-20 15:57:30 UTC (rev 57615)
@@ -46,9 +46,7 @@
 import os.path
 import string
 import shutil
-import glob
 import re
-from tempfile import mkdtemp
 
 # store path to tools
 toolpath=os.path.join(".", "build_files", "scons", "tools")
@@ -58,7 +56,6 @@
 
 import Blender
 import btools
-import bcolors
 
 EnsureSConsVersion(1,0,0)
 
@@ -121,7 +118,7 @@
 
 if bitness:
     B.bitness = bitness
-else: 
+else:
     B.bitness = tempbitness
 
 
@@ -140,6 +137,8 @@
     B.quickie=[]
 
 toolset = B.arguments.get('BF_TOOLSET', None)
+vcver = B.arguments.get('MSVS_VERSION', '9.0')
+
 if toolset:
     print "Using " + toolset
     if toolset=='mstoolkit':
@@ -151,9 +150,9 @@
             btools.SetupSpawn(env)
 else:
     if bitness==64 and platform=='win32':
-        env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+        env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64', MSVC_VERSION=vcver)
     else:
-        env = BlenderEnvironment(ENV = os.environ)
+        env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86', MSVC_VERSION=vcver)
 
 if not env:
     print "Could not create a build environment"
@@ -172,6 +171,10 @@
     elif env['CC'] in ['gcc']:
         platform = 'win64-mingw' if bitness == 64 else 'win32-mingw'
 
+if 'mingw' in platform:
+    print "Setting custom spawn function"
+    btools.SetupSpawn(env)
+
 env.SConscriptChdir(0)
 
 # Remove major kernel version from linux platform.
@@ -303,7 +306,7 @@
             env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
             env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers'
 
-    # for now, Mac builders must download and install the JackOSX framework 
+    # for now, Mac builders must download and install the JackOSX framework
     # necessary header file lives here when installed:
     # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
     if env['WITH_BF_JACK'] == 1:
@@ -313,13 +316,13 @@
         else:
             env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
 
-    if env['WITH_BF_CYCLES_OSL'] == 1:	
+    if env['WITH_BF_CYCLES_OSL'] == 1:
         OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
         # we need 2 variants of passing the oslexec with the force_load option, string and list type atm
         env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
         env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
 
-    # Trying to get rid of eventually clashes, we export some explicite as local symbols		
+    # Trying to get rid of eventually clashes, we export some explicite as local symbols
     env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map'])
 
 if env['WITH_BF_OPENMP'] == 1:
@@ -330,10 +333,10 @@
                 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
                 env['CCFLAGS'].append('-openmp')
             else:
-                env.Append(CCFLAGS=['-fopenmp']) 
+                env.Append(CCFLAGS=['-fopenmp'])
 
 if env['WITH_GHOST_COCOA'] == True:
-    env.Append(CPPFLAGS=['-DGHOST_COCOA']) 
+    env.Append(CPPFLAGS=['-DGHOST_COCOA'])
 
 if env['USE_QTKIT'] == True:
     env.Append(CPPFLAGS=['-DUSE_QTKIT'])
@@ -370,7 +373,7 @@
 
 # build with ocean sim?
 if env['WITH_BF_OCEANSIM'] == 1:

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list