[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39559] branches/soc-2011-radish: Merged 39338-39558
Jason Hays
jason_hays22 at mymail.eku.edu
Fri Aug 19 19:15:30 CEST 2011
Revision: 39559
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39559
Author: jason_hays22
Date: 2011-08-19 17:15:30 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Merged 39338-39558
Modified Paths:
--------------
branches/soc-2011-radish/GNUmakefile
branches/soc-2011-radish/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2011-radish/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-radish/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-radish/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-radish/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-radish/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-radish/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-radish/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-radish/source/blender/blenkernel/intern/anim.c
branches/soc-2011-radish/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-radish/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-radish/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-radish/source/blender/blenkernel/intern/displist.c
branches/soc-2011-radish/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-radish/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-radish/source/blender/blenkernel/intern/nla.c
branches/soc-2011-radish/source/blender/blenkernel/intern/node.c
branches/soc-2011-radish/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-radish/source/blender/blenkernel/intern/texture.c
branches/soc-2011-radish/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-radish/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-radish/source/blender/blenlib/intern/jitter.c
branches/soc-2011-radish/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-radish/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-radish/source/blender/blenlib/intern/rct.c
branches/soc-2011-radish/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-radish/source/blender/editors/armature/poseSlide.c
branches/soc-2011-radish/source/blender/editors/include/ED_node.h
branches/soc-2011-radish/source/blender/editors/interface/interface.c
branches/soc-2011-radish/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-radish/source/blender/editors/interface/interface_intern.h
branches/soc-2011-radish/source/blender/editors/interface/interface_layout.c
branches/soc-2011-radish/source/blender/editors/interface/interface_regions.c
branches/soc-2011-radish/source/blender/editors/interface/interface_utils.c
branches/soc-2011-radish/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-radish/source/blender/editors/object/object_add.c
branches/soc-2011-radish/source/blender/editors/object/object_bake.c
branches/soc-2011-radish/source/blender/editors/object/object_edit.c
branches/soc-2011-radish/source/blender/editors/object/object_transform.c
branches/soc-2011-radish/source/blender/editors/render/render_update.c
branches/soc-2011-radish/source/blender/editors/screen/area.c
branches/soc-2011-radish/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-radish/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-radish/source/blender/editors/space_console/console_ops.c
branches/soc-2011-radish/source/blender/editors/space_file/file_ops.c
branches/soc-2011-radish/source/blender/editors/space_file/filelist.c
branches/soc-2011-radish/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-radish/source/blender/editors/space_node/node_edit.c
branches/soc-2011-radish/source/blender/editors/space_node/node_header.c
branches/soc-2011-radish/source/blender/editors/space_node/node_intern.h
branches/soc-2011-radish/source/blender/editors/space_node/node_select.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-radish/source/blender/editors/space_text/text_python.c
branches/soc-2011-radish/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-radish/source/blender/editors/transform/transform.c
branches/soc-2011-radish/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-radish/source/blender/gpu/GPU_extensions.h
branches/soc-2011-radish/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-radish/source/blender/imbuf/intern/filter.c
branches/soc-2011-radish/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-radish/source/blender/makesrna/RNA_access.h
branches/soc-2011-radish/source/blender/makesrna/RNA_types.h
branches/soc-2011-radish/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-radish/source/blender/python/intern/bpy_rna.c
branches/soc-2011-radish/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-radish/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-radish/source/blender/render/intern/source/convertblender.c
branches/soc-2011-radish/source/blender/render/intern/source/rayshade.c
branches/soc-2011-radish/source/blender/render/intern/source/render_texture.c
branches/soc-2011-radish/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-radish/source/blender/render/intern/source/volumetric.c
branches/soc-2011-radish/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-radish/source/gameengine/Ketsji/KX_Light.cpp
Added Paths:
-----------
branches/soc-2011-radish/build_files/cmake/config/
branches/soc-2011-radish/build_files/cmake/config/blender_headless.cmake
branches/soc-2011-radish/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-radish/build_files/cmake/config/bpy_module.cmake
Removed Paths:
-------------
branches/soc-2011-radish/build_files/cmake/config/blender_headless.cmake
branches/soc-2011-radish/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-radish/build_files/cmake/config/bpy_module.cmake
Property Changed:
----------------
branches/soc-2011-radish/
branches/soc-2011-radish/intern/audaspace/OpenAL/
branches/soc-2011-radish/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:39258-39296
/trunk/blender:36835-39338
+ /trunk:39258-39296
/trunk/blender:36835-39558
Modified: branches/soc-2011-radish/GNUmakefile
===================================================================
--- branches/soc-2011-radish/GNUmakefile 2011-08-19 16:21:29 UTC (rev 39558)
+++ branches/soc-2011-radish/GNUmakefile 2011-08-19 17:15:30 UTC (rev 39559)
@@ -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
Deleted: branches/soc-2011-radish/build_files/cmake/config/blender_headless.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_headless.cmake 2011-08-19 16:21:29 UTC (rev 39558)
+++ branches/soc-2011-radish/build_files/cmake/config/blender_headless.cmake 2011-08-19 17:15:30 UTC (rev 39559)
@@ -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/soc-2011-radish/build_files/cmake/config/blender_headless.cmake (from rev 39558, trunk/blender/build_files/cmake/config/blender_headless.cmake)
===================================================================
--- branches/soc-2011-radish/build_files/cmake/config/blender_headless.cmake (rev 0)
+++ branches/soc-2011-radish/build_files/cmake/config/blender_headless.cmake 2011-08-19 17:15:30 UTC (rev 39559)
@@ -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/soc-2011-radish/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake 2011-08-19 16:21:29 UTC (rev 39558)
+++ branches/soc-2011-radish/build_files/cmake/config/blender_lite.cmake 2011-08-19 17:15:30 UTC (rev 39559)
@@ -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)
-set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_FRAMESERVER OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_HDR OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_OPENEXR OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_OPENJPEG OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_REDCODE OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_TIFF OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF OFF CACHE FORCE BOOL)
-set(WITH_INTERNATIONAL OFF CACHE FORCE BOOL)
-set(WITH_JACK OFF CACHE FORCE BOOL)
-set(WITH_LZMA OFF CACHE FORCE BOOL)
-set(WITH_LZO OFF CACHE FORCE BOOL)
-set(WITH_MOD_BOOLEAN OFF CACHE FORCE BOOL)
-set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL)
-set(WITH_MOD_FLUID OFF CACHE FORCE BOOL)
-set(WITH_MOD_SMOKE OFF CACHE FORCE BOOL)
-set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
-set(WITH_OPENAL OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLLADA OFF CACHE FORCE BOOL)
-set(WITH_OPENMP OFF CACHE FORCE BOOL)
-set(WITH_PYTHON_INSTALL OFF CACHE FORCE BOOL)
-set(WITH_RAYOPTIMIZATION OFF CACHE FORCE BOOL)
-set(WITH_SAMPLERATE OFF CACHE FORCE BOOL)
-set(WITH_SDL OFF CACHE FORCE BOOL)
-set(WITH_X11_XINPUT OFF CACHE FORCE BOOL)
Copied: branches/soc-2011-radish/build_files/cmake/config/blender_lite.cmake (from rev 39558, trunk/blender/build_files/cmake/config/blender_lite.cmake)
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list