Revision: 17458 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17458 Author: theeth Date: 2008-11-14 17:09:23 +0100 (Fri, 14 Nov 2008)
Log Message: ----------- Merging trunk 17342:17457 Modified Paths: -------------- branches/etch-a-ton/SConstruct branches/etch-a-ton/config/linuxcross-config.py branches/etch-a-ton/config/win32-mingw-config.py branches/etch-a-ton/config/win32-vc-config.py branches/etch-a-ton/doc/blender-scons.txt branches/etch-a-ton/intern/SoundSystem/intern/SND_Utils.cpp branches/etch-a-ton/intern/elbeem/SConscript branches/etch-a-ton/release/scripts/image_edit.py branches/etch-a-ton/source/Makefile branches/etch-a-ton/source/blender/blenkernel/BKE_bad_level_calls.h branches/etch-a-ton/source/blender/blenkernel/BKE_node.h branches/etch-a-ton/source/blender/blenkernel/SConscript branches/etch-a-ton/source/blender/blenkernel/bad_level_call_stubs/stubs.c branches/etch-a-ton/source/blender/blenkernel/intern/displist.c branches/etch-a-ton/source/blender/blenkernel/intern/library.c branches/etch-a-ton/source/blender/blenkernel/intern/material.c branches/etch-a-ton/source/blender/blenkernel/intern/node.c branches/etch-a-ton/source/blender/blenkernel/intern/texture.c branches/etch-a-ton/source/blender/blenlib/BLI_blenlib.h branches/etch-a-ton/source/blender/blenlib/BLI_linklist.h branches/etch-a-ton/source/blender/blenlib/BLI_memarena.h branches/etch-a-ton/source/blender/blenlib/SConscript branches/etch-a-ton/source/blender/blenlib/intern/BLI_linklist.c branches/etch-a-ton/source/blender/blenlib/intern/BLI_memarena.c branches/etch-a-ton/source/blender/blenlib/intern/threads.c branches/etch-a-ton/source/blender/blenloader/SConscript branches/etch-a-ton/source/blender/blenloader/intern/readfile.c branches/etch-a-ton/source/blender/blenloader/intern/writefile.c branches/etch-a-ton/source/blender/imbuf/SConscript branches/etch-a-ton/source/blender/imbuf/intern/imageprocess.c branches/etch-a-ton/source/blender/include/BIF_editarmature.h branches/etch-a-ton/source/blender/include/BSE_node.h branches/etch-a-ton/source/blender/include/blendef.h branches/etch-a-ton/source/blender/include/butspace.h branches/etch-a-ton/source/blender/include/transform.h branches/etch-a-ton/source/blender/makesdna/DNA_armature_types.h branches/etch-a-ton/source/blender/makesdna/DNA_node_types.h branches/etch-a-ton/source/blender/makesdna/DNA_object_types.h branches/etch-a-ton/source/blender/makesdna/DNA_texture_types.h branches/etch-a-ton/source/blender/makesdna/intern/SConscript branches/etch-a-ton/source/blender/nodes/CMakeLists.txt branches/etch-a-ton/source/blender/nodes/Makefile branches/etch-a-ton/source/blender/nodes/SConscript branches/etch-a-ton/source/blender/nodes/intern/SHD_nodes/SHD_texture.c branches/etch-a-ton/source/blender/nodes/intern/SHD_util.c branches/etch-a-ton/source/blender/python/BPY_interface.c branches/etch-a-ton/source/blender/python/api2_2x/Draw.c branches/etch-a-ton/source/blender/python/api2_2x/doc/Draw.py branches/etch-a-ton/source/blender/render/SConscript branches/etch-a-ton/source/blender/render/extern/include/RE_shader_ext.h branches/etch-a-ton/source/blender/render/intern/include/pixelshading.h branches/etch-a-ton/source/blender/render/intern/include/texture.h branches/etch-a-ton/source/blender/render/intern/source/convertblender.c branches/etch-a-ton/source/blender/render/intern/source/pixelshading.c branches/etch-a-ton/source/blender/render/intern/source/rayshade.c branches/etch-a-ton/source/blender/render/intern/source/rendercore.c branches/etch-a-ton/source/blender/render/intern/source/texture.c branches/etch-a-ton/source/blender/src/SConscript branches/etch-a-ton/source/blender/src/butspace.c branches/etch-a-ton/source/blender/src/buttons_editing.c branches/etch-a-ton/source/blender/src/buttons_shading.c branches/etch-a-ton/source/blender/src/drawnode.c branches/etch-a-ton/source/blender/src/editnode.c branches/etch-a-ton/source/blender/src/gpencil.c branches/etch-a-ton/source/blender/src/header_node.c branches/etch-a-ton/source/blender/src/headerbuttons.c branches/etch-a-ton/source/blender/src/interface_draw.c branches/etch-a-ton/source/blender/src/poselib.c branches/etch-a-ton/source/blender/src/seqaudio.c branches/etch-a-ton/source/blender/src/toolbox.c branches/etch-a-ton/source/blender/src/transform.c branches/etch-a-ton/source/blender/src/transform_conversions.c branches/etch-a-ton/source/blender/src/transform_generics.c branches/etch-a-ton/source/blender/src/transform_orientations.c branches/etch-a-ton/source/creator/SConscript branches/etch-a-ton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/etch-a-ton/source/gameengine/GameLogic/SConscript branches/etch-a-ton/source/gameengine/GamePlayer/ghost/GPG_Application.cpp branches/etch-a-ton/source/gameengine/Ketsji/SConscript branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.cpp branches/etch-a-ton/source/gameengine/VideoTexture/Texture.cpp branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.cpp branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.h branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.cpp branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.h branches/etch-a-ton/tools/Blender.py branches/etch-a-ton/tools/btools.py branches/etch-a-ton/tools/crossmingw.py Added Paths: ----------- branches/etch-a-ton/extern/bFTGL/make/msvc_9_0/ branches/etch-a-ton/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj branches/etch-a-ton/extern/bullet2/make/msvc_9_0/ branches/etch-a-ton/extern/bullet2/make/msvc_9_0/Bullet.vcproj branches/etch-a-ton/extern/glew/make/msvc_9_0/ branches/etch-a-ton/extern/glew/make/msvc_9_0/glew.vcproj branches/etch-a-ton/extern/make/msvc_9_0/ branches/etch-a-ton/extern/make/msvc_9_0/build_install_all.vcproj branches/etch-a-ton/extern/qhull/make/msvc_9_0/ branches/etch-a-ton/extern/qhull/make/msvc_9_0/qhull.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/ branches/etch-a-ton/extern/solid/make/msvc_9_0/broad/ branches/etch-a-ton/extern/solid/make/msvc_9_0/broad/broad.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/complex/ branches/etch-a-ton/extern/solid/make/msvc_9_0/complex/complex.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/convex/ branches/etch-a-ton/extern/solid/make/msvc_9_0/convex/convex.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/solid.vcproj branches/etch-a-ton/extern/verse/make/msvc_9_0/ branches/etch-a-ton/extern/verse/make/msvc_9_0/libverse.vcproj branches/etch-a-ton/extern/verse/make/msvc_9_0/verse.vcproj branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/ branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/dummy/ branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/openal/ branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj branches/etch-a-ton/intern/bmfont/make/msvc_9_0/ branches/etch-a-ton/intern/bmfont/make/msvc_9_0/bmfont.vcproj branches/etch-a-ton/intern/boolop/make/msvc_9_0/ branches/etch-a-ton/intern/boolop/make/msvc_9_0/boolop.vcproj branches/etch-a-ton/intern/bsp/make/msvc_9_0/ branches/etch-a-ton/intern/bsp/make/msvc_9_0/bsplib.vcproj branches/etch-a-ton/intern/container/make/msvc_9_0/ branches/etch-a-ton/intern/container/make/msvc_9_0/container.vcproj branches/etch-a-ton/intern/decimation/make/msvc_9_0/ branches/etch-a-ton/intern/decimation/make/msvc_9_0/decimation.vcproj branches/etch-a-ton/intern/elbeem/make/msvc_9_0/ branches/etch-a-ton/intern/elbeem/make/msvc_9_0/elbeem.vcproj branches/etch-a-ton/intern/ghost/make/msvc_9_0/ branches/etch-a-ton/intern/ghost/make/msvc_9_0/ghost.vcproj branches/etch-a-ton/intern/guardedalloc/make/msvc_9_0/ branches/etch-a-ton/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj branches/etch-a-ton/intern/iksolver/make/msvc_9_0/ branches/etch-a-ton/intern/iksolver/make/msvc_9_0/iksolver.vcproj branches/etch-a-ton/intern/make/msvc_9_0/ branches/etch-a-ton/intern/make/msvc_9_0/INT_build_install_all.vcproj branches/etch-a-ton/intern/memutil/make/msvc_9_0/ branches/etch-a-ton/intern/memutil/make/msvc_9_0/memutil.vcproj branches/etch-a-ton/intern/moto/make/msvc_9_0/ branches/etch-a-ton/intern/moto/make/msvc_9_0/moto.vcproj branches/etch-a-ton/intern/opennl/make/msvc_9_0/ branches/etch-a-ton/intern/opennl/make/msvc_9_0/opennl.vcproj branches/etch-a-ton/intern/string/make/msvc_9_0/ branches/etch-a-ton/intern/string/make/msvc_9_0/string.vcproj branches/etch-a-ton/projectfiles_vc7/gameengine/videotexture/ branches/etch-a-ton/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj branches/etch-a-ton/projectfiles_vc9/ branches/etch-a-ton/projectfiles_vc9/blender/ branches/etch-a-ton/projectfiles_vc9/blender/BLO_readblenfile/ branches/etch-a-ton/projectfiles_vc9/blender/BLO_readblenfile/BLO_readblenfile.vcproj branches/etch-a-ton/projectfiles_vc9/blender/BPY_python/ branches/etch-a-ton/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj branches/etch-a-ton/projectfiles_vc9/blender/avi/ branches/etch-a-ton/projectfiles_vc9/blender/avi/BL_avi.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blender.sln branches/etch-a-ton/projectfiles_vc9/blender/blender.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blenkernel/ branches/etch-a-ton/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blenlib/ branches/etch-a-ton/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blenpluginapi/ branches/etch-a-ton/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/ branches/etch-a-ton/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj branches/etch-a-ton/projectfiles_vc9/blender/ftfont/ branches/etch-a-ton/projectfiles_vc9/blender/ftfont/FTF_ftfont.vcproj branches/etch-a-ton/projectfiles_vc9/blender/gpu/ branches/etch-a-ton/projectfiles_vc9/blender/gpu/BL_gpu.vcproj branches/etch-a-ton/projectfiles_vc9/blender/imbuf/ branches/etch-a-ton/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/etch-a-ton/projectfiles_vc9/blender/img/ branches/etch-a-ton/projectfiles_vc9/blender/img/BL_img.vcproj branches/etch-a-ton/projectfiles_vc9/blender/loader/ branches/etch-a-ton/projectfiles_vc9/blender/loader/BLO_loader.vcproj branches/etch-a-ton/projectfiles_vc9/blender/makesdna/ branches/etch-a-ton/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj branches/etch-a-ton/projectfiles_vc9/blender/nodes/ branches/etch-a-ton/projectfiles_vc9/blender/nodes/nodes.vcproj branches/etch-a-ton/projectfiles_vc9/blender/radiosity/ branches/etch-a-ton/projectfiles_vc9/blender/radiosity/BRA_radiosity.vcproj branches/etch-a-ton/projectfiles_vc9/blender/render/ branches/etch-a-ton/projectfiles_vc9/blender/render/BRE_render.vcproj branches/etch-a-ton/projectfiles_vc9/blender/renderconverter/ branches/etch-a-ton/projectfiles_vc9/blender/renderconverter/BRE_renderconverter.vcproj branches/etch-a-ton/projectfiles_vc9/blender/src/ branches/etch-a-ton/projectfiles_vc9/blender/src/BL_src.vcproj branches/etch-a-ton/projectfiles_vc9/blender/yafray/ branches/etch-a-ton/projectfiles_vc9/blender/yafray/BRE_yafray.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/ branches/etch-a-ton/projectfiles_vc9/gameengine/blenderhook/ branches/etch-a-ton/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/converter/ branches/etch-a-ton/projectfiles_vc9/gameengine/converter/KX_converter.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/expression/ branches/etch-a-ton/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gamelogic/ branches/etch-a-ton/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/axctl/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/common/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ghost/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/ branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/network/ branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/network/ branches/etch-a-ton/projectfiles_vc9/gameengine/network/loopbacknetwork/ branches/etch-a-ton/projectfiles_vc9/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/network/network/ branches/etch-a-ton/projectfiles_vc9/gameengine/network/network/NG_network.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/ branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/ branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/scenegraph/ branches/etch-a-ton/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/videotexture/ branches/etch-a-ton/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj branches/etch-a-ton/projectfiles_vc9/kernel/ branches/etch-a-ton/projectfiles_vc9/kernel/gen_messaging/ branches/etch-a-ton/projectfiles_vc9/kernel/gen_messaging/gen_messaging.vcproj branches/etch-a-ton/projectfiles_vc9/kernel/system/ branches/etch-a-ton/projectfiles_vc9/kernel/system/SYS_system.vcproj branches/etch-a-ton/projectfiles_vc9/sumo/ branches/etch-a-ton/source/blender/nodes/TEX_node.h branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/ branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/Makefile branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c branches/etch-a-ton/source/blender/nodes/intern/TEX_util.c branches/etch-a-ton/source/blender/nodes/intern/TEX_util.h Removed Paths: ------------- branches/etch-a-ton/extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj branches/etch-a-ton/extern/bullet2/make/msvc_9_0/Bullet.vcproj branches/etch-a-ton/extern/glew/make/msvc_9_0/glew.vcproj branches/etch-a-ton/extern/make/msvc_9_0/build_install_all.vcproj branches/etch-a-ton/extern/qhull/make/msvc_9_0/qhull.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/broad/ branches/etch-a-ton/extern/solid/make/msvc_9_0/broad/broad.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/complex/ branches/etch-a-ton/extern/solid/make/msvc_9_0/complex/complex.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/convex/ branches/etch-a-ton/extern/solid/make/msvc_9_0/convex/convex.vcproj branches/etch-a-ton/extern/solid/make/msvc_9_0/solid.vcproj branches/etch-a-ton/extern/verse/make/msvc_9_0/libverse.vcproj branches/etch-a-ton/extern/verse/make/msvc_9_0/verse.vcproj branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/dummy/ branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/openal/ branches/etch-a-ton/intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj branches/etch-a-ton/intern/bmfont/make/msvc_9_0/bmfont.vcproj branches/etch-a-ton/intern/boolop/make/msvc_9_0/boolop.vcproj branches/etch-a-ton/intern/bsp/make/msvc_9_0/bsplib.vcproj branches/etch-a-ton/intern/container/make/msvc_9_0/container.vcproj branches/etch-a-ton/intern/decimation/make/msvc_9_0/decimation.vcproj branches/etch-a-ton/intern/elbeem/make/msvc_9_0/elbeem.vcproj branches/etch-a-ton/intern/ghost/make/msvc_9_0/ghost.vcproj branches/etch-a-ton/intern/guardedalloc/make/msvc_9_0/guardedalloc.vcproj branches/etch-a-ton/intern/iksolver/make/msvc_9_0/iksolver.vcproj branches/etch-a-ton/intern/make/msvc_9_0/INT_build_install_all.vcproj branches/etch-a-ton/intern/memutil/make/msvc_9_0/memutil.vcproj branches/etch-a-ton/intern/moto/make/msvc_9_0/moto.vcproj branches/etch-a-ton/intern/opennl/make/msvc_9_0/opennl.vcproj branches/etch-a-ton/intern/string/make/msvc_9_0/string.vcproj branches/etch-a-ton/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj branches/etch-a-ton/projectfiles_vc9/blender/ branches/etch-a-ton/projectfiles_vc9/blender/BLO_readblenfile/ branches/etch-a-ton/projectfiles_vc9/blender/BLO_readblenfile/BLO_readblenfile.vcproj branches/etch-a-ton/projectfiles_vc9/blender/BPY_python/ branches/etch-a-ton/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj branches/etch-a-ton/projectfiles_vc9/blender/avi/ branches/etch-a-ton/projectfiles_vc9/blender/avi/BL_avi.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blender.sln branches/etch-a-ton/projectfiles_vc9/blender/blender.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blenkernel/ branches/etch-a-ton/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blenlib/ branches/etch-a-ton/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj branches/etch-a-ton/projectfiles_vc9/blender/blenpluginapi/ branches/etch-a-ton/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/ branches/etch-a-ton/projectfiles_vc9/blender/blenpluginapi/blenpluginapi/blenpluginapi.vcproj branches/etch-a-ton/projectfiles_vc9/blender/ftfont/ branches/etch-a-ton/projectfiles_vc9/blender/ftfont/FTF_ftfont.vcproj branches/etch-a-ton/projectfiles_vc9/blender/gpu/ branches/etch-a-ton/projectfiles_vc9/blender/gpu/BL_gpu.vcproj branches/etch-a-ton/projectfiles_vc9/blender/imbuf/ branches/etch-a-ton/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/etch-a-ton/projectfiles_vc9/blender/img/ branches/etch-a-ton/projectfiles_vc9/blender/img/BL_img.vcproj branches/etch-a-ton/projectfiles_vc9/blender/loader/ branches/etch-a-ton/projectfiles_vc9/blender/loader/BLO_loader.vcproj branches/etch-a-ton/projectfiles_vc9/blender/makesdna/ branches/etch-a-ton/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj branches/etch-a-ton/projectfiles_vc9/blender/nodes/ branches/etch-a-ton/projectfiles_vc9/blender/nodes/nodes.vcproj branches/etch-a-ton/projectfiles_vc9/blender/radiosity/ branches/etch-a-ton/projectfiles_vc9/blender/radiosity/BRA_radiosity.vcproj branches/etch-a-ton/projectfiles_vc9/blender/render/ branches/etch-a-ton/projectfiles_vc9/blender/render/BRE_render.vcproj branches/etch-a-ton/projectfiles_vc9/blender/renderconverter/ branches/etch-a-ton/projectfiles_vc9/blender/renderconverter/BRE_renderconverter.vcproj branches/etch-a-ton/projectfiles_vc9/blender/src/ branches/etch-a-ton/projectfiles_vc9/blender/src/BL_src.vcproj branches/etch-a-ton/projectfiles_vc9/blender/yafray/ branches/etch-a-ton/projectfiles_vc9/blender/yafray/BRE_yafray.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/ branches/etch-a-ton/projectfiles_vc9/gameengine/blenderhook/ branches/etch-a-ton/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/converter/ branches/etch-a-ton/projectfiles_vc9/gameengine/converter/KX_converter.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/expression/ branches/etch-a-ton/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gamelogic/ branches/etch-a-ton/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/axctl/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/common/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ghost/ branches/etch-a-ton/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/ branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/network/ branches/etch-a-ton/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/network/ branches/etch-a-ton/projectfiles_vc9/gameengine/network/loopbacknetwork/ branches/etch-a-ton/projectfiles_vc9/gameengine/network/loopbacknetwork/NG_loopbacknetwork.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/network/network/ branches/etch-a-ton/projectfiles_vc9/gameengine/network/network/NG_network.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy/PHY_Dummy.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode/PHY_Ode.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Physics.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/ branches/etch-a-ton/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/ branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/ branches/etch-a-ton/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/scenegraph/ branches/etch-a-ton/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj branches/etch-a-ton/projectfiles_vc9/gameengine/videotexture/ branches/etch-a-ton/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj branches/etch-a-ton/projectfiles_vc9/kernel/ branches/etch-a-ton/projectfiles_vc9/kernel/gen_messaging/ branches/etch-a-ton/projectfiles_vc9/kernel/gen_messaging/gen_messaging.vcproj branches/etch-a-ton/projectfiles_vc9/kernel/system/ branches/etch-a-ton/projectfiles_vc9/kernel/system/SYS_system.vcproj branches/etch-a-ton/projectfiles_vc9/sumo/ branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/Makefile branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/etch-a-ton/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c Modified: branches/etch-a-ton/SConstruct =================================================================== --- branches/etch-a-ton/SConstruct 2008-11-14 15:46:51 UTC (rev 17457) +++ branches/etch-a-ton/SConstruct 2008-11-14 16:09:23 UTC (rev 17458) @@ -57,8 +57,8 @@ ##### BEGIN SETUP ##### B.possible_types = ['core', 'common', 'blender', 'intern', - 'international', 'game', 'game2', - 'player', 'player2', 'system'] + 'international', 'game', 'game2', + 'player', 'player2', 'system'] B.binarykind = ['blender' , 'blenderplayer'] ################################## @@ -67,15 +67,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 @@ -98,247 +98,247 @@ 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', ['tools']) - else: - env = BlenderEnvironment(tools=[toolset], ENV = os.environ) - if env: - btools.SetupSpawn(env) + print "Using " + toolset + if toolset=='mstoolkit': + env = BlenderEnvironment(ENV = os.environ) + env.Tool('mstoolkit', ['tools']) + else: + env = BlenderEnvironment(tools=[toolset], ENV = os.environ) + if env: + btools.SetupSpawn(env) else: - env = BlenderEnvironment(ENV = os.environ) + 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': - platform = 'win32-vc' + 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!='win32': - platform = 'linuxcross' + platform = 'linuxcross' env['OURPLATFORM'] = platform configfile = 'config'+os.sep+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', ['tools']) - # todo: determine proper libs/includes etc. - # Needed for gui programs, console programs should do without it - env.Append(LINKFLAGS=['-mwindows']) + print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC + env.Tool('crossmingw', ['tools']) + # todo: determine proper libs/includes etc. + # Needed for gui programs, console programs should do without it + 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(optfiles, B.arguments) opts.Update(env) if not env['BF_FANCY']: - B.bc.disable() + B.bc.disable() SetOption('num_jobs', int(env['BF_NUMJOBS'])) print "Build with %d parallel jobs" % (GetOption('num_jobs')) # disable elbeem (fluidsim) compilation? if env['BF_NO_ELBEEM'] == 1: - env['CPPFLAGS'].append('-DDISABLE_ELBEEM') - env['CXXFLAGS'].append('-DDISABLE_ELBEEM') - env['CCFLAGS'].append('-DDISABLE_ELBEEM') + env['CPPFLAGS'].append('-DDISABLE_ELBEEM') + env['CXXFLAGS'].append('-DDISABLE_ELBEEM') + env['CCFLAGS'].append('-DDISABLE_ELBEEM') if env['WITH_BF_OPENMP'] == 1: - if env['OURPLATFORM']=='win32-vc': - env['CCFLAGS'].append('/openmp') - env['CPPFLAGS'].append('/openmp') - env['CXXFLAGS'].append('/openmp') - else: - if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case - env.Append(LINKFLAGS=['-openmp', '-static-intel']) - env['CCFLAGS'].append('-openmp') - env['CPPFLAGS'].append('-openmp') - env['CXXFLAGS'].append('-openmp') - else: - env.Append(CCFLAGS=['-fopenmp']) - env.Append(CPPFLAGS=['-fopenmp']) - env.Append(CXXFLAGS=['-fopenmp']) - # env.Append(LINKFLAGS=['-fprofile-generate']) + if env['OURPLATFORM']=='win32-vc': + env['CCFLAGS'].append('/openmp') + env['CPPFLAGS'].append('/openmp') + env['CXXFLAGS'].append('/openmp') + else: + if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case + env.Append(LINKFLAGS=['-openmp', '-static-intel']) + env['CCFLAGS'].append('-openmp') + env['CPPFLAGS'].append('-openmp') + env['CXXFLAGS'].append('-openmp') + else: + env.Append(CCFLAGS=['-fopenmp']) + env.Append(CPPFLAGS=['-fopenmp']) + env.Append(CXXFLAGS=['-fopenmp']) + # env.Append(LINKFLAGS=['-fprofile-generate']) #check for additional debug libnames if env.has_key('BF_DEBUG_LIBS'): - B.quickdebug += env['BF_DEBUG_LIBS'] + B.quickdebug += env['BF_DEBUG_LIBS'] printdebug = B.arguments.get('BF_LISTDEBUG', 0) # see if this linux distro has libalut if env['OURPLATFORM'] == 'linux2' : - if env['WITH_BF_OPENAL']: - mylib_test_source_file = """ - #include "AL/alut.h" - int main(int argc, char **argv) - { - alutGetMajorVersion(); - return 0; - } - """ + if env['WITH_BF_OPENAL']: + mylib_test_source_file = """ + #include "AL/alut.h" + int main(int argc, char **argv) + { + alutGetMajorVersion(); + return 0; + } + """ - def CheckFreeAlut(context,env): - context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC ) - env['LIBS'] = 'alut' - result = context.TryLink(mylib_test_source_file, '.c') - context.Result(result) - return result + def CheckFreeAlut(context,env): + context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC ) + env['LIBS'] = 'alut' + result = context.TryLink(mylib_test_source_file, '.c') + context.Result(result) + return result - env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) - sconf_temp = mkdtemp() - conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' ) - if conf.CheckFreeAlut( env2 ): - env['BF_OPENAL_LIB'] += ' alut' - del env2 - root = '' - for root, dirs, files in os.walk(sconf_temp, topdown=False): - for name in files: - os.remove(os.path.join(root, name)) - for name in dirs: - os.rmdir(os.path.join(root, name)) - if root: os.rmdir(root) + env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) + sconf_temp = mkdtemp() + conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' ) + if conf.CheckFreeAlut( env2 ): + env['BF_OPENAL_LIB'] += ' alut' + del env2 + root = '' + for root, dirs, files in os.walk(sconf_temp, topdown=False): + for name in files: + os.remove(os.path.join(root, name)) + for name in dirs: + os.rmdir(os.path.join(root, name)) + if root: os.rmdir(root) if len(B.quickdebug) > 0 and printdebug != 0: - print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC - for l in B.quickdebug: - print "\t" + l + print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC + for l in B.quickdebug: + print "\t" + l # remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS if env['WITH_BF_STATICCXX']: - if 'stdc++' in env['LLIBS']: - env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ') - else: - print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform' + if 'stdc++' in env['LLIBS']: + env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ') + else: + print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform' # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline if 'blenderplayer' in B.targets: - env['WITH_BF_PLAYER'] = True + env['WITH_BF_PLAYER'] = True if 'blendernogame' in B.targets: - env['WITH_BF_GAMEENGINE'] = False + env['WITH_BF_GAMEENGINE'] = False if 'blenderlite' in B.targets: - env['WITH_BF_GAMEENGINE'] = False - env['WITH_BF_OPENAL'] = False - env['WITH_BF_OPENEXR'] = False - env['WITH_BF_ICONV'] = False - env['WITH_BF_INTERNATIONAL'] = False - env['WITH_BF_OPENJPEG'] = False - env['WITH_BF_FFMPEG'] = False - env['WITH_BF_QUICKTIME'] = False - env['WITH_BF_YAFRAY'] = False - env['WITH_BF_REDCODE'] = False - env['WITH_BF_FTGL'] = False - env['WITH_BF_DDS'] = False - env['WITH_BF_ZLIB'] = False - env['WITH_BF_SDL'] = False - env['WITH_BF_JPEG'] = False - env['WITH_BF_PNG'] = False - env['WITH_BF_ODE'] = False - env['WITH_BF_BULLET'] = False @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs