[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57643] branches/soc-2013-rigid_body_sim: svn merge -r57524:57642 ^/trunk/blender
Sergej Reich
sergej.reich at googlemail.com
Fri Jun 21 20:18:37 CEST 2013
Revision: 57643
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57643
Author: sergof
Date: 2013-06-21 18:18:37 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
svn merge -r57524:57642 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57524
Modified Paths:
--------------
branches/soc-2013-rigid_body_sim/CMakeLists.txt
branches/soc-2013-rigid_body_sim/SConstruct
branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh
branches/soc-2013-rigid_body_sim/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
branches/soc-2013-rigid_body_sim/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
branches/soc-2013-rigid_body_sim/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2013-rigid_body_sim/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2013-rigid_body_sim/build_files/buildbot/slave_compile.py
branches/soc-2013-rigid_body_sim/build_files/buildbot/slave_pack.py
branches/soc-2013-rigid_body_sim/build_files/cmake/macros.cmake
branches/soc-2013-rigid_body_sim/build_files/scons/config/darwin-config.py
branches/soc-2013-rigid_body_sim/build_files/scons/config/linux-config.py
branches/soc-2013-rigid_body_sim/build_files/scons/config/win32-mingw-config.py
branches/soc-2013-rigid_body_sim/build_files/scons/config/win32-vc-config.py
branches/soc-2013-rigid_body_sim/build_files/scons/config/win64-mingw-config.py
branches/soc-2013-rigid_body_sim/build_files/scons/config/win64-vc-config.py
branches/soc-2013-rigid_body_sim/build_files/scons/tools/btools.py
branches/soc-2013-rigid_body_sim/intern/audaspace/intern/AUD_Sequencer.cpp
branches/soc-2013-rigid_body_sim/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/SConscript
branches/soc-2013-rigid_body_sim/intern/cycles/blender/addon/__init__.py
branches/soc-2013-rigid_body_sim/intern/cycles/blender/addon/properties.py
branches/soc-2013-rigid_body_sim/intern/cycles/blender/addon/ui.py
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/bvh/bvh.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/device/device_cuda.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/device/device_opencl.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/SConscript
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel.cl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_path.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_random.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_types.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2013-rigid_body_sim/intern/cycles/render/light.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/nodes.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/object.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/osl.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/shader.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/svm.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_cuda.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_cuda.h
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_math.h
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_system.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_types.h
branches/soc-2013-rigid_body_sim/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-rigid_body_sim/release/scripts/modules/addon_utils.py
branches/soc-2013-rigid_body_sim/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-rigid_body_sim/source/blender/blenfont/intern/blf_lang.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/blender.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/displist.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/editmesh_bvh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/paint.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/string.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/winstuff.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/readfile.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/writefile.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/bmesh_class.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_path.c
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_mesh.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/UI_interface.h
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_layout.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_regions.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_vgroup.c
branches/soc-2013-rigid_body_sim/source/blender/editors/screen/screendump.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sound/sound_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/file_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/filesel.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/image_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform.h
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_generics.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_snap.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-rigid_body_sim/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/initrender.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/pipeline.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/shadeinput.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/zbuf.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/WM_api.h
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/WM_types.h
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-rigid_body_sim/source/creator/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/creator/creator.c
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Added Paths:
-----------
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_properties.py
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_autoexec.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/autoexec.c
Removed Paths:
-------------
branches/soc-2013-rigid_body_sim/source/blender/editors/space_buttons/buttons_header.c
Property Changed:
----------------
branches/soc-2013-rigid_body_sim/
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-rigid_body_sim
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57521
+ /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:57395-57521,57525-57642
Modified: branches/soc-2013-rigid_body_sim/CMakeLists.txt
===================================================================
--- branches/soc-2013-rigid_body_sim/CMakeLists.txt 2013-06-21 18:01:17 UTC (rev 57642)
+++ branches/soc-2013-rigid_body_sim/CMakeLists.txt 2013-06-21 18:18:37 UTC (rev 57643)
@@ -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-rigid_body_sim/SConstruct
===================================================================
--- branches/soc-2013-rigid_body_sim/SConstruct 2013-06-21 18:01:17 UTC (rev 57642)
+++ branches/soc-2013-rigid_body_sim/SConstruct 2013-06-21 18:18:37 UTC (rev 57643)
@@ -137,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':
@@ -148,9 +150,9 @@
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64', MSVC_VERSION=vcver)
else:
- env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86', MSVC_VERSION=vcver)
if not env:
print "Could not create a build environment"
@@ -384,6 +386,8 @@
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CPPFLAGS'].append('-DWITH_AVI')
env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS')
if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
@@ -940,7 +944,10 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
- dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ pass
+ else:
+ dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
Modified: branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh 2013-06-21 18:01:17 UTC (rev 57642)
+++ branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh 2013-06-21 18:18:37 UTC (rev 57643)
@@ -1550,7 +1550,7 @@
tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
-xf $_src.tar.gz
cd $_src
- git checkout blender-fixes
+ #git checkout blender-fixes
cd $CWD
fi
@@ -2278,8 +2278,18 @@
fi
_suse_rel="`grep VERSION /etc/SuSE-release | gawk '{print $3}'`"
- sudo zypper ar -f http://packman.inode.at/suse/openSUSE_$_suse_rel/ packman
+ INFO ""
+ INFO "About to add 'packman' repository from http://packman.inode.at/suse/openSUSE_$_suse_rel/"
+ INFO "This is only needed if you do not already have a packman repository enabled..."
+ read -p "Do you want to add this repo (Y/n)?"
+ if [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" == "y" ]; then
+ INFO " Installing packman..."
+ sudo zypper ar --refresh --name 'Packman Repository' http://ftp.gwdg.de/pub/linux/packman/suse/openSUSE_$_suse_rel/ ftp.gwdg.de-suse
+ INFO " Done."
+ else
+ INFO " Skipping packman installation."
+ fi
sudo zypper --non-interactive --gpg-auto-import-keys update --auto-agree-with-licenses
fi
Modified: branches/soc-2013-rigid_body_sim/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list