Revision: 29478 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29478 Author: joeedh Date: 2010-06-15 23:39:17 +0200 (Tue, 15 Jun 2010)
Log Message: ----------- some restructuring to better handle serious testing on limited hardware Modified Paths: -------------- branches/hairsim/CMake/macros.cmake branches/hairsim/CMakeLists.txt branches/hairsim/SConstruct branches/hairsim/config/aix4-config.py branches/hairsim/config/darwin-config.py branches/hairsim/config/linux2-config.py branches/hairsim/config/linuxcross-config.py branches/hairsim/config/win32-mingw-config.py branches/hairsim/config/win32-vc-config.py branches/hairsim/config/win64-vc-config.py branches/hairsim/intern/ghost/CMakeLists.txt branches/hairsim/intern/ghost/GHOST_C-api.h branches/hairsim/intern/ghost/GHOST_IWindow.h branches/hairsim/intern/ghost/intern/GHOST_C-api.cpp branches/hairsim/intern/ghost/intern/GHOST_DropTargetWin32.cpp branches/hairsim/intern/ghost/intern/GHOST_SystemCocoa.mm branches/hairsim/intern/ghost/intern/GHOST_Window.cpp branches/hairsim/intern/ghost/intern/GHOST_Window.h branches/hairsim/intern/ghost/intern/GHOST_WindowCocoa.h branches/hairsim/intern/ghost/intern/GHOST_WindowCocoa.mm branches/hairsim/intern/ghost/intern/GHOST_WindowWin32.cpp branches/hairsim/intern/ghost/intern/GHOST_WindowWin32.h branches/hairsim/intern/ghost/intern/GHOST_WindowX11.cpp branches/hairsim/intern/ghost/intern/GHOST_WindowX11.h branches/hairsim/intern/guardedalloc/MEM_guardedalloc.h branches/hairsim/intern/guardedalloc/intern/mallocn.c branches/hairsim/intern/string/STR_String.h branches/hairsim/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/hairsim/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/hairsim/release/datafiles/blenderbuttons branches/hairsim/release/scripts/io/engine_render_pov.py branches/hairsim/release/scripts/io/export_3ds.py branches/hairsim/release/scripts/io/export_fbx.py branches/hairsim/release/scripts/io/export_mdd.py branches/hairsim/release/scripts/io/export_obj.py branches/hairsim/release/scripts/io/export_ply.py branches/hairsim/release/scripts/io/export_x3d.py branches/hairsim/release/scripts/io/import_anim_bvh.py branches/hairsim/release/scripts/io/import_scene_3ds.py branches/hairsim/release/scripts/io/import_scene_obj.py branches/hairsim/release/scripts/io/import_shape_mdd.py branches/hairsim/release/scripts/io/netrender/client.py branches/hairsim/release/scripts/io/netrender/operators.py branches/hairsim/release/scripts/io/netrender/ui.py branches/hairsim/release/scripts/io/netrender/utils.py branches/hairsim/release/scripts/keyingsets/keyingsets_utils.py branches/hairsim/release/scripts/modules/bpy/__init__.py branches/hairsim/release/scripts/modules/bpy/utils.py branches/hairsim/release/scripts/modules/bpy_types.py branches/hairsim/release/scripts/modules/graphviz_export.py branches/hairsim/release/scripts/modules/rigify/__init__.py branches/hairsim/release/scripts/modules/rna_prop_ui.py branches/hairsim/release/scripts/op/add_mesh_torus.py branches/hairsim/release/scripts/op/console_python.py branches/hairsim/release/scripts/op/image.py branches/hairsim/release/scripts/op/object.py branches/hairsim/release/scripts/op/presets.py branches/hairsim/release/scripts/op/sequencer.py branches/hairsim/release/scripts/op/uv.py branches/hairsim/release/scripts/op/uvcalc_follow_active.py branches/hairsim/release/scripts/op/wm.py branches/hairsim/release/scripts/presets/interaction/maya.py branches/hairsim/release/scripts/templates/operator.py branches/hairsim/release/scripts/templates/operator_modal_view3d.py branches/hairsim/release/scripts/ui/properties_data_armature_rigify.py branches/hairsim/release/scripts/ui/properties_data_curve.py branches/hairsim/release/scripts/ui/properties_data_lamp.py branches/hairsim/release/scripts/ui/properties_data_modifier.py branches/hairsim/release/scripts/ui/properties_game.py branches/hairsim/release/scripts/ui/properties_material.py branches/hairsim/release/scripts/ui/properties_object.py branches/hairsim/release/scripts/ui/properties_object_constraint.py branches/hairsim/release/scripts/ui/properties_particle.py branches/hairsim/release/scripts/ui/properties_physics_cloth.py branches/hairsim/release/scripts/ui/properties_physics_common.py branches/hairsim/release/scripts/ui/properties_physics_smoke.py branches/hairsim/release/scripts/ui/properties_render.py branches/hairsim/release/scripts/ui/properties_scene.py branches/hairsim/release/scripts/ui/properties_texture.py branches/hairsim/release/scripts/ui/space_info.py branches/hairsim/release/scripts/ui/space_logic.py branches/hairsim/release/scripts/ui/space_node.py branches/hairsim/release/scripts/ui/space_sequencer.py branches/hairsim/release/scripts/ui/space_text.py branches/hairsim/release/scripts/ui/space_userpref.py branches/hairsim/release/scripts/ui/space_userpref_keymap.py branches/hairsim/release/scripts/ui/space_view3d.py branches/hairsim/release/scripts/ui/space_view3d_toolbar.py branches/hairsim/source/Makefile branches/hairsim/source/blender/blenkernel/BKE_cloth.h branches/hairsim/source/blender/blenkernel/BKE_collision.h branches/hairsim/source/blender/blenkernel/BKE_colortools.h branches/hairsim/source/blender/blenkernel/BKE_constraint.h branches/hairsim/source/blender/blenkernel/BKE_customdata.h branches/hairsim/source/blender/blenkernel/BKE_global.h branches/hairsim/source/blender/blenkernel/BKE_idprop.h branches/hairsim/source/blender/blenkernel/BKE_multires.h branches/hairsim/source/blender/blenkernel/BKE_node.h branches/hairsim/source/blender/blenkernel/BKE_particle.h branches/hairsim/source/blender/blenkernel/BKE_pointcache.h branches/hairsim/source/blender/blenkernel/BKE_report.h branches/hairsim/source/blender/blenkernel/BKE_sequencer.h branches/hairsim/source/blender/blenkernel/BKE_smoke.h branches/hairsim/source/blender/blenkernel/BKE_subsurf.h branches/hairsim/source/blender/blenkernel/BKE_utildefines.h branches/hairsim/source/blender/blenkernel/CMakeLists.txt branches/hairsim/source/blender/blenkernel/SConscript branches/hairsim/source/blender/blenkernel/intern/BME_tools.c branches/hairsim/source/blender/blenkernel/intern/CCGSubSurf.c branches/hairsim/source/blender/blenkernel/intern/DerivedMesh.c branches/hairsim/source/blender/blenkernel/intern/Makefile branches/hairsim/source/blender/blenkernel/intern/action.c branches/hairsim/source/blender/blenkernel/intern/anim.c branches/hairsim/source/blender/blenkernel/intern/anim_sys.c branches/hairsim/source/blender/blenkernel/intern/armature.c branches/hairsim/source/blender/blenkernel/intern/blender.c branches/hairsim/source/blender/blenkernel/intern/brush.c branches/hairsim/source/blender/blenkernel/intern/cdderivedmesh.c branches/hairsim/source/blender/blenkernel/intern/cloth.c branches/hairsim/source/blender/blenkernel/intern/collision.c branches/hairsim/source/blender/blenkernel/intern/colortools.c branches/hairsim/source/blender/blenkernel/intern/constraint.c branches/hairsim/source/blender/blenkernel/intern/customdata.c branches/hairsim/source/blender/blenkernel/intern/depsgraph.c branches/hairsim/source/blender/blenkernel/intern/displist.c branches/hairsim/source/blender/blenkernel/intern/effect.c branches/hairsim/source/blender/blenkernel/intern/fcurve.c branches/hairsim/source/blender/blenkernel/intern/fmodifier.c branches/hairsim/source/blender/blenkernel/intern/group.c branches/hairsim/source/blender/blenkernel/intern/icons.c branches/hairsim/source/blender/blenkernel/intern/idprop.c branches/hairsim/source/blender/blenkernel/intern/image.c branches/hairsim/source/blender/blenkernel/intern/implicit.c branches/hairsim/source/blender/blenkernel/intern/ipo.c branches/hairsim/source/blender/blenkernel/intern/lattice.c branches/hairsim/source/blender/blenkernel/intern/library.c branches/hairsim/source/blender/blenkernel/intern/multires.c branches/hairsim/source/blender/blenkernel/intern/nla.c branches/hairsim/source/blender/blenkernel/intern/node.c branches/hairsim/source/blender/blenkernel/intern/object.c branches/hairsim/source/blender/blenkernel/intern/packedFile.c branches/hairsim/source/blender/blenkernel/intern/particle.c branches/hairsim/source/blender/blenkernel/intern/particle_system.c branches/hairsim/source/blender/blenkernel/intern/pointcache.c branches/hairsim/source/blender/blenkernel/intern/report.c branches/hairsim/source/blender/blenkernel/intern/sca.c branches/hairsim/source/blender/blenkernel/intern/scene.c branches/hairsim/source/blender/blenkernel/intern/sequencer.c branches/hairsim/source/blender/blenkernel/intern/shrinkwrap.c branches/hairsim/source/blender/blenkernel/intern/smoke.c branches/hairsim/source/blender/blenkernel/intern/softbody.c branches/hairsim/source/blender/blenkernel/intern/sound.c branches/hairsim/source/blender/blenkernel/intern/subsurf_ccg.c branches/hairsim/source/blender/blenkernel/intern/text.c branches/hairsim/source/blender/blenkernel/intern/texture.c branches/hairsim/source/blender/blenkernel/intern/writeffmpeg.c branches/hairsim/source/blender/blenlib/BLI_args.h branches/hairsim/source/blender/blenlib/BLI_bpath.h branches/hairsim/source/blender/blenlib/BLI_edgehash.h branches/hairsim/source/blender/blenlib/BLI_fileops.h branches/hairsim/source/blender/blenlib/BLI_ghash.h branches/hairsim/source/blender/blenlib/BLI_linklist.h branches/hairsim/source/blender/blenlib/BLI_path_util.h branches/hairsim/source/blender/blenlib/BLI_pbvh.h branches/hairsim/source/blender/blenlib/intern/BLI_args.c branches/hairsim/source/blender/blenlib/intern/BLI_ghash.c branches/hairsim/source/blender/blenlib/intern/BLI_kdopbvh.c branches/hairsim/source/blender/blenlib/intern/bpath.c branches/hairsim/source/blender/blenlib/intern/edgehash.c branches/hairsim/source/blender/blenlib/intern/fileops.c branches/hairsim/source/blender/blenlib/intern/math_geom.c branches/hairsim/source/blender/blenlib/intern/noise.c branches/hairsim/source/blender/blenlib/intern/path_util.c branches/hairsim/source/blender/blenlib/intern/pbvh.c branches/hairsim/source/blender/blenlib/intern/threads.c branches/hairsim/source/blender/blenloader/BLO_readfile.h branches/hairsim/source/blender/blenloader/BLO_writefile.h branches/hairsim/source/blender/blenloader/intern/readblenentry.c branches/hairsim/source/blender/blenloader/intern/readfile.c branches/hairsim/source/blender/blenloader/intern/writefile.c branches/hairsim/source/blender/blenpluginapi/iff.h branches/hairsim/source/blender/collada/DocumentExporter.cpp branches/hairsim/source/blender/collada/DocumentExporter.h branches/hairsim/source/blender/collada/DocumentImporter.cpp branches/hairsim/source/blender/collada/DocumentImporter.h branches/hairsim/source/blender/collada/Makefile branches/hairsim/source/blender/collada/SConscript branches/hairsim/source/blender/collada/collada.cpp branches/hairsim/source/blender/collada/collada.h branches/hairsim/source/blender/collada/collada_internal.h branches/hairsim/source/blender/editors/CMakeLists.txt branches/hairsim/source/blender/editors/animation/anim_channels_defines.c branches/hairsim/source/blender/editors/animation/anim_channels_edit.c branches/hairsim/source/blender/editors/animation/anim_draw.c branches/hairsim/source/blender/editors/animation/anim_filter.c branches/hairsim/source/blender/editors/animation/anim_markers.c branches/hairsim/source/blender/editors/animation/keyframing.c branches/hairsim/source/blender/editors/armature/armature_ops.c branches/hairsim/source/blender/editors/armature/editarmature.c branches/hairsim/source/blender/editors/armature/editarmature_retarget.c branches/hairsim/source/blender/editors/armature/editarmature_sketch.c branches/hairsim/source/blender/editors/armature/poselib.c branches/hairsim/source/blender/editors/armature/poseobject.c branches/hairsim/source/blender/editors/armature/reeb.c branches/hairsim/source/blender/editors/curve/curve_intern.h branches/hairsim/source/blender/editors/curve/curve_ops.c branches/hairsim/source/blender/editors/curve/editcurve.c branches/hairsim/source/blender/editors/curve/editfont.c branches/hairsim/source/blender/editors/datafiles/B.blend.c branches/hairsim/source/blender/editors/datafiles/blenderbuttons.c branches/hairsim/source/blender/editors/gpencil/gpencil_paint.c branches/hairsim/source/blender/editors/include/ED_curve.h branches/hairsim/source/blender/editors/include/ED_object.h branches/hairsim/source/blender/editors/include/ED_view3d.h branches/hairsim/source/blender/editors/include/UI_icons.h branches/hairsim/source/blender/editors/include/UI_interface.h branches/hairsim/source/blender/editors/include/UI_resources.h branches/hairsim/source/blender/editors/include/UI_view2d.h branches/hairsim/source/blender/editors/interface/interface.c branches/hairsim/source/blender/editors/interface/interface_draw.c branches/hairsim/source/blender/editors/interface/interface_handlers.c branches/hairsim/source/blender/editors/interface/interface_intern.h branches/hairsim/source/blender/editors/interface/interface_layout.c branches/hairsim/source/blender/editors/interface/interface_panel.c branches/hairsim/source/blender/editors/interface/interface_regions.c branches/hairsim/source/blender/editors/interface/interface_templates.c branches/hairsim/source/blender/editors/interface/interface_widgets.c branches/hairsim/source/blender/editors/interface/resources.c branches/hairsim/source/blender/editors/interface/view2d.c branches/hairsim/source/blender/editors/interface/view2d_ops.c branches/hairsim/source/blender/editors/mesh/editmesh.c branches/hairsim/source/blender/editors/mesh/editmesh_add.c branches/hairsim/source/blender/editors/mesh/editmesh_lib.c branches/hairsim/source/blender/editors/mesh/editmesh_loop.c branches/hairsim/source/blender/editors/mesh/editmesh_mods.c branches/hairsim/source/blender/editors/mesh/editmesh_tools.c branches/hairsim/source/blender/editors/mesh/mesh_data.c branches/hairsim/source/blender/editors/mesh/mesh_ops.c branches/hairsim/source/blender/editors/mesh/meshtools.c branches/hairsim/source/blender/editors/metaball/mball_ops.c branches/hairsim/source/blender/editors/object/object_add.c branches/hairsim/source/blender/editors/object/object_bake.c branches/hairsim/source/blender/editors/object/object_constraint.c branches/hairsim/source/blender/editors/object/object_edit.c branches/hairsim/source/blender/editors/object/object_group.c branches/hairsim/source/blender/editors/object/object_intern.h branches/hairsim/source/blender/editors/object/object_modifier.c branches/hairsim/source/blender/editors/object/object_ops.c branches/hairsim/source/blender/editors/object/object_relations.c branches/hairsim/source/blender/editors/object/object_select.c branches/hairsim/source/blender/editors/object/object_transform.c branches/hairsim/source/blender/editors/object/object_vgroup.c branches/hairsim/source/blender/editors/physics/particle_edit.c branches/hairsim/source/blender/editors/physics/physics_fluid.c branches/hairsim/source/blender/editors/physics/physics_intern.h branches/hairsim/source/blender/editors/physics/physics_ops.c branches/hairsim/source/blender/editors/render/render_internal.c branches/hairsim/source/blender/editors/render/render_opengl.c branches/hairsim/source/blender/editors/render/render_preview.c branches/hairsim/source/blender/editors/render/render_shading.c branches/hairsim/source/blender/editors/screen/CMakeLists.txt branches/hairsim/source/blender/editors/screen/SConscript branches/hairsim/source/blender/editors/screen/area.c branches/hairsim/source/blender/editors/screen/screen_ops.c branches/hairsim/source/blender/editors/screen/screendump.c branches/hairsim/source/blender/editors/sculpt_paint/paint_image.c branches/hairsim/source/blender/editors/sculpt_paint/paint_ops.c branches/hairsim/source/blender/editors/sculpt_paint/paint_vertex.c branches/hairsim/source/blender/editors/sculpt_paint/sculpt.c branches/hairsim/source/blender/editors/sculpt_paint/sculpt_intern.h branches/hairsim/source/blender/editors/sound/SConscript branches/hairsim/source/blender/editors/sound/sound_ops.c branches/hairsim/source/blender/editors/space_action/action_edit.c branches/hairsim/source/blender/editors/space_action/action_ops.c branches/hairsim/source/blender/editors/space_action/action_select.c branches/hairsim/source/blender/editors/space_api/SConscript branches/hairsim/source/blender/editors/space_api/spacetypes.c branches/hairsim/source/blender/editors/space_buttons/SConscript branches/hairsim/source/blender/editors/space_buttons/buttons_ops.c branches/hairsim/source/blender/editors/space_console/Makefile branches/hairsim/source/blender/editors/space_console/SConscript branches/hairsim/source/blender/editors/space_console/space_console.c branches/hairsim/source/blender/editors/space_file/Makefile branches/hairsim/source/blender/editors/space_file/SConscript branches/hairsim/source/blender/editors/space_file/file_draw.c branches/hairsim/source/blender/editors/space_file/file_intern.h branches/hairsim/source/blender/editors/space_file/file_ops.c branches/hairsim/source/blender/editors/space_file/file_panels.c branches/hairsim/source/blender/editors/space_file/filelist.c branches/hairsim/source/blender/editors/space_file/filesel.c branches/hairsim/source/blender/editors/space_file/space_file.c branches/hairsim/source/blender/editors/space_file/writeimage.c branches/hairsim/source/blender/editors/space_graph/graph_buttons.c branches/hairsim/source/blender/editors/space_graph/graph_draw.c branches/hairsim/source/blender/editors/space_graph/graph_edit.c branches/hairsim/source/blender/editors/space_graph/graph_ops.c branches/hairsim/source/blender/editors/space_graph/graph_select.c branches/hairsim/source/blender/editors/space_image/Makefile branches/hairsim/source/blender/editors/space_image/SConscript branches/hairsim/source/blender/editors/space_image/image_buttons.c branches/hairsim/source/blender/editors/space_image/image_ops.c branches/hairsim/source/blender/editors/space_image/space_image.c branches/hairsim/source/blender/editors/space_info/SConscript branches/hairsim/source/blender/editors/space_info/info_intern.h branches/hairsim/source/blender/editors/space_info/info_ops.c branches/hairsim/source/blender/editors/space_info/space_info.c branches/hairsim/source/blender/editors/space_logic/logic_window.c branches/hairsim/source/blender/editors/space_nla/nla_draw.c branches/hairsim/source/blender/editors/space_nla/nla_edit.c branches/hairsim/source/blender/editors/space_nla/nla_ops.c branches/hairsim/source/blender/editors/space_node/drawnode.c branches/hairsim/source/blender/editors/space_node/node_draw.c branches/hairsim/source/blender/editors/space_node/node_edit.c branches/hairsim/source/blender/editors/space_node/node_intern.h branches/hairsim/source/blender/editors/space_node/node_ops.c branches/hairsim/source/blender/editors/space_node/node_select.c branches/hairsim/source/blender/editors/space_node/node_state.c branches/hairsim/source/blender/editors/space_node/space_node.c branches/hairsim/source/blender/editors/space_outliner/outliner.c branches/hairsim/source/blender/editors/space_outliner/outliner_ops.c branches/hairsim/source/blender/editors/space_script/script_edit.c branches/hairsim/source/blender/editors/space_script/script_intern.h branches/hairsim/source/blender/editors/space_script/script_ops.c branches/hairsim/source/blender/editors/space_script/space_script.c branches/hairsim/source/blender/editors/space_sequencer/sequencer_add.c branches/hairsim/source/blender/editors/space_sequencer/sequencer_draw.c branches/hairsim/source/blender/editors/space_sequencer/sequencer_edit.c branches/hairsim/source/blender/editors/space_sequencer/sequencer_intern.h branches/hairsim/source/blender/editors/space_sequencer/sequencer_ops.c branches/hairsim/source/blender/editors/space_sequencer/sequencer_select.c branches/hairsim/source/blender/editors/space_sequencer/space_sequencer.c branches/hairsim/source/blender/editors/space_text/space_text.c branches/hairsim/source/blender/editors/space_text/text_draw.c branches/hairsim/source/blender/editors/space_text/text_ops.c branches/hairsim/source/blender/editors/space_time/time_ops.c branches/hairsim/source/blender/editors/space_userpref/SConscript branches/hairsim/source/blender/editors/space_view3d/drawanimviz.c branches/hairsim/source/blender/editors/space_view3d/drawobject.c branches/hairsim/source/blender/editors/space_view3d/drawvolume.c branches/hairsim/source/blender/editors/space_view3d/space_view3d.c branches/hairsim/source/blender/editors/space_view3d/view3d_buttons.c branches/hairsim/source/blender/editors/space_view3d/view3d_draw.c branches/hairsim/source/blender/editors/space_view3d/view3d_edit.c branches/hairsim/source/blender/editors/space_view3d/view3d_header.c branches/hairsim/source/blender/editors/space_view3d/view3d_intern.h branches/hairsim/source/blender/editors/space_view3d/view3d_ops.c branches/hairsim/source/blender/editors/space_view3d/view3d_select.c branches/hairsim/source/blender/editors/space_view3d/view3d_snap.c branches/hairsim/source/blender/editors/space_view3d/view3d_view.c branches/hairsim/source/blender/editors/transform/transform.c branches/hairsim/source/blender/editors/transform/transform_constraints.c branches/hairsim/source/blender/editors/transform/transform_conversions.c branches/hairsim/source/blender/editors/transform/transform_generics.c branches/hairsim/source/blender/editors/transform/transform_ops.c branches/hairsim/source/blender/editors/uvedit/uvedit_unwrap_ops.c branches/hairsim/source/blender/gpu/intern/gpu_codegen.c branches/hairsim/source/blender/gpu/intern/gpu_draw.c branches/hairsim/source/blender/imbuf/CMakeLists.txt branches/hairsim/source/blender/imbuf/IMB_imbuf_types.h branches/hairsim/source/blender/imbuf/IMB_thumbs.h branches/hairsim/source/blender/imbuf/SConscript branches/hairsim/source/blender/imbuf/intern/IMB_filetype.h branches/hairsim/source/blender/imbuf/intern/IMB_metadata.h branches/hairsim/source/blender/imbuf/intern/Makefile branches/hairsim/source/blender/imbuf/intern/anim.c branches/hairsim/source/blender/imbuf/intern/cache.c branches/hairsim/source/blender/imbuf/intern/dynlibtiff.c branches/hairsim/source/blender/imbuf/intern/filetype.c branches/hairsim/source/blender/imbuf/intern/jp2.c branches/hairsim/source/blender/imbuf/intern/module.c branches/hairsim/source/blender/imbuf/intern/openexr/openexr_api.cpp branches/hairsim/source/blender/imbuf/intern/thumbs.c branches/hairsim/source/blender/imbuf/intern/tiff.c branches/hairsim/source/blender/imbuf/intern/util.c branches/hairsim/source/blender/makesdna/DNA_ID.h branches/hairsim/source/blender/makesdna/DNA_action_types.h branches/hairsim/source/blender/makesdna/DNA_camera_types.h branches/hairsim/source/blender/makesdna/DNA_cloth_types.h branches/hairsim/source/blender/makesdna/DNA_color_types.h branches/hairsim/source/blender/makesdna/DNA_constraint_types.h branches/hairsim/source/blender/makesdna/DNA_curve_types.h branches/hairsim/source/blender/makesdna/DNA_modifier_types.h branches/hairsim/source/blender/makesdna/DNA_node_types.h branches/hairsim/source/blender/makesdna/DNA_object_force.h branches/hairsim/source/blender/makesdna/DNA_object_types.h branches/hairsim/source/blender/makesdna/DNA_particle_types.h branches/hairsim/source/blender/makesdna/DNA_scene_types.h branches/hairsim/source/blender/makesdna/DNA_space_types.h branches/hairsim/source/blender/makesdna/DNA_texture_types.h branches/hairsim/source/blender/makesdna/DNA_userdef_types.h branches/hairsim/source/blender/makesdna/DNA_windowmanager_types.h branches/hairsim/source/blender/makesrna/RNA_access.h branches/hairsim/source/blender/makesrna/RNA_define.h branches/hairsim/source/blender/makesrna/RNA_enum_types.h branches/hairsim/source/blender/makesrna/RNA_types.h branches/hairsim/source/blender/makesrna/SConscript branches/hairsim/source/blender/makesrna/intern/CMakeLists.txt branches/hairsim/source/blender/makesrna/intern/Makefile branches/hairsim/source/blender/makesrna/intern/SConscript branches/hairsim/source/blender/makesrna/intern/rna_ID.c branches/hairsim/source/blender/makesrna/intern/rna_access.c branches/hairsim/source/blender/makesrna/intern/rna_action.c branches/hairsim/source/blender/makesrna/intern/rna_action_api.c branches/hairsim/source/blender/makesrna/intern/rna_actuator.c branches/hairsim/source/blender/makesrna/intern/rna_animation.c branches/hairsim/source/blender/makesrna/intern/rna_animviz.c branches/hairsim/source/blender/makesrna/intern/rna_armature.c branches/hairsim/source/blender/makesrna/intern/rna_boid.c branches/hairsim/source/blender/makesrna/intern/rna_cloth.c branches/hairsim/source/blender/makesrna/intern/rna_color.c branches/hairsim/source/blender/makesrna/intern/rna_constraint.c branches/hairsim/source/blender/makesrna/intern/rna_controller.c branches/hairsim/source/blender/makesrna/intern/rna_curve.c branches/hairsim/source/blender/makesrna/intern/rna_fcurve.c branches/hairsim/source/blender/makesrna/intern/rna_fluidsim.c branches/hairsim/source/blender/makesrna/intern/rna_image.c branches/hairsim/source/blender/makesrna/intern/rna_image_api.c branches/hairsim/source/blender/makesrna/intern/rna_internal.h branches/hairsim/source/blender/makesrna/intern/rna_main.c branches/hairsim/source/blender/makesrna/intern/rna_main_api.c branches/hairsim/source/blender/makesrna/intern/rna_material.c branches/hairsim/source/blender/makesrna/intern/rna_mesh.c branches/hairsim/source/blender/makesrna/intern/rna_meta.c branches/hairsim/source/blender/makesrna/intern/rna_modifier.c branches/hairsim/source/blender/makesrna/intern/rna_nodetree.c branches/hairsim/source/blender/makesrna/intern/rna_nodetree_types.h branches/hairsim/source/blender/makesrna/intern/rna_object.c branches/hairsim/source/blender/makesrna/intern/rna_object_api.c branches/hairsim/source/blender/makesrna/intern/rna_object_force.c branches/hairsim/source/blender/makesrna/intern/rna_particle.c branches/hairsim/source/blender/makesrna/intern/rna_pose.c branches/hairsim/source/blender/makesrna/intern/rna_property.c branches/hairsim/source/blender/makesrna/intern/rna_scene.c branches/hairsim/source/blender/makesrna/intern/rna_screen.c branches/hairsim/source/blender/makesrna/intern/rna_sculpt_paint.c branches/hairsim/source/blender/makesrna/intern/rna_sensor.c branches/hairsim/source/blender/makesrna/intern/rna_sequencer.c branches/hairsim/source/blender/makesrna/intern/rna_smoke.c branches/hairsim/source/blender/makesrna/intern/rna_sound.c branches/hairsim/source/blender/makesrna/intern/rna_space.c branches/hairsim/source/blender/makesrna/intern/rna_text.c branches/hairsim/source/blender/makesrna/intern/rna_texture.c branches/hairsim/source/blender/makesrna/intern/rna_ui_api.c branches/hairsim/source/blender/makesrna/intern/rna_userdef.c branches/hairsim/source/blender/makesrna/intern/rna_vfont.c branches/hairsim/source/blender/makesrna/intern/rna_wm.c branches/hairsim/source/blender/modifiers/intern/MOD_boolean_util.c branches/hairsim/source/blender/modifiers/intern/MOD_build.c branches/hairsim/source/blender/modifiers/intern/MOD_cloth.c branches/hairsim/source/blender/modifiers/intern/MOD_collision.c branches/hairsim/source/blender/modifiers/intern/MOD_explode.c branches/hairsim/source/blender/modifiers/intern/MOD_hook.c branches/hairsim/source/blender/modifiers/intern/MOD_mask.c branches/hairsim/source/blender/modifiers/intern/MOD_meshdeform.c branches/hairsim/source/blender/modifiers/intern/MOD_multires.c branches/hairsim/source/blender/modifiers/intern/MOD_screw.c branches/hairsim/source/blender/modifiers/intern/MOD_simpledeform.c branches/hairsim/source/blender/modifiers/intern/MOD_smoke.c branches/hairsim/source/blender/modifiers/intern/MOD_solidify.c branches/hairsim/source/blender/modifiers/intern/MOD_util.c branches/hairsim/source/blender/modifiers/intern/MOD_wave.c branches/hairsim/source/blender/nodes/SHD_node.h branches/hairsim/source/blender/nodes/intern/CMP_nodes/CMP_displace.c branches/hairsim/source/blender/nodes/intern/SHD_nodes/SHD_material.c branches/hairsim/source/blender/nodes/intern/SHD_nodes/SHD_output.c branches/hairsim/source/blender/nodes/intern/SHD_util.c branches/hairsim/source/blender/nodes/intern/SHD_util.h branches/hairsim/source/blender/python/BPY_extern.h branches/hairsim/source/blender/python/doc/blender-org/layout.html branches/hairsim/source/blender/python/doc/blender-org/static/default.css_t branches/hairsim/source/blender/python/doc/sphinx_doc_gen.py branches/hairsim/source/blender/python/generic/bpy_internal_import.c branches/hairsim/source/blender/python/generic/bpy_internal_import.h branches/hairsim/source/blender/python/generic/mathutils.c branches/hairsim/source/blender/python/generic/mathutils_vector.c branches/hairsim/source/blender/python/intern/bpy.c branches/hairsim/source/blender/python/intern/bpy_driver.c branches/hairsim/source/blender/python/intern/bpy_interface.c branches/hairsim/source/blender/python/intern/bpy_props.c branches/hairsim/source/blender/python/intern/bpy_props.h branches/hairsim/source/blender/python/intern/bpy_rna.c branches/hairsim/source/blender/render/extern/include/RE_pipeline.h branches/hairsim/source/blender/render/extern/include/RE_shader_ext.h branches/hairsim/source/blender/render/intern/include/cache.h branches/hairsim/source/blender/render/intern/include/lamp.h branches/hairsim/source/blender/render/intern/include/part.h branches/hairsim/source/blender/render/intern/include/render_types.h branches/hairsim/source/blender/render/intern/include/shadowbuf.h branches/hairsim/source/blender/render/intern/include/sss.h branches/hairsim/source/blender/render/intern/include/zbuf.h branches/hairsim/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp branches/hairsim/source/blender/render/intern/source/bake.c branches/hairsim/source/blender/render/intern/source/cache.c branches/hairsim/source/blender/render/intern/source/convertblender.c branches/hairsim/source/blender/render/intern/source/database.c branches/hairsim/source/blender/render/intern/source/lamp.c branches/hairsim/source/blender/render/intern/source/object_strand.c branches/hairsim/source/blender/render/intern/source/object_subdivide.c branches/hairsim/source/blender/render/intern/source/part.c branches/hairsim/source/blender/render/intern/source/pipeline.c branches/hairsim/source/blender/render/intern/source/rayshade.c branches/hairsim/source/blender/render/intern/source/rendercore.c branches/hairsim/source/blender/render/intern/source/result.c branches/hairsim/source/blender/render/intern/source/shadeinput.c branches/hairsim/source/blender/render/intern/source/shadeoutput.c branches/hairsim/source/blender/render/intern/source/shadowbuf.c branches/hairsim/source/blender/render/intern/source/sss.c branches/hairsim/source/blender/render/intern/source/texture_stack.c branches/hairsim/source/blender/render/intern/source/texture_voxeldata.c branches/hairsim/source/blender/render/intern/source/zbuf.c branches/hairsim/source/blender/windowmanager/WM_api.h branches/hairsim/source/blender/windowmanager/WM_types.h branches/hairsim/source/blender/windowmanager/intern/wm.c branches/hairsim/source/blender/windowmanager/intern/wm_event_system.c branches/hairsim/source/blender/windowmanager/intern/wm_files.c branches/hairsim/source/blender/windowmanager/intern/wm_init_exit.c branches/hairsim/source/blender/windowmanager/intern/wm_jobs.c branches/hairsim/source/blender/windowmanager/intern/wm_operators.c branches/hairsim/source/blender/windowmanager/intern/wm_window.c branches/hairsim/source/blender/windowmanager/wm_event_types.h branches/hairsim/source/blenderplayer/CMakeLists.txt branches/hairsim/source/blenderplayer/bad_level_call_stubs/stubs.c branches/hairsim/source/creator/CMakeLists.txt branches/hairsim/source/creator/Makefile branches/hairsim/source/creator/SConscript branches/hairsim/source/creator/creator.c branches/hairsim/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/hairsim/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h branches/hairsim/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h branches/hairsim/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h branches/hairsim/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h branches/hairsim/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h branches/hairsim/source/gameengine/BlenderRoutines/KX_BlenderSystem.h branches/hairsim/source/gameengine/Converter/BL_ArmatureObject.cpp branches/hairsim/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/hairsim/source/gameengine/Converter/BL_DeformableGameObject.h branches/hairsim/source/gameengine/Converter/BL_MeshDeformer.h branches/hairsim/source/gameengine/Converter/BL_ModifierDeformer.cpp branches/hairsim/source/gameengine/Converter/BL_ModifierDeformer.h branches/hairsim/source/gameengine/Converter/BL_ShapeDeformer.h branches/hairsim/source/gameengine/Converter/BL_SkinDeformer.h branches/hairsim/source/gameengine/Converter/BlenderWorldInfo.h branches/hairsim/source/gameengine/Converter/KX_BlenderScalarInterpolator.h branches/hairsim/source/gameengine/Converter/KX_BlenderSceneConverter.cpp branches/hairsim/source/gameengine/Converter/KX_BlenderSceneConverter.h branches/hairsim/source/gameengine/Converter/KX_SoftBodyDeformer.h branches/hairsim/source/gameengine/Expressions/BoolValue.h branches/hairsim/source/gameengine/Expressions/ConstExpr.h branches/hairsim/source/gameengine/Expressions/EmptyValue.h branches/hairsim/source/gameengine/Expressions/ErrorValue.h branches/hairsim/source/gameengine/Expressions/Expression.h branches/hairsim/source/gameengine/Expressions/FloatValue.h branches/hairsim/source/gameengine/Expressions/IdentifierExpr.h branches/hairsim/source/gameengine/Expressions/IfExpr.h branches/hairsim/source/gameengine/Expressions/InputParser.h branches/hairsim/source/gameengine/Expressions/IntValue.h branches/hairsim/source/gameengine/Expressions/KX_HashedPtr.h branches/hairsim/source/gameengine/Expressions/ListValue.cpp branches/hairsim/source/gameengine/Expressions/Operator1Expr.h branches/hairsim/source/gameengine/Expressions/Operator2Expr.h branches/hairsim/source/gameengine/Expressions/PyObjectPlus.h branches/hairsim/source/gameengine/Expressions/StringValue.h branches/hairsim/source/gameengine/Expressions/Value.h branches/hairsim/source/gameengine/Expressions/VectorValue.h branches/hairsim/source/gameengine/Expressions/VoidValue.h branches/hairsim/source/gameengine/GameLogic/SCA_ActuatorEventManager.h branches/hairsim/source/gameengine/GameLogic/SCA_AlwaysEventManager.h branches/hairsim/source/gameengine/GameLogic/SCA_BasicEventManager.h branches/hairsim/source/gameengine/GameLogic/SCA_EventManager.h branches/hairsim/source/gameengine/GameLogic/SCA_ExpressionController.h branches/hairsim/source/gameengine/GameLogic/SCA_IActuator.h branches/hairsim/source/gameengine/GameLogic/SCA_IInputDevice.h branches/hairsim/source/gameengine/GameLogic/SCA_IScene.h branches/hairsim/source/gameengine/GameLogic/SCA_JoystickManager.h branches/hairsim/source/gameengine/GameLogic/SCA_KeyboardManager.h branches/hairsim/source/gameengine/GameLogic/SCA_LogicManager.h branches/hairsim/source/gameengine/GameLogic/SCA_MouseManager.h branches/hairsim/source/gameengine/GameLogic/SCA_PropertyEventManager.h branches/hairsim/source/gameengine/GameLogic/SCA_PythonMouse.cpp branches/hairsim/source/gameengine/GameLogic/SCA_RandomEventManager.h branches/hairsim/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h branches/hairsim/source/gameengine/GameLogic/SCA_TimeEventManager.h branches/hairsim/source/gameengine/Ketsji/BL_BlenderShader.h branches/hairsim/source/gameengine/Ketsji/BL_Material.h branches/hairsim/source/gameengine/Ketsji/BL_Shader.h branches/hairsim/source/gameengine/Ketsji/BL_Texture.h branches/hairsim/source/gameengine/Ketsji/KX_BulletPhysicsController.h branches/hairsim/source/gameengine/Ketsji/KX_CameraIpoSGController.h branches/hairsim/source/gameengine/Ketsji/KX_ClientObjectInfo.h branches/hairsim/source/gameengine/Ketsji/KX_Dome.h branches/hairsim/source/gameengine/Ketsji/KX_EmptyObject.h branches/hairsim/source/gameengine/Ketsji/KX_GameObject.cpp branches/hairsim/source/gameengine/Ketsji/KX_IInterpolator.h branches/hairsim/source/gameengine/Ketsji/KX_IPO_SGController.h branches/hairsim/source/gameengine/Ketsji/KX_IPhysicsController.h branches/hairsim/source/gameengine/Ketsji/KX_IScalarInterpolator.h branches/hairsim/source/gameengine/Ketsji/KX_ISceneConverter.h branches/hairsim/source/gameengine/Ketsji/KX_ISystem.h branches/hairsim/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/hairsim/source/gameengine/Ketsji/KX_LightIpoSGController.h branches/hairsim/source/gameengine/Ketsji/KX_MaterialIpoController.h branches/hairsim/source/gameengine/Ketsji/KX_MotionState.h branches/hairsim/source/gameengine/Ketsji/KX_ObColorIpoSGController.h branches/hairsim/source/gameengine/Ketsji/KX_ObjectActuator.cpp branches/hairsim/source/gameengine/Ketsji/KX_OrientationInterpolator.h branches/hairsim/source/gameengine/Ketsji/KX_PolygonMaterial.cpp branches/hairsim/source/gameengine/Ketsji/KX_PolygonMaterial.h branches/hairsim/source/gameengine/Ketsji/KX_PositionInterpolator.h branches/hairsim/source/gameengine/Ketsji/KX_PythonInit.cpp branches/hairsim/source/gameengine/Ketsji/KX_PythonInit.h branches/hairsim/source/gameengine/Ketsji/KX_RayCast.h branches/hairsim/source/gameengine/Ketsji/KX_RayEventManager.h branches/hairsim/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h branches/hairsim/source/gameengine/Ketsji/KX_SG_NodeRelationships.h branches/hairsim/source/gameengine/Ketsji/KX_ScalarInterpolator.h branches/hairsim/source/gameengine/Ketsji/KX_ScalingInterpolator.h branches/hairsim/source/gameengine/Ketsji/KX_Scene.cpp branches/hairsim/source/gameengine/Ketsji/KX_Scene.h branches/hairsim/source/gameengine/Ketsji/KX_TimeCategoryLogger.h branches/hairsim/source/gameengine/Ketsji/KX_TimeLogger.h branches/hairsim/source/gameengine/Ketsji/KX_TouchEventManager.h branches/hairsim/source/gameengine/Ketsji/KX_WorldInfo.h branches/hairsim/source/gameengine/Ketsji/KX_WorldIpoController.h branches/hairsim/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp branches/hairsim/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h branches/hairsim/source/gameengine/Network/NG_NetworkDeviceInterface.h branches/hairsim/source/gameengine/Network/NG_NetworkMessage.h branches/hairsim/source/gameengine/Network/NG_NetworkObject.h branches/hairsim/source/gameengine/Network/NG_NetworkScene.h branches/hairsim/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h branches/hairsim/source/gameengine/Physics/Bullet/CcdGraphicController.h branches/hairsim/source/gameengine/Physics/Bullet/CcdPhysicsController.h branches/hairsim/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h branches/hairsim/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h branches/hairsim/source/gameengine/Physics/common/PHY_IController.h branches/hairsim/source/gameengine/Physics/common/PHY_IGraphicController.h branches/hairsim/source/gameengine/Physics/common/PHY_IMotionState.h branches/hairsim/source/gameengine/Physics/common/PHY_IPhysicsController.h branches/hairsim/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h branches/hairsim/source/gameengine/Physics/common/PHY_IVehicle.h branches/hairsim/source/gameengine/PyDoc/bge.render.rst branches/hairsim/source/gameengine/PyDoc/bge.types.rst branches/hairsim/source/gameengine/Rasterizer/RAS_2DFilterManager.h branches/hairsim/source/gameengine/Rasterizer/RAS_BucketManager.h branches/hairsim/source/gameengine/Rasterizer/RAS_Deformer.h branches/hairsim/source/gameengine/Rasterizer/RAS_FramingManager.h branches/hairsim/source/gameengine/Rasterizer/RAS_ICanvas.h branches/hairsim/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h branches/hairsim/source/gameengine/Rasterizer/RAS_IRasterizer.h branches/hairsim/source/gameengine/Rasterizer/RAS_IRenderTools.h branches/hairsim/source/gameengine/Rasterizer/RAS_MaterialBucket.h branches/hairsim/source/gameengine/Rasterizer/RAS_MeshObject.h branches/hairsim/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h branches/hairsim/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h branches/hairsim/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h branches/hairsim/source/gameengine/Rasterizer/RAS_Polygon.h branches/hairsim/source/gameengine/Rasterizer/RAS_Rect.h branches/hairsim/source/gameengine/Rasterizer/RAS_TexVert.h branches/hairsim/source/gameengine/SceneGraph/SG_BBox.h branches/hairsim/source/gameengine/SceneGraph/SG_Controller.h branches/hairsim/source/gameengine/SceneGraph/SG_DList.h branches/hairsim/source/gameengine/SceneGraph/SG_IObject.h branches/hairsim/source/gameengine/SceneGraph/SG_Node.h branches/hairsim/source/gameengine/SceneGraph/SG_ParentRelation.h branches/hairsim/source/gameengine/SceneGraph/SG_QList.h branches/hairsim/source/gameengine/SceneGraph/SG_Spatial.h branches/hairsim/source/gameengine/SceneGraph/SG_Tree.h branches/hairsim/source/gameengine/VideoTexture/ImageBase.cpp branches/hairsim/source/gameengine/VideoTexture/VideoFFmpeg.cpp branches/hairsim/source/nan_definitions.mk branches/hairsim/source/nan_link.mk branches/hairsim/tools/Blender.py branches/hairsim/tools/btools.py branches/hairsim/tools/crossmingw.py Modified: branches/hairsim/CMake/macros.cmake =================================================================== --- branches/hairsim/CMake/macros.cmake 2010-06-15 20:00:01 UTC (rev 29477) +++ branches/hairsim/CMake/macros.cmake 2010-06-15 21:39:17 UTC (rev 29478) @@ -1,174 +1,183 @@ MACRO(BLENDERLIB_NOLIST - name - sources - includes) + name + sources + includes) - # Gather all headers - FILE(GLOB_RECURSE INC_ALL *.h) - - INCLUDE_DIRECTORIES(${includes}) - ADD_LIBRARY(${name} ${INC_ALL} ${sources}) + # Gather all headers + FILE(GLOB_RECURSE INC_ALL *.h) + + INCLUDE_DIRECTORIES(${includes}) + ADD_LIBRARY(${name} ${INC_ALL} ${sources}) - # Group by location on disk - SOURCE_GROUP(Files FILES CMakeLists.txt) - SET(ALL_FILES ${sources} ${INC_ALL}) - FOREACH(SRC ${ALL_FILES}) - STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}") - STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}") - STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}") - IF(REL_DIR) - SOURCE_GROUP(${REL_DIR} FILES ${SRC}) - ELSE(REL_DIR) - SOURCE_GROUP(Files FILES ${SRC}) - ENDIF(REL_DIR) - ENDFOREACH(SRC) + # Group by location on disk + SOURCE_GROUP(Files FILES CMakeLists.txt) + SET(ALL_FILES ${sources} ${INC_ALL}) + FOREACH(SRC ${ALL_FILES}) + STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}") + STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}") + STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}") + IF(REL_DIR) + SOURCE_GROUP(${REL_DIR} FILES ${SRC}) + ELSE(REL_DIR) + SOURCE_GROUP(Files FILES ${SRC}) + ENDIF(REL_DIR) + ENDFOREACH(SRC) - MESSAGE(STATUS "Configuring library ${name}") + MESSAGE(STATUS "Configuring library ${name}") ENDMACRO(BLENDERLIB_NOLIST) MACRO(BLENDERLIB - name - sources - includes) + name + sources + includes) - BLENDERLIB_NOLIST(${name} "${sources}" "${includes}") + BLENDERLIB_NOLIST(${name} "${sources}" "${includes}") - # Add to blender's list of libraries - FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};") + # Add to blender's list of libraries + FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};") ENDMACRO(BLENDERLIB) MACRO(SETUP_LIBDIRS) - # see "cmake --help-policy CMP0003" - if(COMMAND cmake_policy) - CMAKE_POLICY(SET CMP0003 NEW) - endif(COMMAND cmake_policy) - - LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH}) - - LINK_DIRECTORIES(${CPPAD_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_SNDFILE) - LINK_DIRECTORIES(${SNDFILE_LIBPATH}) - ENDIF(WITH_SNDFILE) - IF(WITH_FFTW3) - LINK_DIRECTORIES(${FFTW3_LIBPATH}) - ENDIF(WITH_FFTW3) - IF(WITH_OPENCOLLADA) - LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH}) - LINK_DIRECTORIES(${PCRE_LIBPATH}) - LINK_DIRECTORIES(${EXPAT_LIBPATH}) - ENDIF(WITH_OPENCOLLADA) + # see "cmake --help-policy CMP0003" + if(COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0003 NEW) + endif(COMMAND cmake_policy) + + 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_TIFF) + LINK_DIRECTORIES(${TIFF_LIBPATH}) + ENDIF(WITH_TIFF) + IF(WITH_LCMS) + LINK_DIRECTORIES(${LCMS_LIBPATH}) + ENDIF(WITH_LCMS) + 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_SNDFILE) + LINK_DIRECTORIES(${SNDFILE_LIBPATH}) + ENDIF(WITH_SNDFILE) + IF(WITH_FFTW3) + LINK_DIRECTORIES(${FFTW3_LIBPATH}) + ENDIF(WITH_FFTW3) + IF(WITH_OPENCOLLADA) + LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH}) + LINK_DIRECTORIES(${PCRE_LIBPATH}) + LINK_DIRECTORIES(${EXPAT_LIBPATH}) + ENDIF(WITH_OPENCOLLADA) - IF(WIN32) - LINK_DIRECTORIES(${PTHREADS_LIBPATH}) - ENDIF(WIN32) + IF(WIN32) + LINK_DIRECTORIES(${PTHREADS_LIBPATH}) + ENDIF(WIN32) ENDMACRO(SETUP_LIBDIRS) MACRO(SETUP_LIBLINKS - target) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ") + target) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ") - TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS} ) + TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${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(WITH_PYTHON) - TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS}) - - 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}) - ENDIF(WIN32) - ENDIF(WITH_PYTHON) - - TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB}) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${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(WITH_PYTHON) + TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS}) - IF(WITH_INTERNATIONAL) - TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) - - IF(WIN32) - TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) - ENDIF(WIN32) - ENDIF(WITH_INTERNATIONAL) - - IF(WITH_OPENAL) - 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_SNDFILE) - TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB}) - ENDIF(WITH_SNDFILE) - IF(WITH_SDL) - TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY}) - ENDIF(WITH_SDL) - IF(WITH_QUICKTIME) - TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) - ENDIF(WITH_QUICKTIME) - IF(WITH_OPENEXR) - IF(WIN32) - FOREACH(loop_var ${OPENEXR_LIB}) - TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) - TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) - ENDFOREACH(loop_var) - ELSE(WIN32) - TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) - ENDIF(WIN32) - ENDIF(WITH_OPENEXR) - IF(WITH_FFMPEG) - TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB}) - ENDIF(WITH_FFMPEG) - IF(WITH_OPENCOLLADA) - IF(WIN32) - FOREACH(loop_var ${OPENCOLLADA_LIB}) - TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) - TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) - ENDFOREACH(loop_var) - TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d) - TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB}) - IF(EXPAT_LIB) - TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d) - TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB}) - ENDIF(EXPAT_LIB) - ELSE(WIN32) - TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB}) - TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB}) - TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB}) - ENDIF(WIN32) - ENDIF(WITH_OPENCOLLADA) - IF(WIN32) - TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB}) - ENDIF(WIN32) + 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}) + ENDIF(WIN32) + ENDIF(WITH_PYTHON) + + TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB}) + TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB}) + + IF(WITH_INTERNATIONAL) + TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) + + IF(WIN32) + TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) + ENDIF(WIN32) + ENDIF(WITH_INTERNATIONAL) + + IF(WITH_OPENAL) + 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_SNDFILE) + TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB}) + ENDIF(WITH_SNDFILE) + IF(WITH_SDL) + TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY}) + ENDIF(WITH_SDL) + IF(WITH_QUICKTIME) + TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) + ENDIF(WITH_QUICKTIME) + IF(WITH_TIFF) + TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) + ENDIF(WITH_TIFF) + IF(WITH_OPENEXR) + IF(WIN32) + FOREACH(loop_var ${OPENEXR_LIB}) + TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) + ENDFOREACH(loop_var) + ELSE(WIN32) + TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) + ENDIF(WIN32) + ENDIF(WITH_OPENEXR) + IF(WITH_LCMS) + TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) + ENDIF(WITH_LCMS) + IF(WITH_FFMPEG) + TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB}) + ENDIF(WITH_FFMPEG) + IF(WITH_OPENCOLLADA) + IF(WIN32) + FOREACH(loop_var ${OPENCOLLADA_LIB}) + TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) + TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) + ENDFOREACH(loop_var) + TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d) @@ 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