[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39486] branches/vgroup_modifiers: Merging r39199 through r39485 from trunk into vgroup_modifiers.
Bastien Montagne
montagne29 at wanadoo.fr
Wed Aug 17 13:11:44 CEST 2011
Revision: 39486
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39486
Author: mont29
Date: 2011-08-17 11:11:43 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
Merging r39199 through r39485 from trunk into vgroup_modifiers.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39199
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39485
Modified Paths:
--------------
branches/vgroup_modifiers/GNUmakefile
branches/vgroup_modifiers/SConstruct
branches/vgroup_modifiers/build_files/buildbot/master.cfg
branches/vgroup_modifiers/build_files/scons/config/darwin-config.py
branches/vgroup_modifiers/build_files/scons/tools/btools.py
branches/vgroup_modifiers/doc/doxygen/Doxyfile
branches/vgroup_modifiers/doc/python_api/rst/bge.logic.rst
branches/vgroup_modifiers/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/vgroup_modifiers/release/datafiles/splash.png
branches/vgroup_modifiers/release/scripts/modules/bpy/__init__.py
branches/vgroup_modifiers/release/scripts/modules/bpy_extras/io_utils.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/animsys_update.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/image.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/mesh.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/nla.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/object.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/object_align.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/object_quick_effects.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/presets.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/sequencer.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/wm.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_armature.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_bone.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_camera.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_curve.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_empty.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_material.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_object.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_particle.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_common.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_field.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_scene.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_texture.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_world.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_console.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_dopesheet.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_filebrowser.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_graph.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_image.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_info.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_logic.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_nla.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_outliner.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_sequencer.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_time.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/vgroup_modifiers/release/scripts/templates/operator_modal.py
branches/vgroup_modifiers/release/scripts/templates/operator_modal_timer.py
branches/vgroup_modifiers/release/text/readme.html
branches/vgroup_modifiers/source/blender/blenkernel/BKE_DerivedMesh.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/displist.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/modifier.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/nla.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sequencer.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/unit.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/writeffmpeg.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_ghash.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c
branches/vgroup_modifiers/source/blender/editors/armature/poseSlide.c
branches/vgroup_modifiers/source/blender/editors/datafiles/splash.png.c
branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_paint.c
branches/vgroup_modifiers/source/blender/editors/include/ED_node.h
branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_utils.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_mods.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
branches/vgroup_modifiers/source/blender/editors/object/object_add.c
branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
branches/vgroup_modifiers/source/blender/editors/object/object_transform.c
branches/vgroup_modifiers/source/blender/editors/render/render_update.c
branches/vgroup_modifiers/source/blender/editors/space_console/console_ops.c
branches/vgroup_modifiers/source/blender/editors/space_file/file_ops.c
branches/vgroup_modifiers/source/blender/editors/space_file/filelist.c
branches/vgroup_modifiers/source/blender/editors/space_nla/nla_edit.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_header.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_intern.h
branches/vgroup_modifiers/source/blender/editors/space_node/node_select.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/CMakeLists.txt
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_intern.h
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_ops.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/space_outliner.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_add.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_draw.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_edit.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_intern.h
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_ops.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_select.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_python.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_toolbar.c
branches/vgroup_modifiers/source/blender/gpu/GPU_extensions.h
branches/vgroup_modifiers/source/blender/imbuf/intern/anim_movie.c
branches/vgroup_modifiers/source/blender/imbuf/intern/filter.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_types.h
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_constraint.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_curve.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_build.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cast.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cloth.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_collision.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_curve.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_decimate.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_displace.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_edgesplit.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_explode.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_hook.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_lattice.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mask.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_multires.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_none.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particleinstance.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particlesystem.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shapekey.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_simpledeform.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smoke.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smooth.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_softbody.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_subsurf.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_surface.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_operator.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_anim.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_array.c
branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.c
branches/vgroup_modifiers/source/blender/render/intern/source/rayshade.c
branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
branches/vgroup_modifiers/source/blender/windowmanager/WM_types.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_files.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_init_exit.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_subwindow.c
branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Light.cpp
branches/vgroup_modifiers/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/vgroup_modifiers/build_files/cmake/config/
branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake
branches/vgroup_modifiers/build_files/cmake/config/blender_lite.cmake
branches/vgroup_modifiers/build_files/cmake/config/bpy_module.cmake
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_edit.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_select.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tools.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tree.c
Removed Paths:
-------------
branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake
branches/vgroup_modifiers/build_files/cmake/config/blender_lite.cmake
branches/vgroup_modifiers/build_files/cmake/config/bpy_module.cmake
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner.c
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:38694-38739,38741-39198
+ /trunk/blender:38694-38739,38741-39198,39200-39485
Modified: branches/vgroup_modifiers/GNUmakefile
===================================================================
--- branches/vgroup_modifiers/GNUmakefile 2011-08-17 10:13:24 UTC (rev 39485)
+++ branches/vgroup_modifiers/GNUmakefile 2011-08-17 11:11:43 UTC (rev 39486)
@@ -35,17 +35,33 @@
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+BUILD_TYPE:=Release
+BUILD_CMAKE_ARGS:=""
+# -----------------------------------------------------------------------------
+# additional targets for the build configuration
+
# support 'make debug'
ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_debug
BUILD_TYPE:=Debug
-else
- BUILD_TYPE:=Release
endif
+ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_lite
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake
+endif
+ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_bpy
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
+endif
+ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_bpy
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
+endif
+# -----------------------------------------------------------------------------
# Get the number of cores for threaded build
NPROCS:=1
ifeq ($(OS), Linux)
@@ -61,14 +77,14 @@
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
-
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+ cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
fi
@echo
@@ -80,9 +96,40 @@
@echo
debug: all
- # pass
+lite: all
+headless: all
+bpy: all
-# package types
+# -----------------------------------------------------------------------------
+# Helo for build targets
+help:
+ @echo ""
+ @echo "Convenience targets provided for building blender, (multiple at once can be used)"
+ @echo " * debug - build a debug binary"
+ @echo " * lite - disable non essential features for a smaller binary and faster build"
+ @echo " * headless - build without an interface (renderfarm or server automation)"
+ @echo " * bpy - build as a python module which can be loaded from python directly"
+ @echo ""
+ @echo "Project Files for IDE's"
+ @echo " * project_qtcreator - QtCreator Project Files"
+ @echo " * project_netbeans - NetBeans Project Files"
+ @echo " * project_eclipse - Eclipse CDT4 Project Files"
+ @echo ""
+ @echo "Package Targets"
+ @echo " * package_debian - build a debian package"
+ @echo " * package_pacman - build an arch linux pacmanpackage"
+ @echo " * package_archive - build an archive package"
+ @echo ""
+ @echo "Testing Targets (not assosiated with building blender)"
+ @echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
+ @echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
+ @echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
+ @echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
+ @echo ""
+
+# -----------------------------------------------------------------------------
+# Packages
+#
package_debian:
cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
@@ -93,7 +140,10 @@
make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release"
-# forward build targets
+
+# -----------------------------------------------------------------------------
+# Tests
+#
test:
cd $(BUILD_DIR) ; ctest . --output-on-failure
@@ -111,6 +161,21 @@
test_deprecated:
python3 source/tests/check_deprecated.py
+
+# -----------------------------------------------------------------------------
+# Project Files
+#
+
+project_qtcreator:
+ python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+
+project_netbeans:
+ python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+
+project_eclipse:
+ cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/vgroup_modifiers/SConstruct
===================================================================
--- branches/vgroup_modifiers/SConstruct 2011-08-17 10:13:24 UTC (rev 39485)
+++ branches/vgroup_modifiers/SConstruct 2011-08-17 11:11:43 UTC (rev 39486)
@@ -268,7 +268,8 @@
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
- env['FOUND_NDOF_DRIVERS'] = 0
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
if env['WITH_BF_OPENMP'] == 1:
Modified: branches/vgroup_modifiers/build_files/buildbot/master.cfg
===================================================================
--- branches/vgroup_modifiers/build_files/buildbot/master.cfg 2011-08-17 10:13:24 UTC (rev 39485)
+++ branches/vgroup_modifiers/build_files/buildbot/master.cfg 2011-08-17 11:11:43 UTC (rev 39486)
@@ -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)
Deleted: branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_headless.cmake 2011-08-17 10:13:24 UTC (rev 39485)
+++ branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake 2011-08-17 11:11:43 UTC (rev 39486)
@@ -1,24 +0,0 @@
-# headless configuration, useful in for servers or renderfarms
-# builds without a windowing system (X11/Windows/Cocoa).
-#
-# Example usage:
-# cmake -C../blender/build_files/cmake/config/blender_headless.cmake ../blender
-#
-
-set(WITH_HEADLESS ON CACHE FORCE BOOL)
-set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
-
-# disable audio, its possible some devs may want this but for now disable
-# so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
-set(WITH_SAMPLERATE OFF CACHE FORCE BOOL)
-set(WITH_FFTW3 OFF CACHE FORCE BOOL)
-set(WITH_JACK OFF CACHE FORCE BOOL)
-set(WITH_SDL OFF CACHE FORCE BOOL)
-set(WITH_OPENAL OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
-
-# other features which are not especially useful as a python module
-set(WITH_X11_XINPUT OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF OFF CACHE FORCE BOOL)
Copied: branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake (from rev 39485, trunk/blender/build_files/cmake/config/blender_headless.cmake)
===================================================================
--- branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake (rev 0)
+++ branches/vgroup_modifiers/build_files/cmake/config/blender_headless.cmake 2011-08-17 11:11:43 UTC (rev 39486)
@@ -0,0 +1,24 @@
+# headless configuration, useful in for servers or renderfarms
+# builds without a windowing system (X11/Windows/Cocoa).
+#
+# Example usage:
+# cmake -C../blender/build_files/cmake/config/blender_headless.cmake ../blender
+#
+
+set(WITH_HEADLESS ON CACHE FORCE BOOL)
+set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
+
+# disable audio, its possible some devs may want this but for now disable
+# so the python module doesnt hold the audio device and loads quickly.
+set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
+set(WITH_SAMPLERATE OFF CACHE FORCE BOOL)
+set(WITH_FFTW3 OFF CACHE FORCE BOOL)
+set(WITH_JACK OFF CACHE FORCE BOOL)
+set(WITH_SDL OFF CACHE FORCE BOOL)
+set(WITH_OPENAL OFF CACHE FORCE BOOL)
+set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
+set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
+
+# other features which are not especially useful as a python module
+set(WITH_X11_XINPUT OFF CACHE FORCE BOOL)
+set(WITH_INPUT_NDOF OFF CACHE FORCE BOOL)
Deleted: branches/vgroup_modifiers/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake 2011-08-17 10:13:24 UTC (rev 39485)
+++ branches/vgroup_modifiers/build_files/cmake/config/blender_lite.cmake 2011-08-17 11:11:43 UTC (rev 39486)
@@ -1,43 +0,0 @@
-# turn everything OFF CACHE FORCE BOOL) except for python which defaults to ON
-# and is needed for the UI
-#
-# Example usage:
-# cmake -C../blender/build_files/cmake/config/blender_lite.cmake ../blender
-#
-
-set(WITH_INSTALL_PORTABLE ON CACHE FORCE BOOL)
-
-set(WITH_BUILDINFO OFF CACHE FORCE BOOL)
-set(WITH_BUILTIN_GLEW OFF CACHE FORCE BOOL)
-set(WITH_BULLET OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
-set(WITH_FFTW3 OFF CACHE FORCE BOOL)
-set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
-set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list