[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14674] branches/soc-2008-unclezeiv: svn merge -r 14521:14672 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Sun May 4 13:06:41 CEST 2008
Revision: 14674
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14674
Author: unclezeiv
Date: 2008-05-04 13:06:41 +0200 (Sun, 04 May 2008)
Log Message:
-----------
svn merge -r 14521:14672 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/CMakeLists.txt
branches/soc-2008-unclezeiv/SConstruct
branches/soc-2008-unclezeiv/config/darwin-config.py
branches/soc-2008-unclezeiv/config/win32-vc-config.py
branches/soc-2008-unclezeiv/doc/blender-scons.txt
branches/soc-2008-unclezeiv/extern/ffmpeg/SConscript
branches/soc-2008-unclezeiv/extern/verse/dist/v_bignum.c
branches/soc-2008-unclezeiv/extern/verse/dist/v_network.c
branches/soc-2008-unclezeiv/extern/x264/SConscript
branches/soc-2008-unclezeiv/extern/xvidcore/SConscript
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-unclezeiv/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blender.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/soc-2008-unclezeiv/release/datafiles/datatoc.c
branches/soc-2008-unclezeiv/release/datafiles/splash.jpg
branches/soc-2008-unclezeiv/release/scripts/DirectX8Exporter.py
branches/soc-2008-unclezeiv/release/scripts/ac3d_export.py
branches/soc-2008-unclezeiv/release/scripts/ac3d_import.py
branches/soc-2008-unclezeiv/release/scripts/bevel_center.py
branches/soc-2008-unclezeiv/release/scripts/bpymodules/paths_svg2obj.py
branches/soc-2008-unclezeiv/release/scripts/collada_export.py
branches/soc-2008-unclezeiv/release/scripts/collada_import.py
branches/soc-2008-unclezeiv/release/scripts/config.py
branches/soc-2008-unclezeiv/release/scripts/console.py
branches/soc-2008-unclezeiv/release/scripts/envelope_symmetry.py
branches/soc-2008-unclezeiv/release/scripts/export_lightwave_motion.py
branches/soc-2008-unclezeiv/release/scripts/faceselect_same_weights.py
branches/soc-2008-unclezeiv/release/scripts/flt_export.py
branches/soc-2008-unclezeiv/release/scripts/flt_import.py
branches/soc-2008-unclezeiv/release/scripts/flt_palettemanager.py
branches/soc-2008-unclezeiv/release/scripts/flt_toolbar.py
branches/soc-2008-unclezeiv/release/scripts/help_browser.py
branches/soc-2008-unclezeiv/release/scripts/help_getting_started.py
branches/soc-2008-unclezeiv/release/scripts/help_manual.py
branches/soc-2008-unclezeiv/release/scripts/help_release_notes.py
branches/soc-2008-unclezeiv/release/scripts/help_tutorials.py
branches/soc-2008-unclezeiv/release/scripts/help_web_blender.py
branches/soc-2008-unclezeiv/release/scripts/help_web_devcomm.py
branches/soc-2008-unclezeiv/release/scripts/help_web_eshop.py
branches/soc-2008-unclezeiv/release/scripts/help_web_usercomm.py
branches/soc-2008-unclezeiv/release/scripts/image_edit.py
branches/soc-2008-unclezeiv/release/scripts/import_lightwave_motion.py
branches/soc-2008-unclezeiv/release/scripts/lightwave_export.py
branches/soc-2008-unclezeiv/release/scripts/md2_export.py
branches/soc-2008-unclezeiv/release/scripts/md2_import.py
branches/soc-2008-unclezeiv/release/scripts/mesh_boneweight_copy.py
branches/soc-2008-unclezeiv/release/scripts/mesh_cleanup.py
branches/soc-2008-unclezeiv/release/scripts/mesh_edges2curves.py
branches/soc-2008-unclezeiv/release/scripts/mesh_mirror_tool.py
branches/soc-2008-unclezeiv/release/scripts/mesh_poly_reduce.py
branches/soc-2008-unclezeiv/release/scripts/obdatacopier.py
branches/soc-2008-unclezeiv/release/scripts/object_apply_def.py
branches/soc-2008-unclezeiv/release/scripts/object_batch_name_edit.py
branches/soc-2008-unclezeiv/release/scripts/off_export.py
branches/soc-2008-unclezeiv/release/scripts/off_import.py
branches/soc-2008-unclezeiv/release/scripts/paths_import.py
branches/soc-2008-unclezeiv/release/scripts/raw_export.py
branches/soc-2008-unclezeiv/release/scripts/raw_import.py
branches/soc-2008-unclezeiv/release/scripts/renameobjectbyblock.py
branches/soc-2008-unclezeiv/release/scripts/render_save_layers.py
branches/soc-2008-unclezeiv/release/scripts/rvk1_torvk2.py
branches/soc-2008-unclezeiv/release/scripts/save_theme.py
branches/soc-2008-unclezeiv/release/scripts/scripttemplate_camer_object.py
branches/soc-2008-unclezeiv/release/scripts/scripttemplate_metaball_create.py
branches/soc-2008-unclezeiv/release/scripts/scripttemplate_object_edit.py
branches/soc-2008-unclezeiv/release/scripts/slp_import.py
branches/soc-2008-unclezeiv/release/scripts/sysinfo.py
branches/soc-2008-unclezeiv/release/scripts/unweld.py
branches/soc-2008-unclezeiv/release/scripts/uv_from_adjacent.py
branches/soc-2008-unclezeiv/release/scripts/uvcalc_follow_active_coords.py
branches/soc-2008-unclezeiv/release/scripts/uvcalc_lightmap.py
branches/soc-2008-unclezeiv/release/scripts/uvcalc_quad_clickproj.py
branches/soc-2008-unclezeiv/release/scripts/uvcalc_smart_project.py
branches/soc-2008-unclezeiv/release/scripts/uvcopy.py
branches/soc-2008-unclezeiv/release/scripts/vertexpaint_gradient.py
branches/soc-2008-unclezeiv/release/scripts/vertexpaint_selfshadow_ao.py
branches/soc-2008-unclezeiv/release/scripts/vrml97_export.py
branches/soc-2008-unclezeiv/release/scripts/weightpaint_clean.py
branches/soc-2008-unclezeiv/release/scripts/weightpaint_gradient.py
branches/soc-2008-unclezeiv/release/scripts/weightpaint_grow_shrink.py
branches/soc-2008-unclezeiv/release/scripts/weightpaint_normalize.py
branches/soc-2008-unclezeiv/release/scripts/widgetwizard.py
branches/soc-2008-unclezeiv/release/scripts/wizard_curve2tree.py
branches/soc-2008-unclezeiv/release/scripts/x3d_export.py
branches/soc-2008-unclezeiv/release/scripts/xfig_export.py
branches/soc-2008-unclezeiv/release/scripts/xsi_export.py
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_cloth.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_effect.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_font.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_node.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/action.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/anim.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/blender.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/effect.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/font.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/group.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/image.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/library.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/mball.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/multires-firstlevel.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/multires.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/node.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/packedFile.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/scene.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/sound.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/text.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_blenlib.h
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/bpath.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/noise.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/psfont.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/util.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/genfile.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c
branches/soc-2008-unclezeiv/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2008-unclezeiv/source/blender/ftfont/intern/FTF_TTFont.cpp
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/readimage.c
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/util.c
branches/soc-2008-unclezeiv/source/blender/include/BIF_editaction.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_screen.h
branches/soc-2008-unclezeiv/source/blender/include/BSE_sequence.h
branches/soc-2008-unclezeiv/source/blender/include/blendef.h
branches/soc-2008-unclezeiv/source/blender/include/butspace.h
branches/soc-2008-unclezeiv/source/blender/include/particle_effect.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2008-unclezeiv/source/blender/makesdna/intern/SConscript
branches/soc-2008-unclezeiv/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/soc-2008-unclezeiv/source/blender/python/BPY_extern.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
branches/soc-2008-unclezeiv/source/blender/python/BPY_menus.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Blender.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Effect.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Library.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Library.h
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/MTex.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Node.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Particle.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Sys.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/API_related.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Effect.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/LibData.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Object.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pipeline.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/rayshade.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/rendercore.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-unclezeiv/source/blender/src/B.blend.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
branches/soc-2008-unclezeiv/source/blender/src/drawaction.c
branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
branches/soc-2008-unclezeiv/source/blender/src/drawimasel.c
branches/soc-2008-unclezeiv/source/blender/src/drawipo.c
branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
branches/soc-2008-unclezeiv/source/blender/src/drawscene.c
branches/soc-2008-unclezeiv/source/blender/src/drawview.c
branches/soc-2008-unclezeiv/source/blender/src/editaction.c
branches/soc-2008-unclezeiv/source/blender/src/editcurve.c
branches/soc-2008-unclezeiv/source/blender/src/editdeform.c
branches/soc-2008-unclezeiv/source/blender/src/editfont.c
branches/soc-2008-unclezeiv/source/blender/src/editimasel.c
branches/soc-2008-unclezeiv/source/blender/src/editipo.c
branches/soc-2008-unclezeiv/source/blender/src/editobject.c
branches/soc-2008-unclezeiv/source/blender/src/editscreen.c
branches/soc-2008-unclezeiv/source/blender/src/editsima.c
branches/soc-2008-unclezeiv/source/blender/src/editsound.c
branches/soc-2008-unclezeiv/source/blender/src/filesel.c
branches/soc-2008-unclezeiv/source/blender/src/fluidsim.c
branches/soc-2008-unclezeiv/source/blender/src/header_action.c
branches/soc-2008-unclezeiv/source/blender/src/header_image.c
branches/soc-2008-unclezeiv/source/blender/src/header_ipo.c
branches/soc-2008-unclezeiv/source/blender/src/header_nla.c
branches/soc-2008-unclezeiv/source/blender/src/header_script.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/headerbuttons.c
branches/soc-2008-unclezeiv/source/blender/src/interface_draw.c
branches/soc-2008-unclezeiv/source/blender/src/meshtools.c
branches/soc-2008-unclezeiv/source/blender/src/outliner.c
branches/soc-2008-unclezeiv/source/blender/src/poselib.c
branches/soc-2008-unclezeiv/source/blender/src/screendump.c
branches/soc-2008-unclezeiv/source/blender/src/seqaudio.c
branches/soc-2008-unclezeiv/source/blender/src/sequence.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/splash.jpg.c
branches/soc-2008-unclezeiv/source/blender/src/toets.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/usiblender.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/blender/src/writeimage.c
branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_File.cpp
branches/soc-2008-unclezeiv/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2008-unclezeiv/source/creator/CMakeLists.txt
branches/soc-2008-unclezeiv/source/creator/creator.c
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/SConscript
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Callback.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/SConscript
branches/soc-2008-unclezeiv/tools/btools.py
Added Paths:
-----------
branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mmap_win.c
branches/soc-2008-unclezeiv/intern/guardedalloc/mmap_win.h
branches/soc-2008-unclezeiv/release/scripts/scripttemplate_ipo_gen.py
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/mac_compat_glext.h
Modified: branches/soc-2008-unclezeiv/CMakeLists.txt
===================================================================
--- branches/soc-2008-unclezeiv/CMakeLists.txt 2008-05-04 11:00:33 UTC (rev 14673)
+++ branches/soc-2008-unclezeiv/CMakeLists.txt 2008-05-04 11:06:41 UTC (rev 14674)
@@ -60,7 +60,7 @@
OPTION(WITH_VERSE "Enable Verse (http://verse.blender.org)" OFF)
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
-OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" OFF)
+OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
@@ -250,6 +250,10 @@
ELSE (MSVC80)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
ENDIF(MSVC80)
+ IF (MSVC90)
+ SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+ ENDIF(MSVC90)
+
SET(QUICKTIME ${LIBDIR}/QTDevWin)
SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
@@ -258,7 +262,7 @@
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
+ SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
@@ -299,7 +303,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ")
+ SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32)
IF(APPLE)
Modified: branches/soc-2008-unclezeiv/SConstruct
===================================================================
--- branches/soc-2008-unclezeiv/SConstruct 2008-05-04 11:00:33 UTC (rev 14673)
+++ branches/soc-2008-unclezeiv/SConstruct 2008-05-04 11:06:41 UTC (rev 14674)
@@ -143,7 +143,7 @@
env['OURPLATFORM'] = platform
-configfile = B.arguments.get('BF_CONFIG', 'config'+os.sep+platform+'-config.py')
+configfile = 'config'+os.sep+platform+'-config.py'
if os.path.exists(configfile):
print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
@@ -157,13 +157,14 @@
# 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('user-config.py'):
- print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + 'user-config.py'
- optfiles += ['user-config.py']
+if os.path.exists(userconfig):
+ print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
+ optfiles += [userconfig]
else:
- print B.bc.WARNING + 'user-config.py' + " 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)
@@ -178,20 +179,20 @@
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'] == 'icc':
- env.Append(LINKFLAGS=['-openmp', '-static-intel'])
- env['CCFLAGS'].append('-openmp')
- env['CPPFLAGS'].append('-openmp')
- env['CXXFLAGS'].append('-openmp')
- else:
- env['CCFLAGS'].append('-fopenmp')
- env['CPPFLAGS'].append('-fopenmp')
- env['CXXFLAGS'].append('-fopenmp')
+ if env['OURPLATFORM']=='win32-vc':
+ env['CCFLAGS'].append('/openmp')
+ env['CPPFLAGS'].append('/openmp')
+ env['CXXFLAGS'].append('/openmp')
+ else:
+ if env['CC'] == 'icc':
+ env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+ env['CCFLAGS'].append('-openmp')
+ env['CPPFLAGS'].append('-openmp')
+ env['CXXFLAGS'].append('-openmp')
+ else:
+ env['CCFLAGS'].append('-fopenmp')
+ env['CPPFLAGS'].append('-fopenmp')
+ env['CXXFLAGS'].append('-fopenmp')
#check for additional debug libnames
@@ -263,10 +264,18 @@
if os.path.exists(B.root_build_dir):
print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
dirs = os.listdir(B.root_build_dir)
- for dir in dirs:
- if os.path.isdir(B.root_build_dir + dir) == 1:
- print "clean dir %s"%(B.root_build_dir+dir)
- shutil.rmtree(B.root_build_dir+dir)
+ for entry in dirs:
+ if os.path.isdir(B.root_build_dir + entry) == 1:
+ print "clean dir %s"%(B.root_build_dir+entry)
+ shutil.rmtree(B.root_build_dir+entry)
+ else: # remove file
+ print "remove file %s"%(B.root_build_dir+entry)
+ os.remove(B.root_build_dir+entry)
+ for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
+ 'extern/xvidcore/build/generic/platform.inc']:
+ if os.path.exists(confile):
+ print "clean file %s"%confile
+ os.remove(confile)
print B.bc.OKGREEN+'...done'+B.bc.ENDC
else:
print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
@@ -355,30 +364,30 @@
scriptinstall = []
if env['OURPLATFORM']!='darwin':
- for dp, dn, df in os.walk('bin/.blender'):
- if 'CVS' in dn:
- dn.remove('CVS')
- if '.svn' in dn:
- dn.remove('.svn')
- for f in df:
- dotblendlist.append(dp+os.sep+f)
- dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
+ for dp, dn, df in os.walk('bin/.blender'):
+ if 'CVS' in dn:
+ dn.remove('CVS')
+ if '.svn' in dn:
+ dn.remove('.svn')
+ for f in df:
+ dotblendlist.append(dp+os.sep+f)
+ dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
- dotblenderinstall = []
- for targetdir,srcfile in zip(dottargetlist, dotblendlist):
- td, tf = os.path.split(targetdir)
- dotblenderinstall.append(env.Install(dir=td, source=srcfile))
-
- #-- .blender/scripts
- scriptpath='release/scripts'
- for dp, dn, df in os.walk(scriptpath):
- if 'CVS' in dn:
- dn.remove('CVS')
- if '.svn' in dn:
- dn.remove('.svn')
- dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
- source=[dp+os.sep+f for f in df]
- scriptinstall.append(env.Install(dir=dir,source=source))
+ dotblenderinstall = []
+ for targetdir,srcfile in zip(dottargetlist, dotblendlist):
+ td, tf = os.path.split(targetdir)
+ dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+
+ #-- .blender/scripts
+ scriptpath='release/scripts'
+ for dp, dn, df in os.walk(scriptpath):
+ if 'CVS' in dn:
+ dn.remove('CVS')
+ if '.svn' in dn:
+ dn.remove('.svn')
+ dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
+ source=[dp+os.sep+f for f in df]
+ scriptinstall.append(env.Install(dir=dir,source=source))
#-- plugins
pluglist = []
@@ -389,9 +398,26 @@
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
+ print ">>>", env['BF_INSTALLDIR'], tp, f
pluglist.append(tp+os.sep+f)
plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
+# header files for plugins
+pluglist.append('source/blender/blenpluginapi/documentation.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h')
+pluglist.append('source/blender/blenpluginapi/externdef.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h')
+pluglist.append('source/blender/blenpluginapi/floatpatch.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h')
+pluglist.append('source/blender/blenpluginapi/iff.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h')
+pluglist.append('source/blender/blenpluginapi/plugin.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h')
+pluglist.append('source/blender/blenpluginapi/util.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h')
+pluglist.append('source/blender/blenpluginapi/plugin.DEF')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def')
+
plugininstall = []
for targetdir,srcfile in zip(plugtargetlist, pluglist):
td, tf = os.path.split(targetdir)
@@ -410,9 +436,9 @@
textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
if env['OURPLATFORM']=='darwin':
- allinstall = [blenderinstall, plugininstall, textinstall]
+ allinstall = [blenderinstall, plugininstall, textinstall]
else:
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
@@ -432,10 +458,17 @@
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
if env['WITH_BF_ICONV']:
dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
-# if env['WITH_BF_FFMPEG']:
-# dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
-# '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
-# '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
+ if env['WITH_BF_FFMPEG']:
+ dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+ '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
+ '${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
+ '${LCGDIR}/ffmpeg/lib/avutil-49.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaad-0.dll',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list