[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39355] branches/soc-2011-cucumber: Merge from trunk r39354
Daniel Stokes
kupomail at gmail.com
Sat Aug 13 02:39:54 CEST 2011
Revision: 39355
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39355
Author: kupoman
Date: 2011-08-13 00:39:53 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Merge from trunk r39354
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39354
Modified Paths:
--------------
branches/soc-2011-cucumber/CMakeLists.txt
branches/soc-2011-cucumber/SConstruct
branches/soc-2011-cucumber/build_files/buildbot/master.cfg
branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py
branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py
branches/soc-2011-cucumber/build_files/cmake/macros.cmake
branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py
branches/soc-2011-cucumber/build_files/scons/tools/btools.py
branches/soc-2011-cucumber/doc/doxygen/Doxyfile
branches/soc-2011-cucumber/doc/python_api/rst/bge.logic.rst
branches/soc-2011-cucumber/intern/ghost/CMakeLists.txt
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-cucumber/release/datafiles/splash.png
branches/soc-2011-cucumber/release/scripts/modules/addon_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy/__init__.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpyml.py
branches/soc-2011-cucumber/release/scripts/modules/bpyml_ui.py
branches/soc-2011-cucumber/release/scripts/modules/rna_info.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/image.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-cucumber/release/scripts/templates/operator_modal.py
branches/soc-2011-cucumber/release/scripts/templates/operator_modal_draw.py
branches/soc-2011-cucumber/release/scripts/templates/operator_modal_timer.py
branches/soc-2011-cucumber/release/scripts/templates/operator_modal_view3d.py
branches/soc-2011-cucumber/release/text/readme.html
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-cucumber/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/blender.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/unit.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-cucumber/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-cucumber/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
branches/soc-2011-cucumber/source/blender/blenloader/intern/writefile.c
branches/soc-2011-cucumber/source/blender/editors/curve/editfont.c
branches/soc-2011-cucumber/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_node.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_object.h
branches/soc-2011-cucumber/source/blender/editors/include/UI_interface.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_icons.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_regions.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_style.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_utils.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-cucumber/source/blender/editors/interface/resources.c
branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
branches/soc-2011-cucumber/source/blender/editors/object/object_transform.c
branches/soc-2011-cucumber/source/blender/editors/render/render_update.c
branches/soc-2011-cucumber/source/blender/editors/space_file/file_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_image/image_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_header.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_node/node_select.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-cucumber/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform.h
branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_ops.c
branches/soc-2011-cucumber/source/blender/gpu/GPU_extensions.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_library.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.h
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-cucumber/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/windowmanager/WM_api.h
branches/soc-2011-cucumber/source/blender/windowmanager/WM_types.h
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-cucumber/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-cucumber/source/tests/CMakeLists.txt
branches/soc-2011-cucumber/source/tests/bl_run_operators.py
branches/soc-2011-cucumber/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-cucumber/source/blender/windowmanager/WM_keymap.h
Removed Paths:
-------------
branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-cucumber/source/blender/editors/transform/transform_ndofinput.c
Property Changed:
----------------
branches/soc-2011-cucumber/
branches/soc-2011-cucumber/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36829-39034
+ /trunk/blender:36829-39354
Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/CMakeLists.txt 2011-08-13 00:39:53 UTC (rev 39355)
@@ -1010,6 +1010,10 @@
if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
set(WITH_INPUT_NDOF OFF)
endif()
+
+ if(WITH_INPUT_NDOF)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient")
+ endif()
endif()
else()
Modified: branches/soc-2011-cucumber/SConstruct
===================================================================
--- branches/soc-2011-cucumber/SConstruct 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/SConstruct 2011-08-13 00:39:53 UTC (rev 39355)
@@ -253,14 +253,23 @@
if k not in B.arguments:
env[k] = v
-# detect presence of 3D_CONNEXION_CLIENT_LIBRARY for OSX
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
if env['OURPLATFORM']=='darwin':
- envi = Environment()
- conf = Configure(envi)
- if not conf.CheckCHeader('ConnexionClientAPI.h'): # CheckCXXHeader if it is c++ !
+ print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
+ print "Available " + env['MACOSX_SDK_CHECK']
+ if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"
+ 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
+ # 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
- envi = conf.Finish()
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
if env['WITH_BF_OPENMP'] == 1:
Modified: branches/soc-2011-cucumber/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/master.cfg 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/build_files/buildbot/master.cfg 2011-08-13 00:39:53 UTC (rev 39355)
@@ -116,7 +116,7 @@
add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'win32_scons', 'windows', generic_builder)
add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'windows', generic_builder)
+add_builder(c, 'win64_scons', 'win64', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
Modified: branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py 2011-08-13 00:39:53 UTC (rev 39355)
@@ -134,7 +134,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py 2011-08-13 00:39:53 UTC (rev 39355)
@@ -98,7 +98,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: branches/soc-2011-cucumber/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/macros.cmake 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/build_files/cmake/macros.cmake 2011-08-13 00:39:53 UTC (rev 39355)
@@ -62,6 +62,10 @@
foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC})
+ # for checking for invalid includes, disable for regular use
+ ##if(NOT EXISTS "${_ABS_INC}/")
+ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+ ##endif()
endforeach()
include_directories(${_ALL_INCS})
unset(_INC)
@@ -75,6 +79,9 @@
foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC})
+ ##if(NOT EXISTS "${_ABS_INC}/")
+ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+ ##endif()
endforeach()
include_directories(SYSTEM ${_ALL_INCS})
unset(_INC)
Modified: branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py 2011-08-13 00:26:18 UTC (rev 39354)
+++ branches/soc-2011-cucumber/build_files/scons/config/darwin-config.py 2011-08-13 00:39:53 UTC (rev 39355)
@@ -21,14 +21,23 @@
MAC_PROC=commands.getoutput(cmd)
cmd = 'uname -r'
cmd_res=commands.getoutput(cmd)
-if cmd_res[0]=='7':
+
+if cmd_res[:1]=='7':
MAC_CUR_VER='10.3'
-elif cmd_res[0]=='8':
+elif cmd_res[:1]=='8':
MAC_CUR_VER='10.4'
-elif cmd_res[0]=='9':
+elif cmd_res[:1]=='9':
MAC_CUR_VER='10.5'
-elif cmd_res[0]=='10':
+elif cmd_res[:2]=='10':
MAC_CUR_VER='10.6'
+elif cmd_res[:2]=='11':
+ MAC_CUR_VER='10.7'
+cmd = 'xcodebuild -version'
+cmd_xcode=commands.getoutput(cmd)
+XCODE_CUR_VER=cmd_xcode
+cmd = 'xcodebuild -showsdks'
+cmd_sdk=commands.getoutput(cmd)
+MACOSX_SDK_CHECK=cmd_sdk
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
USE_QTKIT=True # Carbon quicktime is not available for 64bit
@@ -37,8 +46,8 @@
# Default target OSX settings per architecture
# Can be customized
-if MACOSX_ARCHITECTURE == 'ppc':
-# ppc release are now made for 10.4
+if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
+# all releases are now made for 10.5 !
# MAC_MIN_VERS = '10.3'
# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
# LCGDIR = '#../lib/darwin-6.1-powerpc'
@@ -50,7 +59,7 @@
LCGDIR = '#../lib/darwin-8.0.0-powerpc'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
-elif MACOSX_ARCHITECTURE == 'i386':
+elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
MAC_MIN_VERS = '10.4'
MACOSX_DEPLOYMENT_TARGET = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
@@ -58,12 +67,22 @@
CC = 'gcc-4.0'
CXX = 'g++-4.0'
else :
- MAC_MIN_VERS = '10.5'
- MACOSX_DEPLOYMENT_TARGET = '10.5'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
- LCGDIR = '#../lib/darwin-9.x.universal'
- CC = 'gcc-4.2'
- CXX = 'g++-4.2'
+ if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
+ # OSX 10.5/6 with Xcode 3.x
+ MAC_MIN_VERS = '10.5'
+ MACOSX_DEPLOYMENT_TARGET = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+ else:
+ # OSX 10.6/7 with Xcode 4.x
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
LIBDIR = '${LCGDIR}'
@@ -71,8 +90,8 @@
################### Dependency settings ##################
#############################################################################
-#Defaults openMP to true if compiler (currently only gcc 4.2) handles it
-if CC == 'gcc-4.2':
+#Defaults openMP to true if compiler handles it
+if CC == 'gcc-4.2' or CC == 'llvm-gcc-4.2':
WITH_BF_OPENMP = True # multithreading for fluids, cloth and smoke
else:
WITH_BF_OPENMP = False
@@ -188,8 +207,8 @@
BF_GETTEXT_LIB = 'intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_GAMEENGINE=True
-WITH_BF_PLAYER = False
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
@@ -240,7 +259,7 @@
BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
#OpenCollada flags
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
@@ -265,8 +284,8 @@
elif MACOSX_ARCHITECTURE == 'x86_64':
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
-# SpaceNavigator and related 3D mice
-WITH_BF_3DMOUSE = False
+# SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
+WITH_BF_3DMOUSE = True
#############################################################################
################### various compile settings and flags ##################
@@ -285,31 +304,28 @@
CCFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
CXXFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
-if WITH_GHOST_COCOA==True:
+if WITH_GHOST_COCOA:
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
else:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list