[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22630] branches/volume25: svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender
Matt Ebb
matt at mke3.net
Wed Aug 19 13:18:53 CEST 2009
Revision: 22630
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22630
Author: broken
Date: 2009-08-19 13:18:52 +0200 (Wed, 19 Aug 2009)
Log Message:
-----------
svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/volume25/CMake/macros.cmake
branches/volume25/SConstruct
branches/volume25/blenderplayer/CMakeLists.txt
branches/volume25/config/darwin-config.py
branches/volume25/config/linux2-config.py
branches/volume25/config/win32-mingw-config.py
branches/volume25/config/win32-vc-config.py
branches/volume25/extern/glew/CMakeLists.txt
branches/volume25/extern/libopenjpeg/CMakeLists.txt
branches/volume25/extern/xvidcore/build/generic/Makefile
branches/volume25/extern/xvidcore/build/generic/bootstrap.sh
branches/volume25/extern/xvidcore/build/generic/config.guess
branches/volume25/extern/xvidcore/build/generic/config.sub
branches/volume25/extern/xvidcore/build/generic/configure
branches/volume25/extern/xvidcore/build/generic/configure.in
branches/volume25/extern/xvidcore/build/generic/install-sh
branches/volume25/extern/xvidcore/build/generic/libxvidcore.def
branches/volume25/extern/xvidcore/build/generic/libxvidcore.ld
branches/volume25/extern/xvidcore/build/generic/missing
branches/volume25/extern/xvidcore/build/generic/sources.inc
branches/volume25/extern/xvidcore/src/bitstream/bitstream.c
branches/volume25/extern/xvidcore/src/bitstream/bitstream.h
branches/volume25/extern/xvidcore/src/bitstream/cbp.h
branches/volume25/extern/xvidcore/src/bitstream/mbcoding.c
branches/volume25/extern/xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
branches/volume25/extern/xvidcore/src/bitstream/x86_asm/cbp_sse2.asm
branches/volume25/extern/xvidcore/src/dct/fdct.h
branches/volume25/extern/xvidcore/src/dct/ia64_asm/fdct_ia64.s
branches/volume25/extern/xvidcore/src/dct/ia64_asm/idct_fini.s
branches/volume25/extern/xvidcore/src/dct/ia64_asm/idct_ia64_ecc.s
branches/volume25/extern/xvidcore/src/dct/ia64_asm/idct_ia64_gcc.s
branches/volume25/extern/xvidcore/src/dct/ia64_asm/idct_init.s
branches/volume25/extern/xvidcore/src/dct/idct.h
branches/volume25/extern/xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm
branches/volume25/extern/xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm
branches/volume25/extern/xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm
branches/volume25/extern/xvidcore/src/dct/x86_asm/idct_3dne.asm
branches/volume25/extern/xvidcore/src/dct/x86_asm/idct_mmx.asm
branches/volume25/extern/xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm
branches/volume25/extern/xvidcore/src/decoder.c
branches/volume25/extern/xvidcore/src/decoder.h
branches/volume25/extern/xvidcore/src/encoder.c
branches/volume25/extern/xvidcore/src/encoder.h
branches/volume25/extern/xvidcore/src/global.h
branches/volume25/extern/xvidcore/src/image/colorspace.c
branches/volume25/extern/xvidcore/src/image/colorspace.h
branches/volume25/extern/xvidcore/src/image/ia64_asm/interpolate8x8_ia64.s
branches/volume25/extern/xvidcore/src/image/ia64_asm/interpolate8x8_ia64_exact.s
branches/volume25/extern/xvidcore/src/image/image.c
branches/volume25/extern/xvidcore/src/image/image.h
branches/volume25/extern/xvidcore/src/image/interpolate8x8.h
branches/volume25/extern/xvidcore/src/image/postprocessing.c
branches/volume25/extern/xvidcore/src/image/qpel.c
branches/volume25/extern/xvidcore/src/image/qpel.h
branches/volume25/extern/xvidcore/src/image/reduced.h
branches/volume25/extern/xvidcore/src/image/x86_asm/colorspace_mmx.inc
branches/volume25/extern/xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/postprocessing_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/postprocessing_sse2.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/qpel_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/reduced_mmx.asm
branches/volume25/extern/xvidcore/src/motion/estimation_bvop.c
branches/volume25/extern/xvidcore/src/motion/estimation_pvop.c
branches/volume25/extern/xvidcore/src/motion/estimation_rd_based.c
branches/volume25/extern/xvidcore/src/motion/estimation_rd_based_bvop.c
branches/volume25/extern/xvidcore/src/motion/gmc.c
branches/volume25/extern/xvidcore/src/motion/gmc.h
branches/volume25/extern/xvidcore/src/motion/ia64_asm/calc_delta_1.s
branches/volume25/extern/xvidcore/src/motion/ia64_asm/calc_delta_2.s
branches/volume25/extern/xvidcore/src/motion/ia64_asm/calc_delta_3.s
branches/volume25/extern/xvidcore/src/motion/ia64_asm/halfpel8_refine_ia64.s
branches/volume25/extern/xvidcore/src/motion/ia64_asm/sad_ia64.s
branches/volume25/extern/xvidcore/src/motion/motion.h
branches/volume25/extern/xvidcore/src/motion/motion_inlines.h
branches/volume25/extern/xvidcore/src/motion/sad.h
branches/volume25/extern/xvidcore/src/motion/x86_asm/sad_3dn.asm
branches/volume25/extern/xvidcore/src/motion/x86_asm/sad_3dne.asm
branches/volume25/extern/xvidcore/src/motion/x86_asm/sad_mmx.asm
branches/volume25/extern/xvidcore/src/motion/x86_asm/sad_sse2.asm
branches/volume25/extern/xvidcore/src/motion/x86_asm/sad_xmm.asm
branches/volume25/extern/xvidcore/src/plugins/plugin_dump.c
branches/volume25/extern/xvidcore/src/plugins/plugin_lumimasking.c
branches/volume25/extern/xvidcore/src/portab.h
branches/volume25/extern/xvidcore/src/quant/ia64_asm/quant_h263_ia64.s
branches/volume25/extern/xvidcore/src/quant/quant.h
branches/volume25/extern/xvidcore/src/quant/quant_matrix.c
branches/volume25/extern/xvidcore/src/quant/quant_matrix.h
branches/volume25/extern/xvidcore/src/quant/quant_mpeg.c
branches/volume25/extern/xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm
branches/volume25/extern/xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm
branches/volume25/extern/xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm
branches/volume25/extern/xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm
branches/volume25/extern/xvidcore/src/utils/emms.h
branches/volume25/extern/xvidcore/src/utils/ia64_asm/mem_transfer_ia64.s
branches/volume25/extern/xvidcore/src/utils/mbfunctions.h
branches/volume25/extern/xvidcore/src/utils/mbtransquant.c
branches/volume25/extern/xvidcore/src/utils/mem_transfer.h
branches/volume25/extern/xvidcore/src/utils/x86_asm/cpuid.asm
branches/volume25/extern/xvidcore/src/utils/x86_asm/interlacing_mmx.asm
branches/volume25/extern/xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm
branches/volume25/extern/xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm
branches/volume25/extern/xvidcore/src/xvid.c
branches/volume25/extern/xvidcore/src/xvid.h
branches/volume25/intern/audaspace/CMakeLists.txt
branches/volume25/intern/audaspace/Makefile
branches/volume25/intern/audaspace/SConscript
branches/volume25/intern/audaspace/SDL/AUD_SDLDevice.cpp
branches/volume25/intern/audaspace/SDL/AUD_SDLDevice.h
branches/volume25/intern/audaspace/SDL/Makefile
branches/volume25/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/volume25/intern/audaspace/ffmpeg/Makefile
branches/volume25/intern/audaspace/intern/AUD_C-API.cpp
branches/volume25/intern/audaspace/intern/AUD_C-API.h
branches/volume25/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/volume25/intern/audaspace/intern/AUD_FloatMixer.cpp
branches/volume25/intern/audaspace/intern/AUD_Space.h
branches/volume25/intern/elbeem/CMakeLists.txt
branches/volume25/intern/elbeem/intern/paraloopend.h
branches/volume25/intern/ghost/CMakeLists.txt
branches/volume25/intern/ghost/intern/GHOST_WindowX11.cpp
branches/volume25/intern/guardedalloc/BLO_sys_types.h
branches/volume25/intern/guardedalloc/CMakeLists.txt
branches/volume25/intern/opennl/superlu/BLO_sys_types.h
branches/volume25/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/volume25/intern/smoke/intern/VEC3.h
branches/volume25/intern/smoke/intern/WAVELET_NOISE.h
branches/volume25/intern/smoke/intern/smoke_API.cpp
branches/volume25/release/Makefile
branches/volume25/release/io/engine_render_pov.py
branches/volume25/release/scripts/export_map.py
branches/volume25/release/ui/buttons_data_armature.py
branches/volume25/release/ui/buttons_data_bone.py
branches/volume25/release/ui/buttons_data_camera.py
branches/volume25/release/ui/buttons_data_curve.py
branches/volume25/release/ui/buttons_data_empty.py
branches/volume25/release/ui/buttons_data_lamp.py
branches/volume25/release/ui/buttons_data_lattice.py
branches/volume25/release/ui/buttons_data_mesh.py
branches/volume25/release/ui/buttons_data_metaball.py
branches/volume25/release/ui/buttons_data_modifier.py
branches/volume25/release/ui/buttons_data_text.py
branches/volume25/release/ui/buttons_game.py
branches/volume25/release/ui/buttons_material.py
branches/volume25/release/ui/buttons_object.py
branches/volume25/release/ui/buttons_object_constraint.py
branches/volume25/release/ui/buttons_particle.py
branches/volume25/release/ui/buttons_physics_cloth.py
branches/volume25/release/ui/buttons_physics_field.py
branches/volume25/release/ui/buttons_physics_fluid.py
branches/volume25/release/ui/buttons_physics_smoke.py
branches/volume25/release/ui/buttons_physics_softbody.py
branches/volume25/release/ui/buttons_scene.py
branches/volume25/release/ui/buttons_texture.py
branches/volume25/release/ui/buttons_world.py
branches/volume25/release/ui/space_buttons.py
branches/volume25/release/ui/space_console.py
branches/volume25/release/ui/space_filebrowser.py
branches/volume25/release/ui/space_image.py
branches/volume25/release/ui/space_info.py
branches/volume25/release/ui/space_outliner.py
branches/volume25/release/ui/space_sequencer.py
branches/volume25/release/ui/space_text.py
branches/volume25/release/ui/space_time.py
branches/volume25/release/ui/space_view3d.py
branches/volume25/release/ui/space_view3d_toolbar.py
branches/volume25/source/Makefile
branches/volume25/source/blender/blenfont/BLF_api.h
branches/volume25/source/blender/blenfont/CMakeLists.txt
branches/volume25/source/blender/blenfont/intern/blf.c
branches/volume25/source/blender/blenfont/intern/blf_dir.c
branches/volume25/source/blender/blenfont/intern/blf_font.c
branches/volume25/source/blender/blenfont/intern/blf_glyph.c
branches/volume25/source/blender/blenfont/intern/blf_internal.h
branches/volume25/source/blender/blenfont/intern/blf_internal_types.h
branches/volume25/source/blender/blenkernel/BKE_animsys.h
branches/volume25/source/blender/blenkernel/BKE_blender.h
branches/volume25/source/blender/blenkernel/BKE_brush.h
branches/volume25/source/blender/blenkernel/BKE_context.h
branches/volume25/source/blender/blenkernel/BKE_global.h
branches/volume25/source/blender/blenkernel/BKE_node.h
branches/volume25/source/blender/blenkernel/BKE_pointcache.h
branches/volume25/source/blender/blenkernel/BKE_scene.h
branches/volume25/source/blender/blenkernel/BKE_sculpt.h
branches/volume25/source/blender/blenkernel/BKE_sequence.h
branches/volume25/source/blender/blenkernel/BKE_sound.h
branches/volume25/source/blender/blenkernel/BKE_unit.h
branches/volume25/source/blender/blenkernel/BKE_utildefines.h
branches/volume25/source/blender/blenkernel/CMakeLists.txt
branches/volume25/source/blender/blenkernel/SConscript
branches/volume25/source/blender/blenkernel/intern/DerivedMesh.c
branches/volume25/source/blender/blenkernel/intern/Makefile
branches/volume25/source/blender/blenkernel/intern/anim_sys.c
branches/volume25/source/blender/blenkernel/intern/blender.c
branches/volume25/source/blender/blenkernel/intern/brush.c
branches/volume25/source/blender/blenkernel/intern/collision.c
branches/volume25/source/blender/blenkernel/intern/context.c
branches/volume25/source/blender/blenkernel/intern/idprop.c
branches/volume25/source/blender/blenkernel/intern/image.c
branches/volume25/source/blender/blenkernel/intern/ipo.c
branches/volume25/source/blender/blenkernel/intern/material.c
branches/volume25/source/blender/blenkernel/intern/modifier.c
branches/volume25/source/blender/blenkernel/intern/node.c
branches/volume25/source/blender/blenkernel/intern/object.c
branches/volume25/source/blender/blenkernel/intern/particle.c
branches/volume25/source/blender/blenkernel/intern/particle_system.c
branches/volume25/source/blender/blenkernel/intern/pointcache.c
branches/volume25/source/blender/blenkernel/intern/scene.c
branches/volume25/source/blender/blenkernel/intern/seqeffects.c
branches/volume25/source/blender/blenkernel/intern/smoke.c
branches/volume25/source/blender/blenkernel/intern/sound.c
branches/volume25/source/blender/blenkernel/intern/unit.c
branches/volume25/source/blender/blenlib/CMakeLists.txt
branches/volume25/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/volume25/source/blender/blenlib/intern/BLI_kdtree.c
branches/volume25/source/blender/blenlib/intern/boxpack2d.c
branches/volume25/source/blender/blenlib/intern/listbase.c
branches/volume25/source/blender/blenlib/intern/storage.c
branches/volume25/source/blender/blenloader/BLO_sys_types.h
branches/volume25/source/blender/blenloader/intern/readfile.c
branches/volume25/source/blender/blenloader/intern/readfile.h
branches/volume25/source/blender/blenloader/intern/writefile.c
branches/volume25/source/blender/editors/CMakeLists.txt
branches/volume25/source/blender/editors/Makefile
branches/volume25/source/blender/editors/SConscript
branches/volume25/source/blender/editors/animation/anim_channels_defines.c
branches/volume25/source/blender/editors/animation/anim_channels_edit.c
branches/volume25/source/blender/editors/animation/anim_deps.c
branches/volume25/source/blender/editors/animation/anim_filter.c
branches/volume25/source/blender/editors/animation/keyingsets.c
branches/volume25/source/blender/editors/armature/editarmature.c
branches/volume25/source/blender/editors/armature/editarmature_sketch.c
branches/volume25/source/blender/editors/armature/poselib.c
branches/volume25/source/blender/editors/armature/poseobject.c
branches/volume25/source/blender/editors/include/ED_anim_api.h
branches/volume25/source/blender/editors/include/ED_node.h
branches/volume25/source/blender/editors/include/ED_object.h
branches/volume25/source/blender/editors/include/ED_previewrender.h
branches/volume25/source/blender/editors/include/ED_screen.h
branches/volume25/source/blender/editors/include/ED_screen_types.h
branches/volume25/source/blender/editors/include/ED_space_api.h
branches/volume25/source/blender/editors/include/ED_view3d.h
branches/volume25/source/blender/editors/include/UI_interface.h
branches/volume25/source/blender/editors/interface/interface.c
branches/volume25/source/blender/editors/interface/interface_handlers.c
branches/volume25/source/blender/editors/interface/interface_intern.h
branches/volume25/source/blender/editors/interface/interface_layout.c
branches/volume25/source/blender/editors/interface/interface_panel.c
branches/volume25/source/blender/editors/interface/interface_regions.c
branches/volume25/source/blender/editors/interface/interface_templates.c
branches/volume25/source/blender/editors/interface/interface_utils.c
branches/volume25/source/blender/editors/interface/interface_widgets.c
branches/volume25/source/blender/editors/interface/resources.c
branches/volume25/source/blender/editors/mesh/editmesh.c
branches/volume25/source/blender/editors/mesh/editmesh_add.c
branches/volume25/source/blender/editors/mesh/editmesh_loop.c
branches/volume25/source/blender/editors/mesh/editmesh_mods.c
branches/volume25/source/blender/editors/mesh/editmesh_tools.c
branches/volume25/source/blender/editors/mesh/mesh_layers.c
branches/volume25/source/blender/editors/mesh/mesh_ops.c
branches/volume25/source/blender/editors/object/editconstraint.c
branches/volume25/source/blender/editors/object/object_edit.c
branches/volume25/source/blender/editors/object/object_intern.h
branches/volume25/source/blender/editors/object/object_modifier.c
branches/volume25/source/blender/editors/object/object_ops.c
branches/volume25/source/blender/editors/object/object_vgroup.c
branches/volume25/source/blender/editors/physics/ed_pointcache.c
branches/volume25/source/blender/editors/physics/editparticle.c
branches/volume25/source/blender/editors/physics/physics_boids.c
branches/volume25/source/blender/editors/preview/previewrender.c
branches/volume25/source/blender/editors/screen/CMakeLists.txt
branches/volume25/source/blender/editors/screen/Makefile
branches/volume25/source/blender/editors/screen/SConscript
branches/volume25/source/blender/editors/screen/area.c
branches/volume25/source/blender/editors/screen/screen_context.c
branches/volume25/source/blender/editors/screen/screen_edit.c
branches/volume25/source/blender/editors/screen/screen_ops.c
branches/volume25/source/blender/editors/sculpt_paint/paint_image.c
branches/volume25/source/blender/editors/sculpt_paint/paint_ops.c
branches/volume25/source/blender/editors/sculpt_paint/paint_utils.c
branches/volume25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/volume25/source/blender/editors/sculpt_paint/sculpt.c
branches/volume25/source/blender/editors/space_action/action_draw.c
branches/volume25/source/blender/editors/space_action/action_header.c
branches/volume25/source/blender/editors/space_action/action_intern.h
branches/volume25/source/blender/editors/space_action/space_action.c
branches/volume25/source/blender/editors/space_api/spacetypes.c
branches/volume25/source/blender/editors/space_buttons/buttons_context.c
branches/volume25/source/blender/editors/space_buttons/buttons_ops.c
branches/volume25/source/blender/editors/space_file/Makefile
branches/volume25/source/blender/editors/space_file/SConscript
branches/volume25/source/blender/editors/space_file/file_panels.c
branches/volume25/source/blender/editors/space_graph/graph_draw.c
branches/volume25/source/blender/editors/space_graph/graph_header.c
branches/volume25/source/blender/editors/space_graph/graph_intern.h
branches/volume25/source/blender/editors/space_graph/space_graph.c
branches/volume25/source/blender/editors/space_image/Makefile
branches/volume25/source/blender/editors/space_image/SConscript
branches/volume25/source/blender/editors/space_image/image_buttons.c
branches/volume25/source/blender/editors/space_image/image_draw.c
branches/volume25/source/blender/editors/space_info/info_intern.h
branches/volume25/source/blender/editors/space_nla/nla_channels.c
branches/volume25/source/blender/editors/space_nla/nla_draw.c
branches/volume25/source/blender/editors/space_nla/nla_edit.c
branches/volume25/source/blender/editors/space_nla/nla_header.c
branches/volume25/source/blender/editors/space_nla/nla_intern.h
branches/volume25/source/blender/editors/space_nla/space_nla.c
branches/volume25/source/blender/editors/space_node/node_draw.c
branches/volume25/source/blender/editors/space_node/node_edit.c
branches/volume25/source/blender/editors/space_node/node_header.c
branches/volume25/source/blender/editors/space_node/node_intern.h
branches/volume25/source/blender/editors/space_node/node_state.c
branches/volume25/source/blender/editors/space_node/space_node.c
branches/volume25/source/blender/editors/space_outliner/outliner.c
branches/volume25/source/blender/editors/space_outliner/outliner_header.c
branches/volume25/source/blender/editors/space_sequencer/sequencer_draw.c
branches/volume25/source/blender/editors/space_text/text_header.c
branches/volume25/source/blender/editors/space_time/space_time.c
branches/volume25/source/blender/editors/space_view3d/drawarmature.c
branches/volume25/source/blender/editors/space_view3d/drawmesh.c
branches/volume25/source/blender/editors/space_view3d/drawobject.c
branches/volume25/source/blender/editors/space_view3d/space_view3d.c
branches/volume25/source/blender/editors/space_view3d/view3d_buttons.c
branches/volume25/source/blender/editors/space_view3d/view3d_draw.c
branches/volume25/source/blender/editors/space_view3d/view3d_edit.c
branches/volume25/source/blender/editors/space_view3d/view3d_header.c
branches/volume25/source/blender/editors/space_view3d/view3d_intern.h
branches/volume25/source/blender/editors/space_view3d/view3d_select.c
branches/volume25/source/blender/editors/space_view3d/view3d_snap.c
branches/volume25/source/blender/editors/space_view3d/view3d_toolbar.c
branches/volume25/source/blender/editors/space_view3d/view3d_view.c
branches/volume25/source/blender/editors/transform/transform_conversions.c
branches/volume25/source/blender/editors/transform/transform_generics.c
branches/volume25/source/blender/editors/transform/transform_manipulator.c
branches/volume25/source/blender/editors/transform/transform_orientations.c
branches/volume25/source/blender/editors/util/undo.c
branches/volume25/source/blender/gpu/GPU_draw.h
branches/volume25/source/blender/gpu/GPU_extensions.h
branches/volume25/source/blender/gpu/GPU_material.h
branches/volume25/source/blender/gpu/intern/gpu_codegen.c
branches/volume25/source/blender/gpu/intern/gpu_codegen.h
branches/volume25/source/blender/gpu/intern/gpu_draw.c
branches/volume25/source/blender/gpu/intern/gpu_extensions.c
branches/volume25/source/blender/gpu/intern/gpu_material.c
branches/volume25/source/blender/imbuf/CMakeLists.txt
branches/volume25/source/blender/makesdna/DNA_brush_types.h
branches/volume25/source/blender/makesdna/DNA_material_types.h
branches/volume25/source/blender/makesdna/DNA_object_types.h
branches/volume25/source/blender/makesdna/DNA_scene_types.h
branches/volume25/source/blender/makesdna/DNA_space_types.h
branches/volume25/source/blender/makesdna/DNA_userdef_types.h
branches/volume25/source/blender/makesdna/DNA_windowmanager_types.h
branches/volume25/source/blender/makesrna/RNA_access.h
branches/volume25/source/blender/makesrna/RNA_define.h
branches/volume25/source/blender/makesrna/RNA_enum_types.h
branches/volume25/source/blender/makesrna/RNA_types.h
branches/volume25/source/blender/makesrna/intern/CMakeLists.txt
branches/volume25/source/blender/makesrna/intern/rna_ID.c
branches/volume25/source/blender/makesrna/intern/rna_access.c
branches/volume25/source/blender/makesrna/intern/rna_brush.c
branches/volume25/source/blender/makesrna/intern/rna_context.c
branches/volume25/source/blender/makesrna/intern/rna_define.c
branches/volume25/source/blender/makesrna/intern/rna_internal.h
branches/volume25/source/blender/makesrna/intern/rna_main.c
branches/volume25/source/blender/makesrna/intern/rna_material.c
branches/volume25/source/blender/makesrna/intern/rna_object.c
branches/volume25/source/blender/makesrna/intern/rna_object_force.c
branches/volume25/source/blender/makesrna/intern/rna_render.c
branches/volume25/source/blender/makesrna/intern/rna_rna.c
branches/volume25/source/blender/makesrna/intern/rna_scene.c
branches/volume25/source/blender/makesrna/intern/rna_screen.c
branches/volume25/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/volume25/source/blender/makesrna/intern/rna_sequence.c
branches/volume25/source/blender/makesrna/intern/rna_space.c
branches/volume25/source/blender/makesrna/intern/rna_texture.c
branches/volume25/source/blender/makesrna/intern/rna_ui.c
branches/volume25/source/blender/makesrna/intern/rna_ui_api.c
branches/volume25/source/blender/makesrna/intern/rna_userdef.c
branches/volume25/source/blender/nodes/CMakeLists.txt
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_at.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/volume25/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
branches/volume25/source/blender/nodes/intern/TEX_util.c
branches/volume25/source/blender/nodes/intern/TEX_util.h
branches/volume25/source/blender/python/epy_doc_gen.py
branches/volume25/source/blender/python/generic/BGL.c
branches/volume25/source/blender/python/generic/BGL.h
branches/volume25/source/blender/python/generic/euler.c
branches/volume25/source/blender/python/generic/matrix.c
branches/volume25/source/blender/python/generic/quat.c
branches/volume25/source/blender/python/generic/vector.c
branches/volume25/source/blender/python/intern/bpy_interface.c
branches/volume25/source/blender/python/intern/bpy_rna.c
branches/volume25/source/blender/python/intern/bpy_rna.h
branches/volume25/source/blender/python/intern/bpy_ui.c
branches/volume25/source/blender/python/intern/bpy_util.c
branches/volume25/source/blender/render/CMakeLists.txt
branches/volume25/source/blender/render/extern/include/RE_pipeline.h
branches/volume25/source/blender/render/extern/include/RE_shader_ext.h
branches/volume25/source/blender/render/intern/source/convertblender.c
branches/volume25/source/blender/render/intern/source/pipeline.c
branches/volume25/source/blender/render/intern/source/rayshade.c
branches/volume25/source/blender/render/intern/source/rendercore.c
branches/volume25/source/blender/render/intern/source/shadeinput.c
branches/volume25/source/blender/render/intern/source/shadeoutput.c
branches/volume25/source/blender/render/intern/source/strand.c
branches/volume25/source/blender/render/intern/source/texture.c
branches/volume25/source/blender/render/intern/source/zbuf.c
branches/volume25/source/blender/windowmanager/CMakeLists.txt
branches/volume25/source/blender/windowmanager/WM_api.h
branches/volume25/source/blender/windowmanager/WM_types.h
branches/volume25/source/blender/windowmanager/intern/wm.c
branches/volume25/source/blender/windowmanager/intern/wm_event_system.c
branches/volume25/source/blender/windowmanager/intern/wm_files.c
branches/volume25/source/blender/windowmanager/intern/wm_init_exit.c
branches/volume25/source/blender/windowmanager/intern/wm_operators.c
branches/volume25/source/blender/windowmanager/intern/wm_window.c
branches/volume25/source/creator/CMakeLists.txt
branches/volume25/source/creator/creator.c
branches/volume25/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/volume25/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/volume25/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/volume25/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/volume25/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/volume25/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
branches/volume25/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/volume25/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
branches/volume25/source/gameengine/Converter/BL_ArmatureObject.h
branches/volume25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/volume25/source/gameengine/Converter/BL_DeformableGameObject.h
branches/volume25/source/gameengine/Converter/BL_MeshDeformer.h
branches/volume25/source/gameengine/Converter/BL_ModifierDeformer.h
branches/volume25/source/gameengine/Converter/BL_ShapeDeformer.h
branches/volume25/source/gameengine/Converter/BL_SkinDeformer.h
branches/volume25/source/gameengine/Converter/BL_SkinMeshObject.h
branches/volume25/source/gameengine/Converter/BlenderWorldInfo.h
branches/volume25/source/gameengine/Converter/CMakeLists.txt
branches/volume25/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/volume25/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/volume25/source/gameengine/Expressions/BoolValue.h
branches/volume25/source/gameengine/Expressions/ConstExpr.h
branches/volume25/source/gameengine/Expressions/EmptyValue.h
branches/volume25/source/gameengine/Expressions/ErrorValue.h
branches/volume25/source/gameengine/Expressions/Expression.h
branches/volume25/source/gameengine/Expressions/FloatValue.h
branches/volume25/source/gameengine/Expressions/IdentifierExpr.h
branches/volume25/source/gameengine/Expressions/IfExpr.h
branches/volume25/source/gameengine/Expressions/InputParser.h
branches/volume25/source/gameengine/Expressions/IntValue.h
branches/volume25/source/gameengine/Expressions/KX_HashedPtr.h
branches/volume25/source/gameengine/Expressions/KX_Python.h
branches/volume25/source/gameengine/Expressions/Operator1Expr.h
branches/volume25/source/gameengine/Expressions/Operator2Expr.h
branches/volume25/source/gameengine/Expressions/PyObjectPlus.h
branches/volume25/source/gameengine/Expressions/StringValue.h
branches/volume25/source/gameengine/Expressions/Value.h
branches/volume25/source/gameengine/Expressions/VectorValue.h
branches/volume25/source/gameengine/Expressions/VoidValue.h
branches/volume25/source/gameengine/GameLogic/CMakeLists.txt
branches/volume25/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/volume25/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/volume25/source/gameengine/GameLogic/SCA_EventManager.h
branches/volume25/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/volume25/source/gameengine/GameLogic/SCA_IActuator.h
branches/volume25/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/volume25/source/gameengine/GameLogic/SCA_IScene.h
branches/volume25/source/gameengine/GameLogic/SCA_JoystickManager.h
branches/volume25/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/volume25/source/gameengine/GameLogic/SCA_LogicManager.h
branches/volume25/source/gameengine/GameLogic/SCA_MouseManager.h
branches/volume25/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/volume25/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/volume25/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/volume25/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/volume25/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/volume25/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/volume25/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/volume25/source/gameengine/GamePlayer/netscape/src/Makefile
branches/volume25/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/volume25/source/gameengine/Ketsji/BL_BlenderShader.h
branches/volume25/source/gameengine/Ketsji/BL_Material.h
branches/volume25/source/gameengine/Ketsji/BL_Shader.h
branches/volume25/source/gameengine/Ketsji/BL_Texture.h
branches/volume25/source/gameengine/Ketsji/CMakeLists.txt
branches/volume25/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/volume25/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/volume25/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/volume25/source/gameengine/Ketsji/KX_CameraIpoSGController.h
branches/volume25/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/volume25/source/gameengine/Ketsji/KX_Dome.h
branches/volume25/source/gameengine/Ketsji/KX_EmptyObject.h
branches/volume25/source/gameengine/Ketsji/KX_IInterpolator.h
branches/volume25/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/volume25/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/volume25/source/gameengine/Ketsji/KX_IScalarInterpolator.h
branches/volume25/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/volume25/source/gameengine/Ketsji/KX_ISystem.h
branches/volume25/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/volume25/source/gameengine/Ketsji/KX_LightIpoSGController.h
branches/volume25/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/volume25/source/gameengine/Ketsji/KX_MotionState.h
branches/volume25/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
branches/volume25/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/volume25/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/volume25/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/volume25/source/gameengine/Ketsji/KX_PositionInterpolator.h
branches/volume25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/volume25/source/gameengine/Ketsji/KX_RayCast.h
branches/volume25/source/gameengine/Ketsji/KX_RayEventManager.h
branches/volume25/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
branches/volume25/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/volume25/source/gameengine/Ketsji/KX_ScalarInterpolator.h
branches/volume25/source/gameengine/Ketsji/KX_ScalingInterpolator.h
branches/volume25/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/volume25/source/gameengine/Ketsji/KX_TimeLogger.h
branches/volume25/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/volume25/source/gameengine/Ketsji/KX_WorldInfo.h
branches/volume25/source/gameengine/Ketsji/KX_WorldIpoController.h
branches/volume25/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/volume25/source/gameengine/Network/NG_NetworkMessage.h
branches/volume25/source/gameengine/Network/NG_NetworkObject.h
branches/volume25/source/gameengine/Network/NG_NetworkScene.h
branches/volume25/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/volume25/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/volume25/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/volume25/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/volume25/source/gameengine/Physics/common/PHY_IController.h
branches/volume25/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/volume25/source/gameengine/Physics/common/PHY_IMotionState.h
branches/volume25/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/volume25/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/volume25/source/gameengine/Physics/common/PHY_IVehicle.h
branches/volume25/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/volume25/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/volume25/source/gameengine/Rasterizer/RAS_Deformer.h
branches/volume25/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/volume25/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/volume25/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/volume25/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/volume25/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/volume25/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/volume25/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/volume25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/volume25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/volume25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/volume25/source/gameengine/Rasterizer/RAS_Polygon.h
branches/volume25/source/gameengine/Rasterizer/RAS_Rect.h
branches/volume25/source/gameengine/Rasterizer/RAS_TexVert.h
branches/volume25/source/gameengine/SceneGraph/SG_BBox.h
branches/volume25/source/gameengine/SceneGraph/SG_Controller.h
branches/volume25/source/gameengine/SceneGraph/SG_DList.h
branches/volume25/source/gameengine/SceneGraph/SG_IObject.h
branches/volume25/source/gameengine/SceneGraph/SG_Node.h
branches/volume25/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/volume25/source/gameengine/SceneGraph/SG_QList.h
branches/volume25/source/gameengine/SceneGraph/SG_Spatial.h
branches/volume25/source/gameengine/SceneGraph/SG_Tree.h
branches/volume25/source/nan_compile.mk
branches/volume25/source/nan_link.mk
branches/volume25/tools/Blender.py
branches/volume25/tools/btools.py
Added Paths:
-----------
branches/volume25/extern/xvidcore/src/image/x86_asm/deintl_sse.asm
branches/volume25/extern/xvidcore/src/image/x86_asm/gmc_mmx.asm
branches/volume25/extern/xvidcore/src/motion/motion_smp.h
branches/volume25/extern/xvidcore/src/nasm.inc
branches/volume25/extern/xvidcore/src/plugins/plugin_ssim.c
branches/volume25/extern/xvidcore/src/plugins/plugin_ssim.h
branches/volume25/extern/xvidcore/src/plugins/x86_asm/
branches/volume25/extern/xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
branches/volume25/intern/audaspace/jack/
branches/volume25/intern/audaspace/jack/AUD_JackDevice.cpp
branches/volume25/intern/audaspace/jack/AUD_JackDevice.h
branches/volume25/intern/audaspace/jack/Makefile
branches/volume25/intern/guardedalloc/cpp/
branches/volume25/intern/guardedalloc/cpp/mallocn.cpp
branches/volume25/release/ui/space_node.py
branches/volume25/release/ui/space_userpref.py
branches/volume25/source/blender/blenkernel/BKE_paint.h
branches/volume25/source/blender/blenkernel/intern/paint.c
branches/volume25/source/blender/editors/space_userpref/
branches/volume25/source/blender/editors/space_userpref/Makefile
branches/volume25/source/blender/editors/space_userpref/SConscript
branches/volume25/source/blender/editors/space_userpref/space_userpref.c
branches/volume25/source/blender/editors/space_userpref/userpref_intern.h
branches/volume25/source/blender/editors/space_userpref/userpref_ops.c
Removed Paths:
-------------
branches/volume25/extern/xvidcore/src/bitstream/x86_asm/cbp_3dne.asm
branches/volume25/extern/xvidcore/src/dct/x86_64_asm/
branches/volume25/extern/xvidcore/src/dct/x86_asm/simple_idct_mmx.asm
branches/volume25/extern/xvidcore/src/image/x86_64_asm/
branches/volume25/extern/xvidcore/src/motion/x86_64_asm/
branches/volume25/extern/xvidcore/src/plugins/plugin_fixed.c
branches/volume25/extern/xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
branches/volume25/extern/xvidcore/src/quant/x86_64_asm/
branches/volume25/extern/xvidcore/src/utils/x86_64_asm/
branches/volume25/intern/audaspace/jack/AUD_JackDevice.cpp
branches/volume25/intern/audaspace/jack/AUD_JackDevice.h
branches/volume25/intern/audaspace/jack/Makefile
branches/volume25/intern/guardedalloc/cpp/mallocn.cpp
branches/volume25/source/blender/editors/space_time/time_header.c
branches/volume25/source/blender/editors/space_userpref/Makefile
branches/volume25/source/blender/editors/space_userpref/SConscript
branches/volume25/source/blender/editors/space_userpref/space_userpref.c
branches/volume25/source/blender/editors/space_userpref/userpref_intern.h
branches/volume25/source/blender/editors/space_userpref/userpref_ops.c
branches/volume25/source/gameengine/Expressions/KX_Python_dynamic.h
branches/volume25/source/gameengine/Expressions/KX_Python_static.h
Modified: branches/volume25/CMake/macros.cmake
===================================================================
--- branches/volume25/CMake/macros.cmake 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/CMake/macros.cmake 2009-08-19 11:18:52 UTC (rev 22630)
@@ -42,17 +42,37 @@
if(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
- LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
- LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+
+ LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+
+ IF(WITH_PYTHON)
+ LINK_DIRECTORIES(${PYTHON_LIBPATH})
+ ENDIF(WITH_PYTHON)
IF(WITH_INTERNATIONAL)
+ LINK_DIRECTORIES(${ICONV_LIBPATH})
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
ENDIF(WITH_INTERNATIONAL)
+ IF(WITH_SDL)
+ LINK_DIRECTORIES(${SDL_LIBPATH})
+ ENDIF(WITH_SDL)
+ IF(WITH_FFMPEG)
+ LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+ ENDIF(WITH_FFMPEG)
+ IF(WITH_OPENEXR)
+ LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+ ENDIF(WITH_OPENEXR)
+ IF(WITH_QUICKTIME)
+ LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
+ ENDIF(WITH_QUICKTIME)
IF(WITH_OPENAL)
LINK_DIRECTORIES(${OPENAL_LIBPATH})
ENDIF(WITH_OPENAL)
+ IF(WITH_JACK)
+ LINK_DIRECTORIES(${JACK_LIBPATH})
+ ENDIF(WITH_JACK)
IF(WITH_FFTW3)
LINK_DIRECTORIES(${FFTW3_LIBPATH})
- ENDIF(WITH_FFTW3)
+ ENDIF(WITH_FFTW3)
IF(WIN32)
LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -62,48 +82,45 @@
MACRO(SETUP_LIBLINKS
target)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
- #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+ #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIBRARY} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-
IF(WIN32)
-
- TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-
- TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-
+ TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
ELSE(WIN32)
-
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
ENDIF(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
-
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB})
-
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
IF(WIN32)
-
- TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-
- TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-
- ELSE(WIN32)
-
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-
+ TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+ ELSE(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
ENDIF(WIN32)
IF(WITH_INTERNATIONAL)
TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
ENDIF(WITH_INTERNATIONAL)
IF(WITH_OPENAL)
- TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
ENDIF(WITH_OPENAL)
+ IF(WITH_FFTW3)
+ TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
+ ENDIF(WITH_FFTW3)
+ IF(WITH_JACK)
+ TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
+ ENDIF(WITH_JACK)
+ IF(WITH_SDL)
+ TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
+ ENDIF(WITH_SDL)
IF(WIN32)
TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
ENDIF(WIN32)
@@ -120,3 +137,4 @@
TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
ENDIF(WIN32)
ENDMACRO(SETUP_LIBLINKS)
+
Modified: branches/volume25/SConstruct
===================================================================
--- branches/volume25/SConstruct 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/SConstruct 2009-08-19 11:18:52 UTC (rev 22630)
@@ -60,7 +60,6 @@
platform = sys.platform
quickie = None
quickdebug = None
-nsis_build = None
##### BEGIN SETUP #####
@@ -425,8 +424,6 @@
bundle = '%s.app' % prg[0]
bundledir = os.path.dirname(bundle)
for dp, dn, df in os.walk(bundle):
- if 'CVS' in dn:
- dn.remove('CVS')
if '.svn' in dn:
dn.remove('.svn')
dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
@@ -443,8 +440,6 @@
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')
@@ -471,8 +466,6 @@
scriptpaths=['release/scripts', 'release/ui', 'release/io']
for scriptpath in scriptpaths:
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/'+os.path.basename(scriptpath)+dp[len(scriptpath):]
@@ -485,8 +478,6 @@
icontargetlist = []
for tp, tn, tf in os.walk('release/freedesktop/icons'):
- if 'CVS' in tn:
- tn.remove('CVS')
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
@@ -509,8 +500,6 @@
pluglist = []
plugtargetlist = []
for tp, tn, tf in os.walk('release/plugins'):
- if 'CVS' in tn:
- tn.remove('CVS')
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
@@ -541,8 +530,6 @@
textlist = []
texttargetlist = []
for tp, tn, tf in os.walk('release/text'):
- if 'CVS' in tn:
- tn.remove('CVS')
if '.svn' in tn:
tn.remove('.svn')
for f in tf:
@@ -599,6 +586,8 @@
'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
+ if env['WITH_BF_JACK']:
+ dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls
Modified: branches/volume25/blenderplayer/CMakeLists.txt
===================================================================
--- branches/volume25/blenderplayer/CMakeLists.txt 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/blenderplayer/CMakeLists.txt 2009-08-19 11:18:52 UTC (rev 22630)
@@ -66,17 +66,12 @@
gp_common
bf_string
bf_ghost
- bf_blenkernel
- verse
- bf_blenkernel
+ bf_blenkernel
bf_blenloader
bf_blenpluginapi
bf_blroutines
bf_converter
- bf_sumo
bf_ketsji
- extern_solid
- extern_qhull
bf_bullet
bf_common
bf_dummy
@@ -105,11 +100,18 @@
bf_dds
bf_readblenfile
blenkernel_blc
- bf_quicktime
extern_binreloc
extern_glew
- )
+ )
+
+ IF(WITH_QUICKTIME)
+ SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
+ ENDIF(WITH_QUICKTIME)
+ IF(WITH_CXX_GUARDEDALLOC)
+ SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+ ENDIF(WITH_CXX_GUARDEDALLOC)
+
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
SET(REMLIB ${SORTLIB})
FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
Modified: branches/volume25/config/darwin-config.py
===================================================================
--- branches/volume25/config/darwin-config.py 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/config/darwin-config.py 2009-08-19 11:18:52 UTC (rev 22630)
@@ -112,6 +112,13 @@
BF_LIBSAMPLERATE_LIB = 'samplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+# TODO - set proper paths here (add precompiled to lib/ ? )
+WITH_BF_JACK = False
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
Modified: branches/volume25/config/linux2-config.py
===================================================================
--- branches/volume25/config/linux2-config.py 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/config/linux2-config.py 2009-08-19 11:18:52 UTC (rev 22630)
@@ -27,6 +27,12 @@
BF_LIBSAMPLERATE_LIB = 'samplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+WITH_BF_JACK = False
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
WITH_BF_SDL = True
BF_SDL = '/usr' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
Modified: branches/volume25/config/win32-mingw-config.py
===================================================================
--- branches/volume25/config/win32-mingw-config.py 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/config/win32-mingw-config.py 2009-08-19 11:18:52 UTC (rev 22630)
@@ -31,6 +31,12 @@
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+WITH_BF_JACK = False
+BF_JACK = LIBDIR + '/jack'
+BF_JACK_INC = '${BF_JACK}/include'
+BF_JACK_LIB = 'libjack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include'
Modified: branches/volume25/config/win32-vc-config.py
===================================================================
--- branches/volume25/config/win32-vc-config.py 2009-08-19 10:26:43 UTC (rev 22629)
+++ branches/volume25/config/win32-vc-config.py 2009-08-19 11:18:52 UTC (rev 22630)
@@ -37,6 +37,12 @@
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+WITH_BF_JACK = False
+BF_JACK = LIBDIR + '/jack'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list