[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31716] branches/particles-2010:
Lukas Toenne
lukas.toenne at googlemail.com
Thu Sep 2 08:28:05 CEST 2010
Revision: 31716
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31716
Author: lukastoenne
Date: 2010-09-02 08:28:03 +0200 (Thu, 02 Sep 2010)
Log Message:
-----------
svn merge -r31605:31715 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/SConstruct
branches/particles-2010/build_files/scons/tools/Blender.py
branches/particles-2010/extern/SConscript
branches/particles-2010/extern/libopenjpeg/SConscript
branches/particles-2010/intern/audaspace/SConscript
branches/particles-2010/intern/audaspace/intern/AUD_C-API.cpp
branches/particles-2010/intern/audaspace/intern/AUD_C-API.h
branches/particles-2010/intern/ghost/SConscript
branches/particles-2010/release/scripts/io/netrender/__init__.py
branches/particles-2010/release/scripts/keyingsets/keyingsets_utils.py
branches/particles-2010/release/scripts/modules/bpy/ops.py
branches/particles-2010/release/scripts/modules/rna_prop_ui.py
branches/particles-2010/release/scripts/op/add_mesh_torus.py
branches/particles-2010/release/scripts/op/animsys_update.py
branches/particles-2010/release/scripts/op/console_python.py
branches/particles-2010/release/scripts/op/nla.py
branches/particles-2010/release/scripts/op/object.py
branches/particles-2010/release/scripts/op/presets.py
branches/particles-2010/release/scripts/op/uv.py
branches/particles-2010/release/scripts/op/wm.py
branches/particles-2010/release/scripts/presets/interaction/blender.py
branches/particles-2010/release/scripts/presets/interaction/maya.py
branches/particles-2010/release/scripts/templates/operator.py
branches/particles-2010/release/scripts/templates/operator_modal.py
branches/particles-2010/release/scripts/templates/operator_modal_draw.py
branches/particles-2010/release/scripts/templates/operator_modal_view3d.py
branches/particles-2010/release/scripts/ui/properties_data_armature_rigify.py
branches/particles-2010/release/scripts/ui/properties_data_mesh.py
branches/particles-2010/release/scripts/ui/properties_material.py
branches/particles-2010/release/scripts/ui/properties_object.py
branches/particles-2010/release/scripts/ui/properties_particle.py
branches/particles-2010/release/scripts/ui/properties_physics_fluid.py
branches/particles-2010/release/scripts/ui/properties_scene.py
branches/particles-2010/release/scripts/ui/properties_texture.py
branches/particles-2010/release/scripts/ui/space_filebrowser.py
branches/particles-2010/release/scripts/ui/space_info.py
branches/particles-2010/release/scripts/ui/space_sequencer.py
branches/particles-2010/release/scripts/ui/space_userpref.py
branches/particles-2010/release/scripts/ui/space_userpref_keymap.py
branches/particles-2010/source/SConscript
branches/particles-2010/source/blender/blenfont/SConscript
branches/particles-2010/source/blender/blenkernel/SConscript
branches/particles-2010/source/blender/blenkernel/intern/blender.c
branches/particles-2010/source/blender/blenkernel/intern/context.c
branches/particles-2010/source/blender/blenkernel/intern/font.c
branches/particles-2010/source/blender/blenkernel/intern/library.c
branches/particles-2010/source/blender/blenkernel/intern/particle.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/sca.c
branches/particles-2010/source/blender/blenlib/BLI_string.h
branches/particles-2010/source/blender/blenlib/intern/string.c
branches/particles-2010/source/blender/blenloader/BLO_readfile.h
branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
branches/particles-2010/source/blender/blenpluginapi/SConscript
branches/particles-2010/source/blender/collada/SConscript
branches/particles-2010/source/blender/editors/SConscript
branches/particles-2010/source/blender/editors/animation/anim_draw.c
branches/particles-2010/source/blender/editors/animation/anim_ops.c
branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
branches/particles-2010/source/blender/editors/armature/armature_ops.c
branches/particles-2010/source/blender/editors/armature/editarmature.c
branches/particles-2010/source/blender/editors/curve/curve_intern.h
branches/particles-2010/source/blender/editors/curve/curve_ops.c
branches/particles-2010/source/blender/editors/curve/editcurve.c
branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
branches/particles-2010/source/blender/editors/gpencil/gpencil_ops.c
branches/particles-2010/source/blender/editors/include/UI_icons.h
branches/particles-2010/source/blender/editors/include/UI_interface.h
branches/particles-2010/source/blender/editors/interface/SConscript
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/mesh/editmesh_add.c
branches/particles-2010/source/blender/editors/mesh/loopcut.c
branches/particles-2010/source/blender/editors/mesh/mesh_intern.h
branches/particles-2010/source/blender/editors/mesh/mesh_ops.c
branches/particles-2010/source/blender/editors/object/SConscript
branches/particles-2010/source/blender/editors/object/object_add.c
branches/particles-2010/source/blender/editors/object/object_relations.c
branches/particles-2010/source/blender/editors/screen/SConscript
branches/particles-2010/source/blender/editors/sculpt_paint/SConscript
branches/particles-2010/source/blender/editors/space_console/SConscript
branches/particles-2010/source/blender/editors/space_file/SConscript
branches/particles-2010/source/blender/editors/space_file/file_draw.c
branches/particles-2010/source/blender/editors/space_image/SConscript
branches/particles-2010/source/blender/editors/space_image/space_image.c
branches/particles-2010/source/blender/editors/space_logic/SConscript
branches/particles-2010/source/blender/editors/space_logic/logic_window.c
branches/particles-2010/source/blender/editors/space_node/SConscript
branches/particles-2010/source/blender/editors/space_outliner/outliner.c
branches/particles-2010/source/blender/editors/space_script/SConscript
branches/particles-2010/source/blender/editors/space_text/SConscript
branches/particles-2010/source/blender/editors/space_time/space_time.c
branches/particles-2010/source/blender/editors/space_view3d/SConscript
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
branches/particles-2010/source/blender/editors/transform/transform_ops.c
branches/particles-2010/source/blender/editors/util/undo.c
branches/particles-2010/source/blender/imbuf/SConscript
branches/particles-2010/source/blender/imbuf/intern/dds/SConscript
branches/particles-2010/source/blender/imbuf/intern/openexr/SConscript
branches/particles-2010/source/blender/imbuf/intern/scaling.c
branches/particles-2010/source/blender/makesdna/DNA_object_types.h
branches/particles-2010/source/blender/makesdna/DNA_userdef_types.h
branches/particles-2010/source/blender/makesdna/intern/SConscript
branches/particles-2010/source/blender/makesrna/RNA_access.h
branches/particles-2010/source/blender/makesrna/RNA_types.h
branches/particles-2010/source/blender/makesrna/SConscript
branches/particles-2010/source/blender/makesrna/intern/SConscript
branches/particles-2010/source/blender/makesrna/intern/makesrna.c
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_action.c
branches/particles-2010/source/blender/makesrna/intern/rna_action_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_context.c
branches/particles-2010/source/blender/makesrna/intern/rna_define.c
branches/particles-2010/source/blender/makesrna/intern/rna_main.c
branches/particles-2010/source/blender/makesrna/intern/rna_material.c
branches/particles-2010/source/blender/makesrna/intern/rna_meta.c
branches/particles-2010/source/blender/makesrna/intern/rna_object.c
branches/particles-2010/source/blender/makesrna/intern/rna_render.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
branches/particles-2010/source/blender/makesrna/intern/rna_space.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
branches/particles-2010/source/blender/modifiers/SConscript
branches/particles-2010/source/blender/modifiers/intern/MOD_screw.c
branches/particles-2010/source/blender/nodes/SConscript
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/particles-2010/source/blender/python/SConscript
branches/particles-2010/source/blender/python/generic/IDProp.c
branches/particles-2010/source/blender/python/generic/bpy_internal_import.c
branches/particles-2010/source/blender/python/generic/mathutils_euler.c
branches/particles-2010/source/blender/python/intern/bpy_array.c
branches/particles-2010/source/blender/python/intern/bpy_operator.c
branches/particles-2010/source/blender/python/intern/bpy_props.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_rna.h
branches/particles-2010/source/blender/python/intern/bpy_util.c
branches/particles-2010/source/blender/python/intern/bpy_util.h
branches/particles-2010/source/blender/quicktime/SConscript
branches/particles-2010/source/blender/windowmanager/SConscript
branches/particles-2010/source/blender/windowmanager/WM_api.h
branches/particles-2010/source/blender/windowmanager/WM_types.h
branches/particles-2010/source/blender/windowmanager/intern/wm.c
branches/particles-2010/source/blender/windowmanager/intern/wm_cursors.c
branches/particles-2010/source/blender/windowmanager/intern/wm_draw.c
branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
branches/particles-2010/source/blender/windowmanager/intern/wm_keymap.c
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/SConscript
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/SConscript
branches/particles-2010/source/gameengine/BlenderRoutines/SConscript
branches/particles-2010/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/particles-2010/source/gameengine/Converter/SConscript
branches/particles-2010/source/gameengine/Expressions/SConscript
branches/particles-2010/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
branches/particles-2010/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/particles-2010/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/particles-2010/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/particles-2010/source/gameengine/GameLogic/SConscript
branches/particles-2010/source/gameengine/GamePlayer/common/SConscript
branches/particles-2010/source/gameengine/GamePlayer/ghost/SConscript
branches/particles-2010/source/gameengine/Ketsji/KXNetwork/SConscript
branches/particles-2010/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/particles-2010/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/particles-2010/source/gameengine/Ketsji/SConscript
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/particles-2010/source/gameengine/Physics/Bullet/SConscript
branches/particles-2010/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/particles-2010/source/gameengine/PyDoc/bge.logic.rst
branches/particles-2010/source/gameengine/PyDoc/bge.types.rst
branches/particles-2010/source/gameengine/Rasterizer/SConscript
branches/particles-2010/source/gameengine/VideoTexture/SConscript
branches/particles-2010/source/icons/SConscript
Added Paths:
-----------
branches/particles-2010/release/scripts/modules/io_utils.py
branches/particles-2010/release/scripts/op/io_anim_bvh/
branches/particles-2010/release/scripts/op/io_anim_bvh/__init__.py
branches/particles-2010/release/scripts/op/io_anim_bvh/import_bvh.py
branches/particles-2010/release/scripts/op/io_mesh_ply/
branches/particles-2010/release/scripts/op/io_mesh_ply/__init__.py
branches/particles-2010/release/scripts/op/io_mesh_ply/export_ply.py
branches/particles-2010/release/scripts/op/io_scene_3ds/
branches/particles-2010/release/scripts/op/io_scene_3ds/__init__.py
branches/particles-2010/release/scripts/op/io_scene_3ds/export_3ds.py
branches/particles-2010/release/scripts/op/io_scene_3ds/import_3ds.py
branches/particles-2010/release/scripts/op/io_scene_fbx/
branches/particles-2010/release/scripts/op/io_scene_fbx/__init__.py
branches/particles-2010/release/scripts/op/io_scene_fbx/export_fbx.py
branches/particles-2010/release/scripts/op/io_scene_obj/
branches/particles-2010/release/scripts/op/io_scene_obj/__init__.py
branches/particles-2010/release/scripts/op/io_scene_obj/export_obj.py
branches/particles-2010/release/scripts/op/io_scene_obj/import_obj.py
branches/particles-2010/release/scripts/op/io_scene_x3d/
branches/particles-2010/release/scripts/op/io_scene_x3d/__init__.py
branches/particles-2010/release/scripts/op/io_scene_x3d/export_x3d.py
branches/particles-2010/release/scripts/op/io_shape_mdd/
branches/particles-2010/release/scripts/op/io_shape_mdd/__init__.py
branches/particles-2010/release/scripts/op/io_shape_mdd/export_mdd.py
branches/particles-2010/release/scripts/op/io_shape_mdd/import_mdd.py
branches/particles-2010/source/blender/python/generic/py_capi_utils.c
branches/particles-2010/source/blender/python/generic/py_capi_utils.h
Removed Paths:
-------------
branches/particles-2010/release/scripts/io/export_3ds.py
branches/particles-2010/release/scripts/io/export_fbx.py
branches/particles-2010/release/scripts/io/export_mdd.py
branches/particles-2010/release/scripts/io/export_obj.py
branches/particles-2010/release/scripts/io/export_ply.py
branches/particles-2010/release/scripts/io/export_x3d.py
branches/particles-2010/release/scripts/io/import_anim_bvh.py
branches/particles-2010/release/scripts/io/import_scene_3ds.py
branches/particles-2010/release/scripts/io/import_scene_obj.py
branches/particles-2010/release/scripts/io/import_shape_mdd.py
branches/particles-2010/release/scripts/op/io_anim_bvh/__init__.py
branches/particles-2010/release/scripts/op/io_anim_bvh/import_bvh.py
branches/particles-2010/release/scripts/op/io_mesh_ply/__init__.py
branches/particles-2010/release/scripts/op/io_mesh_ply/export_ply.py
branches/particles-2010/release/scripts/op/io_scene_3ds/__init__.py
branches/particles-2010/release/scripts/op/io_scene_3ds/export_3ds.py
branches/particles-2010/release/scripts/op/io_scene_3ds/import_3ds.py
branches/particles-2010/release/scripts/op/io_scene_fbx/__init__.py
branches/particles-2010/release/scripts/op/io_scene_fbx/export_fbx.py
branches/particles-2010/release/scripts/op/io_scene_obj/__init__.py
branches/particles-2010/release/scripts/op/io_scene_obj/export_obj.py
branches/particles-2010/release/scripts/op/io_scene_obj/import_obj.py
branches/particles-2010/release/scripts/op/io_scene_x3d/__init__.py
branches/particles-2010/release/scripts/op/io_scene_x3d/export_x3d.py
branches/particles-2010/release/scripts/op/io_shape_mdd/__init__.py
branches/particles-2010/release/scripts/op/io_shape_mdd/export_mdd.py
branches/particles-2010/release/scripts/op/io_shape_mdd/import_mdd.py
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2010-09-02 05:51:02 UTC (rev 31715)
+++ branches/particles-2010/CMakeLists.txt 2010-09-02 06:28:03 UTC (rev 31716)
@@ -415,11 +415,19 @@
SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
SET(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ IF(CMAKE_CL_64)
+ SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ ELSE(CMAKE_CL_64)
+ SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ ENDIF(CMAKE_CL_64)
SET(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
- SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ IF(CMAKE_CL_64)
+ SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ ELSE(CMAKE_CL_64)
+ SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ ENDIF(CMAKE_CL_64)
SET(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct 2010-09-02 05:51:02 UTC (rev 31715)
+++ branches/particles-2010/SConstruct 2010-09-02 06:28:03 UTC (rev 31716)
@@ -33,9 +33,9 @@
# Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
if pltfrm.architecture()[0] == '64bit':
- bitness = 64
+ bitness = 64
else:
- bitness = 32
+ bitness = 32
import sys
import os
@@ -79,15 +79,15 @@
# XX cheating for BF_FANCY, we check for BF_FANCY before args are validated
use_color = ARGUMENTS.get('BF_FANCY', '1')
if platform=='win32':
- use_color = None
+ use_color = None
if not use_color=='1':
- B.bc.disable()
-
+ B.bc.disable()
+
#on defaut white Os X terminal, some colors are totally unlegible
if platform=='darwin':
- B.bc.OKGREEN = '\033[34m'
- B.bc.WARNING = '\033[36m'
+ B.bc.OKGREEN = '\033[34m'
+ B.bc.WARNING = '\033[36m'
# arguments
print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
@@ -110,100 +110,100 @@
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
if quickdebug:
- B.quickdebug=string.split(quickdebug, ',')
+ B.quickdebug=string.split(quickdebug, ',')
else:
- B.quickdebug=[]
+ B.quickdebug=[]
if quickie:
- B.quickie=string.split(quickie,',')
+ B.quickie=string.split(quickie,',')
else:
- B.quickie=[]
-
+ B.quickie=[]
+
toolset = B.arguments.get('BF_TOOLSET', None)
if toolset:
- print "Using " + toolset
- if toolset=='mstoolkit':
- env = BlenderEnvironment(ENV = os.environ)
- env.Tool('mstoolkit', [toolpath])
- else:
- env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
- # xxx commented out, as was supressing warnings under mingw..
- #if env:
- # btools.SetupSpawn(env)
+ print "Using " + toolset
+ if toolset=='mstoolkit':
+ env = BlenderEnvironment(ENV = os.environ)
+ env.Tool('mstoolkit', [toolpath])
+ else:
+ env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+ # xxx commented out, as was supressing warnings under mingw..
+ #if env:
+ # btools.SetupSpawn(env)
else:
- if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
- else:
- env = BlenderEnvironment(ENV = os.environ)
+ if bitness==64 and platform=='win32':
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+ else:
+ env = BlenderEnvironment(ENV = os.environ)
if not env:
- print "Could not create a build environment"
- Exit()
+ print "Could not create a build environment"
+ Exit()
cc = B.arguments.get('CC', None)
cxx = B.arguments.get('CXX', None)
if cc:
- env['CC'] = cc
+ env['CC'] = cc
if cxx:
- env['CXX'] = cxx
+ env['CXX'] = cxx
if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32':
- if bitness == 64:
- platform = 'win64-vc'
- else:
- platform = 'win32-vc'
+ if bitness == 64:
+ platform = 'win64-vc'
+ else:
+ platform = 'win32-vc'
elif env['CC'] in ['gcc'] and sys.platform=='win32':
- platform = 'win32-mingw'
+ platform = 'win32-mingw'
env.SConscriptChdir(0)
crossbuild = B.arguments.get('BF_CROSS', None)
if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
+ platform = 'linuxcross'
env['OURPLATFORM'] = platform
configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
if os.path.exists(configfile):
- print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
+ print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
else:
- print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
+ print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
if crossbuild and env['PLATFORM'] != 'win32':
- print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
- env.Tool('crossmingw', [toolpath])
- # todo: determine proper libs/includes etc.
- # Needed for gui programs, console programs should do without it
+ print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
+ env.Tool('crossmingw', [toolpath])
+ # todo: determine proper libs/includes etc.
+ # Needed for gui programs, console programs should do without it
- # Now we don't need this option to have console window
- # env.Append(LINKFLAGS=['-mwindows'])
+ # Now we don't need this option to have console window
+ # env.Append(LINKFLAGS=['-mwindows'])
userconfig = B.arguments.get('BF_CONFIG', 'user-config.py')
# first read platform config. B.arguments will override
optfiles = [configfile]
if os.path.exists(userconfig):
- print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
- optfiles += [userconfig]
+ print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
+ optfiles += [userconfig]
else:
- print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
+ print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
opts = btools.read_opts(env, optfiles, B.arguments)
opts.Update(env)
if not env['BF_FANCY']:
- B.bc.disable()
+ B.bc.disable()
# remove install dir so old and new files are not mixed.
# NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
# TODO: perhaps we need an option (off by default) to not do this altogether...
if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
- scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
- if os.path.isdir(scriptsDir):
- print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
- shutil.rmtree(scriptsDir)
+ scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
+ if os.path.isdir(scriptsDir):
+ print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
+ shutil.rmtree(scriptsDir)
SetOption('num_jobs', int(env['BF_NUMJOBS']))
@@ -211,158 +211,158 @@
print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
if 'blenderlite' in B.targets:
- target_env_defs = {}
- target_env_defs['WITH_BF_GAMEENGINE'] = False
- target_env_defs['WITH_BF_OPENAL'] = False
- target_env_defs['WITH_BF_OPENEXR'] = False
- target_env_defs['WITH_BF_OPENMP'] = False
- target_env_defs['WITH_BF_ICONV'] = False
- target_env_defs['WITH_BF_INTERNATIONAL'] = False
- target_env_defs['WITH_BF_OPENJPEG'] = False
- target_env_defs['WITH_BF_FFMPEG'] = False
- target_env_defs['WITH_BF_QUICKTIME'] = False
- target_env_defs['WITH_BF_REDCODE'] = False
- target_env_defs['WITH_BF_DDS'] = False
- target_env_defs['WITH_BF_CINEON'] = False
- target_env_defs['WITH_BF_HDR'] = False
- target_env_defs['WITH_BF_ZLIB'] = False
- target_env_defs['WITH_BF_SDL'] = False
- target_env_defs['WITH_BF_JPEG'] = False
- target_env_defs['WITH_BF_PNG'] = False
- target_env_defs['WITH_BF_BULLET'] = False
- target_env_defs['WITH_BF_BINRELOC'] = False
- target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
- target_env_defs['WITH_BF_PYTHON'] = False
-
- # Merge blenderlite, let command line to override
- for k,v in target_env_defs.iteritems():
- if k not in B.arguments:
- env[k] = v
+ target_env_defs = {}
+ target_env_defs['WITH_BF_GAMEENGINE'] = False
+ target_env_defs['WITH_BF_OPENAL'] = False
+ target_env_defs['WITH_BF_OPENEXR'] = False
+ target_env_defs['WITH_BF_OPENMP'] = False
+ target_env_defs['WITH_BF_ICONV'] = False
+ target_env_defs['WITH_BF_INTERNATIONAL'] = False
+ target_env_defs['WITH_BF_OPENJPEG'] = False
+ target_env_defs['WITH_BF_FFMPEG'] = False
+ target_env_defs['WITH_BF_QUICKTIME'] = False
+ target_env_defs['WITH_BF_REDCODE'] = False
+ target_env_defs['WITH_BF_DDS'] = False
+ target_env_defs['WITH_BF_CINEON'] = False
+ target_env_defs['WITH_BF_HDR'] = False
+ target_env_defs['WITH_BF_ZLIB'] = False
+ target_env_defs['WITH_BF_SDL'] = False
+ target_env_defs['WITH_BF_JPEG'] = False
+ target_env_defs['WITH_BF_PNG'] = False
+ target_env_defs['WITH_BF_BULLET'] = False
+ target_env_defs['WITH_BF_BINRELOC'] = False
+ target_env_defs['BF_BUILDINFO'] = False
+ target_env_defs['BF_NO_ELBEEM'] = True
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list