[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39752] branches/soc-2011-carrot: Merge with trunk r39750
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Sun Aug 28 18:46:41 CEST 2011
Revision: 39752
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39752
Author: miikah
Date: 2011-08-28 16:46:40 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Merge with trunk r39750
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39750
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/SConstruct
branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-carrot/build_files/buildbot/slave_compile.py
branches/soc-2011-carrot/build_files/buildbot/slave_pack.py
branches/soc-2011-carrot/build_files/cmake/buildinfo.cmake
branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-carrot/build_files/cmake/macros.cmake
branches/soc-2011-carrot/build_files/cmake/packaging.cmake
branches/soc-2011-carrot/build_files/package_spec/rpm/blender.spec.in
branches/soc-2011-carrot/build_files/scons/config/darwin-config.py
branches/soc-2011-carrot/build_files/scons/config/linuxcross-config.py
branches/soc-2011-carrot/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-carrot/build_files/scons/config/win32-vc-config.py
branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
branches/soc-2011-carrot/build_files/scons/tools/Blender.py
branches/soc-2011-carrot/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-carrot/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-carrot/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-carrot/intern/itasc/kdl/frames_io.cpp
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_types.py
branches/soc-2011-carrot/release/scripts/modules/console_python.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/release/scripts/templates/operator_export.py
branches/soc-2011-carrot/release/scripts/templates/operator_simple.py
branches/soc-2011-carrot/source/blender/avi/intern/avi.c
branches/soc-2011-carrot/source/blender/blenkernel/BKE_image.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/library.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/material.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/multires.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/object.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-carrot/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_string.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-carrot/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-carrot/source/blender/blenlib/intern/fileops.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-carrot/source/blender/blenlib/intern/noise.c
branches/soc-2011-carrot/source/blender/blenlib/intern/string.c
branches/soc-2011-carrot/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
branches/soc-2011-carrot/source/blender/collada/CMakeLists.txt
branches/soc-2011-carrot/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-carrot/source/blender/collada/SConscript
branches/soc-2011-carrot/source/blender/editors/animation/anim_markers.c
branches/soc-2011-carrot/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-carrot/source/blender/editors/armature/editarmature.c
branches/soc-2011-carrot/source/blender/editors/include/ED_view3d.h
branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_icons.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_layout.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/object/object_modifier.c
branches/soc-2011-carrot/source/blender/editors/physics/particle_edit.c
branches/soc-2011-carrot/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-carrot/source/blender/editors/render/render_preview.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_edit.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_ops.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-carrot/source/blender/editors/space_console/space_console.c
branches/soc-2011-carrot/source/blender/editors/space_file/file_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/SConscript
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-carrot/source/blender/editors/space_text/space_text.c
branches/soc-2011-carrot/source/blender/editors/space_text/text_ops.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-carrot/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-carrot/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-carrot/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-carrot/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-carrot/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-carrot/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2011-carrot/source/blender/imbuf/intern/filter.c
branches/soc-2011-carrot/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-carrot/source/blender/imbuf/intern/tiff.c
branches/soc-2011-carrot/source/blender/imbuf/intern/util.c
branches/soc-2011-carrot/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-carrot/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-carrot/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_props.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
branches/soc-2011-carrot/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
branches/soc-2011-carrot/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-carrot/source/blender/windowmanager/SConscript
branches/soc-2011-carrot/source/blender/windowmanager/WM_api.h
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-carrot/source/creator/CMakeLists.txt
branches/soc-2011-carrot/source/creator/buildinfo.c
branches/soc-2011-carrot/source/creator/creator.c
branches/soc-2011-carrot/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-carrot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-carrot/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Material.h
branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2011-carrot/source/gameengine/VideoTexture/Exception.cpp
Added Paths:
-----------
branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-carrot/doc/python_api/examples/bpy.types.ID.user_clear.1.py
branches/soc-2011-carrot/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-carrot/doc/python_api/rst/info_overview.rst
branches/soc-2011-carrot/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-carrot/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-carrot/source/blender/imbuf/intern/indexer.c
branches/soc-2011-carrot/source/blender/imbuf/intern/indexer_dv.c
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
branches/soc-2011-carrot/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-39589
+ /trunk/blender:36828-39750
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-08-28 16:36:47 UTC (rev 39751)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-08-28 16:46:40 UTC (rev 39752)
@@ -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)
@@ -668,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
@@ -694,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()
@@ -816,7 +842,13 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
- set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+ set(OPENCOLLADA_INCLUDE_DIRS
+ ${LIBDIR}/gcc/opencollada/include/COLLADAStreamWriter/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
+ ${LIBDIR}/gcc/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)
@@ -825,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()
@@ -1027,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/soc-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct 2011-08-28 16:36:47 UTC (rev 39751)
+++ branches/soc-2011-carrot/SConstruct 2011-08-28 16:46:40 UTC (rev 39752)
@@ -269,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')
Modified: branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py 2011-08-28 16:36:47 UTC (rev 39751)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py 2011-08-28 16:46:40 UTC (rev 39752)
@@ -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/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py 2011-08-28 16:36:47 UTC (rev 39751)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py 2011-08-28 16:46:40 UTC (rev 39752)
@@ -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/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-28 16:36:47 UTC (rev 39751)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py 2011-08-28 16:46:40 UTC (rev 39752)
@@ -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}/lib64'
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/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py 2011-08-28 16:36:47 UTC (rev 39751)
+++ branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py 2011-08-28 16:46:40 UTC (rev 39752)
@@ -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}/lib64'
BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list