[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42697] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 42692.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Dec 17 22:24:40 CET 2011
Revision: 42697
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42697
Author: kjym3
Date: 2011-12-17 21:24:39 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 42692.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42692
Modified Paths:
--------------
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/SConscript
branches/soc-2008-mxcurioni/extern/libmv/bundle.sh
branches/soc-2008-mxcurioni/extern/libmv/files.txt
branches/soc-2008-mxcurioni/extern/libmv/mkfiles.sh
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2008-mxcurioni/intern/audaspace/jack/AUD_JackDevice.h
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/release/datafiles/splash.png
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/anim.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/codecs.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/endian.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/mjpeg.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/options.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/rgb32.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/camera.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image_gen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/suggestions.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fileops.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rand.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_api/spacetypes.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/bmp.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_gamma.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_normal.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_gamma.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:34011-39896,39898-40096,40098-42556
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:34011-39896,39898-40096,40098-42692
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-12-17 21:24:39 UTC (rev 42697)
@@ -272,7 +272,7 @@
if k not in B.arguments:
env[k] = v
-# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
if env['OURPLATFORM']=='darwin':
print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
print "Available " + env['MACOSX_SDK_CHECK']
@@ -291,6 +291,16 @@
else:
env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+ # 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:
+ if not os.path.exists('/Library/Frameworks/Jackmp.framework'):
+ print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
+ env['WITH_BF_JACK'] = 0
+ else:
+ env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-12-17 21:24:39 UTC (rev 42697)
@@ -96,6 +96,7 @@
# Cycles
WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-12-17 21:24:39 UTC (rev 42697)
@@ -95,5 +95,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-12-17 21:24:39 UTC (rev 42697)
@@ -96,6 +96,7 @@
# Cycles
WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
@@ -116,5 +117,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py 2011-12-17 21:24:39 UTC (rev 42697)
@@ -148,12 +148,12 @@
WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-# TODO - set proper paths here (add precompiled to lib/ ? )
-WITH_BF_JACK = False
-BF_JACK = '/usr'
-BF_JACK_INC = '${BF_JACK}/include/jack'
+# we use simply jack framework
+WITH_BF_JACK = True
+BF_JACK = '/Library/Frameworks/Jackmp.framework'
+BF_JACK_INC = '${BF_JACK}/headers'
BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
+BF_JACK_LIBPATH = '${BF_JACK}'
WITH_BF_SNDFILE = True
BF_SNDFILE = LIBDIR + '/sndfile'
Modified: branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt 2011-12-17 21:24:39 UTC (rev 42697)
@@ -45,7 +45,6 @@
common/cubic_ccd_wrapper.cpp
common/fe_ccd_wrapper.cpp
common/fileio.cpp
- common/gluvi.cpp
common/levelset.cpp
common/makelevelset2.cpp
common/makelevelset3.cpp
@@ -82,7 +81,6 @@
common/clamped_spline.h
common/collisionqueries.h
common/fileio.h
- common/gluvi.h
common/grid3.h
common/hashtable.h
common/lapack_wrapper.h
@@ -122,7 +120,7 @@
common/tunicate/tunicate.h
)
-add_definitions(-DNOGUI)
+add_definitions(-DNO_GUI)
add_definitions(-DUSE_FORTRAN_BLAS)
blender_add_lib(extern_eltopo "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h 2011-12-17 21:24:39 UTC (rev 42697)
@@ -4,11 +4,13 @@
//#include <iostream>
//#include <vector>
+#ifdef USE_GUI
#ifdef __APPLE__
#include <GLUT/glut.h> // why does Apple have to put glut.h here...
#else
#include <GL/glut.h> // ...when everyone else puts it here?
#endif
+#endif
//#include "vec.h"
@@ -187,8 +189,10 @@
void ppm_screenshot(const char *filename_format, ...);
void sgi_screenshot(const char *filename_format, ...);
void set_generic_lights(void);
+#ifdef USE_GUI
void set_generic_material(float r, float g, float b, GLenum face=GL_FRONT_AND_BACK);
void set_matte_material(float r, float g, float b, GLenum face=GL_FRONT_AND_BACK);
+#endif
//@@@@@@@ USEFUL FUNCTIONALITY:
void draw_3d_arrow(const float base[3], const float point[3], float arrow_head_length=0);
//void draw_2d_arrow(const Vec2f base, const Vec2f point, float arrow_head_length);
Modified: branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp 2011-12-17 21:24:39 UTC (rev 42697)
@@ -1,6 +1,11 @@
#include <cfloat>
#include "predicates.h"
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#define random() rand() // not sure if this define is valid
+#define _Ios_Fmtflags ios::fmtflags
+#endif
+
static void print_hex( double d )
{
std::_Ios_Fmtflags originalFlags = std::cout.flags();
Modified: branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp 2011-12-17 21:24:39 UTC (rev 42697)
@@ -1,7 +1,16 @@
// Released into the public domain by Robert Bridson, 2009.
#include <cassert>
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#include <float.h>
+#pragma fenv_access (on)
+#define FE_UPWARD _RC_UP
+#define FE_DOWNWARD _RC_DOWN
+#define FE_TONEAREST _RC_NEAR
+#define fesetround(r) (_controlfp(r, _MCW_RC))
+#else
#include <fenv.h>
+#endif
#include <cmath>
#include <limits>
#include "tunicate.h"
Modified: branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp 2011-12-17 21:24:39 UTC (rev 42697)
@@ -2,7 +2,12 @@
#include <algorithm>
#include <cassert>
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#include <float.h>
+#pragma fenv_access (on)
+#else
#include <fenv.h>
+#endif
#include <cmath>
#include <limits>
#include "tunicate.h"
Modified: branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp 2011-12-17 21:24:39 UTC (rev 42697)
@@ -18,6 +18,7 @@
#include <deque>
#include <queue>
+#ifdef USE_GUI
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
@@ -26,6 +27,7 @@
#endif
#include <GL/gl.h>
#endif
+#endif
#include <vec.h>
#include <mat.h>
Modified: branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp 2011-12-17 21:24:39 UTC (rev 42697)
@@ -19,6 +19,7 @@
#include <vector>
#include <queue>
+#ifdef USE_GUI
#ifdef __APPLE__
#include <OpenGL/gl.h>
#include <GLUT/glut.h>
@@ -30,6 +31,7 @@
#include <GL/gl.h>
#include <GL/glut.h>
#endif
+#endif
#include <ccd_wrapper.h>
#include <cassert>
Modified: branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt 2011-12-17 21:23:02 UTC (rev 42696)
+++ branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt 2011-12-17 21:24:39 UTC (rev 42697)
@@ -22,6 +22,10 @@
#
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list