[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37476] branches/soc-2011-pepper: Merge with trunk r37475.
Joerg Mueller
nexyon at gmail.com
Tue Jun 14 14:06:22 CEST 2011
Revision: 37476
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37476
Author: nexyon
Date: 2011-06-14 12:06:21 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Merge with trunk r37475.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37475
Modified Paths:
--------------
branches/soc-2011-pepper/CMakeLists.txt
branches/soc-2011-pepper/GNUmakefile
branches/soc-2011-pepper/SConstruct
branches/soc-2011-pepper/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-pepper/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/soc-2011-pepper/build_files/cmake/macros.cmake
branches/soc-2011-pepper/build_files/scons/config/win32-vc-config.py
branches/soc-2011-pepper/build_files/scons/config/win64-vc-config.py
branches/soc-2011-pepper/build_files/scons/tools/Blender.py
branches/soc-2011-pepper/doc/manpage/blender.1
branches/soc-2011-pepper/doc/python_api/rst/bge.logic.rst
branches/soc-2011-pepper/doc/python_api/rst/bge.types.rst
branches/soc-2011-pepper/intern/elbeem/extern/elbeem.h
branches/soc-2011-pepper/intern/elbeem/intern/simulation_object.cpp
branches/soc-2011-pepper/intern/elbeem/intern/solver_class.h
branches/soc-2011-pepper/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-pepper/intern/elbeem/intern/solver_interface.h
branches/soc-2011-pepper/intern/ghost/CMakeLists.txt
branches/soc-2011-pepper/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2011-pepper/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-pepper/release/scripts/modules/console/complete_namespace.py
branches/soc-2011-pepper/release/scripts/modules/console/intellisense.py
branches/soc-2011-pepper/release/scripts/modules/console_python.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-pepper/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_brush.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_multires.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-pepper/source/blender/blenkernel/intern/blender.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/brush.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/deform.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/multires.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/object.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/sca.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/scene.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-pepper/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-pepper/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-pepper/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-pepper/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-pepper/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-pepper/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-pepper/source/blender/blenlib/intern/path_util.c
branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
branches/soc-2011-pepper/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-pepper/source/blender/collada/EffectExporter.cpp
branches/soc-2011-pepper/source/blender/collada/LightExporter.cpp
branches/soc-2011-pepper/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-pepper/source/blender/editors/animation/anim_markers.c
branches/soc-2011-pepper/source/blender/editors/animation/anim_ops.c
branches/soc-2011-pepper/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-pepper/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-pepper/source/blender/editors/include/ED_mesh.h
branches/soc-2011-pepper/source/blender/editors/include/ED_particle.h
branches/soc-2011-pepper/source/blender/editors/include/ED_screen.h
branches/soc-2011-pepper/source/blender/editors/include/ED_types.h
branches/soc-2011-pepper/source/blender/editors/include/ED_util.h
branches/soc-2011-pepper/source/blender/editors/include/ED_view3d.h
branches/soc-2011-pepper/source/blender/editors/include/UI_interface.h
branches/soc-2011-pepper/source/blender/editors/include/UI_interface_icons.h
branches/soc-2011-pepper/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-pepper/source/blender/editors/interface/interface.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_draw.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_icons.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_intern.h
branches/soc-2011-pepper/source/blender/editors/interface/interface_layout.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_panel.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_regions.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_templates.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-pepper/source/blender/editors/interface/resources.c
branches/soc-2011-pepper/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-pepper/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2011-pepper/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-pepper/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-pepper/source/blender/editors/object/object_add.c
branches/soc-2011-pepper/source/blender/editors/object/object_bake.c
branches/soc-2011-pepper/source/blender/editors/object/object_modifier.c
branches/soc-2011-pepper/source/blender/editors/object/object_shapekey.c
branches/soc-2011-pepper/source/blender/editors/object/object_vgroup.c
branches/soc-2011-pepper/source/blender/editors/physics/particle_edit.c
branches/soc-2011-pepper/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-pepper/source/blender/editors/render/render_internal.c
branches/soc-2011-pepper/source/blender/editors/render/render_view.c
branches/soc-2011-pepper/source/blender/editors/screen/area.c
branches/soc-2011-pepper/source/blender/editors/screen/screen_edit.c
branches/soc-2011-pepper/source/blender/editors/screen/screen_ops.c
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-pepper/source/blender/editors/space_action/action_select.c
branches/soc-2011-pepper/source/blender/editors/space_action/space_action.c
branches/soc-2011-pepper/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-pepper/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-pepper/source/blender/editors/space_console/console_draw.c
branches/soc-2011-pepper/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-pepper/source/blender/editors/space_file/file_draw.c
branches/soc-2011-pepper/source/blender/editors/space_file/file_intern.h
branches/soc-2011-pepper/source/blender/editors/space_file/file_ops.c
branches/soc-2011-pepper/source/blender/editors/space_file/filelist.c
branches/soc-2011-pepper/source/blender/editors/space_file/filesel.c
branches/soc-2011-pepper/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-pepper/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-pepper/source/blender/editors/space_image/image_ops.c
branches/soc-2011-pepper/source/blender/editors/space_info/info_report.c
branches/soc-2011-pepper/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2011-pepper/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-pepper/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-pepper/source/blender/editors/space_node/node_edit.c
branches/soc-2011-pepper/source/blender/editors/space_node/node_select.c
branches/soc-2011-pepper/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-pepper/source/blender/editors/space_script/script_header.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-pepper/source/blender/editors/space_sound/sound_header.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-pepper/source/blender/editors/transform/transform.c
branches/soc-2011-pepper/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-pepper/source/blender/editors/transform/transform_generics.c
branches/soc-2011-pepper/source/blender/editors/util/ed_util.c
branches/soc-2011-pepper/source/blender/editors/util/editmode_undo.c
branches/soc-2011-pepper/source/blender/editors/util/undo.c
branches/soc-2011-pepper/source/blender/editors/util/util_intern.h
branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-pepper/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-pepper/source/blender/imbuf/intern/divers.c
branches/soc-2011-pepper/source/blender/imbuf/intern/filter.c
branches/soc-2011-pepper/source/blender/imbuf/intern/targa.c
branches/soc-2011-pepper/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-pepper/source/blender/makesrna/RNA_access.h
branches/soc-2011-pepper/source/blender/makesrna/RNA_define.h
branches/soc-2011-pepper/source/blender/makesrna/RNA_types.h
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-pepper/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-pepper/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2011-pepper/source/blender/nodes/intern/CMP_util.c
branches/soc-2011-pepper/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_driver.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_props.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.h
branches/soc-2011-pepper/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-pepper/source/blender/render/intern/include/render_types.h
branches/soc-2011-pepper/source/blender/render/intern/source/convertblender.c
branches/soc-2011-pepper/source/blender/render/intern/source/envmap.c
branches/soc-2011-pepper/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-pepper/source/blender/render/intern/source/pipeline.c
branches/soc-2011-pepper/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-pepper/source/blender/render/intern/source/render_texture.c
branches/soc-2011-pepper/source/blender/render/intern/source/rendercore.c
branches/soc-2011-pepper/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-pepper/source/blender/render/intern/source/sunsky.c
branches/soc-2011-pepper/source/blender/render/intern/source/volumetric.c
branches/soc-2011-pepper/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-pepper/source/blender/windowmanager/WM_api.h
branches/soc-2011-pepper/source/blender/windowmanager/WM_types.h
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-pepper/source/blenderplayer/CMakeLists.txt
branches/soc-2011-pepper/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-pepper/source/creator/CMakeLists.txt
branches/soc-2011-pepper/source/creator/SConscript
branches/soc-2011-pepper/source/creator/creator.c
branches/soc-2011-pepper/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-pepper/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-pepper/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2011-pepper/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-pepper/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-pepper/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-pepper/source/tests/CMakeLists.txt
branches/soc-2011-pepper/source/tests/bl_load_py_modules.py
Added Paths:
-----------
branches/soc-2011-pepper/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/soc-2011-pepper/intern/ghost/intern/GHOST_SystemNULL.h
branches/soc-2011-pepper/intern/ghost/intern/GHOST_WindowNULL.h
Property Changed:
----------------
branches/soc-2011-pepper/
Property changes on: branches/soc-2011-pepper
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36830-37149
+ /trunk/blender:36830-37475
Modified: branches/soc-2011-pepper/CMakeLists.txt
===================================================================
--- branches/soc-2011-pepper/CMakeLists.txt 2011-06-14 11:18:00 UTC (rev 37475)
+++ branches/soc-2011-pepper/CMakeLists.txt 2011-06-14 12:06:21 UTC (rev 37476)
@@ -98,6 +98,10 @@
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+
+option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF)
+mark_as_advanced(WITH_HEADLESS)
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -184,6 +188,9 @@
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
endif()
+#-----------------------------------------------------------------------------
+# Check for conflicting/unsupported configurations
+
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -205,9 +212,17 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
-# remove old vars
-unset(WITH_INSTALL CACHE)
+if(WITH_CODEC_QUICKTIME AND MINGW)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently unsupported, remove this "
+ "line if youre a developer who wants to add support.")
+endif()
+# may as well build python module without a UI
+if(WITH_PYTHON_MODULE)
+ set(WITH_HEADLESS ON)
+endif()
+
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -216,6 +231,9 @@
# linux only, not cached
set(WITH_BINRELOC OFF)
+# MAXOSX only, set to avoid uninitialized
+set(EXETYPE "")
+
# these are added to later on.
set(C_WARNINGS "")
set(CXX_WARNINGS "")
@@ -409,15 +427,19 @@
unset(JEMALLOC)
endif()
- find_package(X11 REQUIRED)
- find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
- mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
-
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB}")
+ set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(WITH_X11_XINPUT)
- list(APPEND LLIBS ${X11_Xinput_LIB})
+ if(NOT WITH_HEADLESS)
+ find_package(X11 REQUIRED)
+ find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
+ mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
+
+ list(APPEND LLIBS ${X11_X11_LIB})
+
+ if(WITH_X11_XINPUT)
+ list(APPEND LLIBS ${X11_Xinput_LIB})
+ endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -1019,7 +1041,7 @@
#-----------------------------------------------------------------------------
# Configure OpenGL.
find_package(OpenGL)
-blender_include_dirs("${OPENGL_INCLUDE_DIR}")
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
# unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake
# unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
Modified: branches/soc-2011-pepper/GNUmakefile
===================================================================
--- branches/soc-2011-pepper/GNUmakefile 2011-06-14 11:18:00 UTC (rev 37475)
+++ branches/soc-2011-pepper/GNUmakefile 2011-06-14 12:06:21 UTC (rev 37476)
@@ -64,21 +64,19 @@
# Build Blender
all:
- @echo
+ @echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- mkdir -p $(BUILD_DIR) ; \
- cd $(BUILD_DIR) ; \
- cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+ cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
fi
- @echo
+ @echo
@echo Building Blender ...
- cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
- @echo
+ make -C $(BUILD_DIR) -s -j $(NPROCS) install
+ @echo
@echo run blender from "$(BUILD_DIR)/bin/blender"
- @echo
+ @echo
debug: all
# pass
@@ -91,7 +89,7 @@
cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
package_archive:
- cd $(BUILD_DIR) ; make -s package_archive
+ make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release"
# forward build targets
@@ -109,6 +107,6 @@
@echo "written: test_cmake_consistency.log"
clean:
- cd $(BUILD_DIR) ; make clean
+ make -C $(BUILD_DIR) clean
.PHONY: all
Modified: branches/soc-2011-pepper/SConstruct
===================================================================
--- branches/soc-2011-pepper/SConstruct 2011-06-14 11:18:00 UTC (rev 37475)
+++ branches/soc-2011-pepper/SConstruct 2011-06-14 12:06:21 UTC (rev 37476)
@@ -306,10 +306,6 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
-if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming', 'win64-vc'):
- env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup')
- env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
-
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
@@ -409,17 +405,18 @@
B.propose_priorities()
dobj = B.buildinfo(env, "dynamic") + B.resources
+creob = B.creator(env)
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
- env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+ env.BlenderProg(B.root_build_dir, "blender", creob + mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
playerlist += B.create_blender_liblist(env, 'player2')
playerlist += B.create_blender_liblist(env, 'intern')
playerlist += B.create_blender_liblist(env, 'extern')
- env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+ env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
##### Now define some targets
Modified: branches/soc-2011-pepper/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/FindPythonLibsUnix.cmake 2011-06-14 11:18:00 UTC (rev 37475)
+++ branches/soc-2011-pepper/build_files/cmake/FindPythonLibsUnix.cmake 2011-06-14 12:06:21 UTC (rev 37476)
@@ -18,10 +18,18 @@
"m;mu;u; ")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+
set(_Python_PATHS
- "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}" "/opt/py${_PYTHON_VERSION_NO_DOTS}" "/usr" "/usr/local")
+ "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
+ "/opt/py${_PYTHON_VERSION_NO_DOTS}"
+ "/usr"
+ "/usr/local"
+)
-if(NOT DEFINED PYTHON_INCLUDE_DIRS)
+if(NOT DEFINED PYTHON_INCLUDE_DIRS OR
+ NOT DEFINED PYTHON_LIBRARY OR
+ NOT DEFINED PYTHON_LIBPATH)
+
message(STATUS "Looking for include Python.h")
set(_Found_PYTHON_H OFF)
@@ -53,20 +61,29 @@
if(NOT _Found_PYTHON_H)
message(FATAL_ERROR "Python.h not found")
endif()
+
+ unset(_Found_PYTHON_H)
+ unset(_Python_HEADER)
+ unset(_CURRENT_ABI_FLAGS)
+ unset(_CURRENT_PATH)
+
+
+ set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+ mark_as_advanced(PYTHON_INCLUDE_DIRS)
+ set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
+ mark_as_advanced(PYTHON_LIBRARY)
+ set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+ mark_as_advanced(PYTHON_LIBPATH)
+ # set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
endif()
+unset(_Python_ABI_FLAGS)
+unset(_Python_PATHS)
+
#=============================================================================
# now the python versions are found
-set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
-mark_as_advanced(PYTHON_INCLUDE_DIRS)
-set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
-mark_as_advanced(PYTHON_LIBRARY)
-set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-mark_as_advanced(PYTHON_LIBPATH)
-# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-
if(NOT EXISTS "${PYTHON_INCLUDE_DIRS}/Python.h")
message(FATAL_ERROR " Missing python header: ${PYTHON_INCLUDE_DIRS}/Python.h")
endif()
Modified: branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py 2011-06-14 11:18:00 UTC (rev 37475)
+++ branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py 2011-06-14 12:06:21 UTC (rev 37476)
@@ -23,15 +23,16 @@
# <pep8 compliant>
-IGNORE = \
- "/test/",\
- "/decimate_glut_test/",\
- "/BSP_GhostTest/",\
- "/release/",\
- "/xembed/",\
- "/decimation/intern/future/",\
- "/TerraplayNetwork/",\
- "/ik_glut_test/"
+IGNORE = (
+ "/test/",
+ "/decimate_glut_test/",
+ "/BSP_GhostTest/",
+ "/release/",
+ "/xembed/",
+ "/decimation/intern/future/",
+ "/TerraplayNetwork/",
+ "/ik_glut_test/",
+ )
import os
from os.path import join, dirname, normpath, abspath, splitext
@@ -104,7 +105,7 @@
found = True
break
- if "list(APPEND SRC" in l:
+ if "list(APPEND SRC" in l or ('list(APPEND ' in l and l.endswith("SRC")):
if l.endswith(")"):
raise Exception("strict formatting not kept 'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
found = True
@@ -136,7 +137,9 @@
if not l:
pass
elif l.startswith("$"):
- print("Cant use var '%s' %s:%d" % (l, f, i))
+ # assume if it ends with SRC we know about it
+ if not l.split("}")[0].endswith("SRC"):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list