[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31371] branches/soc-2010-nexyon: svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Joerg Mueller
nexyon at gmail.com
Mon Aug 16 11:37:08 CEST 2010
Revision: 31371
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31371
Author: nexyon
Date: 2010-08-16 11:37:08 +0200 (Mon, 16 Aug 2010)
Log Message:
-----------
svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2010-nexyon/intern/ghost/SConscript
branches/soc-2010-nexyon/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/soc-2010-nexyon/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2010-nexyon/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2010-nexyon/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2010-nexyon/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2010-nexyon/release/scripts/io/export_obj.py
branches/soc-2010-nexyon/release/scripts/io/import_scene_obj.py
branches/soc-2010-nexyon/release/scripts/io/netrender/client.py
branches/soc-2010-nexyon/release/scripts/io/netrender/master.py
branches/soc-2010-nexyon/release/scripts/io/netrender/operators.py
branches/soc-2010-nexyon/release/scripts/io/netrender/slave.py
branches/soc-2010-nexyon/release/scripts/io/netrender/utils.py
branches/soc-2010-nexyon/release/scripts/ui/properties_world.py
branches/soc-2010-nexyon/release/scripts/ui/space_image.py
branches/soc-2010-nexyon/release/scripts/ui/space_userpref.py
branches/soc-2010-nexyon/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nexyon/source/blender/avi/intern/avi.c
branches/soc-2010-nexyon/source/blender/avi/intern/avi_intern.h
branches/soc-2010-nexyon/source/blender/blenfont/intern/blf_lang.c
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-nexyon/source/blender/blenkernel/intern/BME_Customdata.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/armature.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/boids.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/booleanops_mesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/collision.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/effect.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/group.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/material.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/node.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/object.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/paint.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/scene.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/screen.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/sketch.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/text.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/texture.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/world.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2010-nexyon/source/blender/blenlib/BLI_ghash.h
branches/soc-2010-nexyon/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/math_rotation.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/math_vector.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/winstuff.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframes_draw.c
branches/soc-2010-nexyon/source/blender/editors/armature/armature_ops.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature_generate.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseSlide.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseUtils.c
branches/soc-2010-nexyon/source/blender/editors/armature/poselib.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseobject.c
branches/soc-2010-nexyon/source/blender/editors/armature/reeb.c
branches/soc-2010-nexyon/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nexyon/source/blender/editors/curve/editcurve.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_anim.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_style.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nexyon/source/blender/editors/interface/view2d.c
branches/soc-2010-nexyon/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editface.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nexyon/source/blender/editors/mesh/loopcut.c
branches/soc-2010-nexyon/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-nexyon/source/blender/editors/object/object_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_group.c
branches/soc-2010-nexyon/source/blender/editors/object/object_ops.c
branches/soc-2010-nexyon/source/blender/editors/object/object_transform.c
branches/soc-2010-nexyon/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-nexyon/source/blender/editors/render/render_internal.c
branches/soc-2010-nexyon/source/blender/editors/render/render_preview.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_edit.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_api/space.c
branches/soc-2010-nexyon/source/blender/editors/space_api/spacetypes.c
branches/soc-2010-nexyon/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2010-nexyon/source/blender/editors/space_console/console_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_file/filesel.c
branches/soc-2010-nexyon/source/blender/editors/space_file/writeimage.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_utils.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_header.c
branches/soc-2010-nexyon/source/blender/editors/space_image/space_image.c
branches/soc-2010-nexyon/source/blender/editors/space_info/info_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_header.c
branches/soc-2010-nexyon/source/blender/editors/space_node/space_node.c
branches/soc-2010-nexyon/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nexyon/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_header.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-nexyon/source/blender/editors/space_text/text_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_text/text_header.c
branches/soc-2010-nexyon/source/blender/editors/space_time/time_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_snap.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-nexyon/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/anim.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/cache.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/filter.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/imbuf.h
branches/soc-2010-nexyon/source/blender/imbuf/intern/iris.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/jp2.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/png.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/rotate.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/scaling.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/targa.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_material_api.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_rna.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_array.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_build.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_util.c
branches/soc-2010-nexyon/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2010-nexyon/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
branches/soc-2010-nexyon/source/blender/python/generic/bgl.c
branches/soc-2010-nexyon/source/blender/python/generic/blf_api.c
branches/soc-2010-nexyon/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-nexyon/source/blender/python/generic/geometry.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils.c
branches/soc-2010-nexyon/source/blender/python/generic/noise.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_operator.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_props.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_util.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_util.h
branches/soc-2010-nexyon/source/blender/render/intern/raytrace/bvh.h
branches/soc-2010-nexyon/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2010-nexyon/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2010-nexyon/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nexyon/source/blender/windowmanager/WM_api.h
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nexyon/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2010-nexyon/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp
branches/soc-2010-nexyon/source/gameengine/GamePlayer/netscape/common/npmac.cpp
Added Paths:
-----------
branches/soc-2010-nexyon/build_files/scons/config/freebsd7-config.py
branches/soc-2010-nexyon/build_files/scons/config/freebsd8-config.py
branches/soc-2010-nexyon/build_files/scons/config/freebsd9-config.py
Copied: branches/soc-2010-nexyon/build_files/scons/config/freebsd7-config.py (from rev 31370, trunk/blender/build_files/scons/config/freebsd7-config.py)
===================================================================
--- branches/soc-2010-nexyon/build_files/scons/config/freebsd7-config.py (rev 0)
+++ branches/soc-2010-nexyon/build_files/scons/config/freebsd7-config.py 2010-08-16 09:37:08 UTC (rev 31371)
@@ -0,0 +1,213 @@
+CC = 'gcc44'
+CXX = 'g++44'
+
+LCGDIR = '../lib/freebsd7'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON = '/usr/local'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_VERSION = '3.1'
+WITH_BF_STATICPYTHON = False
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr/local'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr/local'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+BF_LIBSAMPLERATE = '/usr/local'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
+WITH_BF_JACK = True
+BF_JACK = '/usr/local'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = '/usr/local'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+WITH_BF_TIFF = True
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = '/usr/local'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+
+WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = True
+
+# enable ffmpeg support
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+BF_FFMPEG = '/usr/local'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = True # -DWITH_OGG
+BF_OGG = '/usr/local'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
+
+WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/usr/local'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = True
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = '/usr/local'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_PCRE = '/usr/local'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+BF_EXPAT = '/usr/local'
+BF_EXPAT_LIB = 'expat'
+BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
+
+WITH_BF_OPENMP = True
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
+
+CPPFLAGS = []
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
+if WITH_BF_FFMPEG:
+ # libavutil needs UINT64_C()
+ CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
+CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g']
+
+BF_BUILDDIR = '../build/freebsd7'
+BF_INSTALLDIR='../install/freebsd7'
+
+#Link against pthread
+PLATFORM_LINKFLAGS = ['-pthread']
Copied: branches/soc-2010-nexyon/build_files/scons/config/freebsd8-config.py (from rev 31370, trunk/blender/build_files/scons/config/freebsd8-config.py)
===================================================================
--- branches/soc-2010-nexyon/build_files/scons/config/freebsd8-config.py (rev 0)
+++ branches/soc-2010-nexyon/build_files/scons/config/freebsd8-config.py 2010-08-16 09:37:08 UTC (rev 31371)
@@ -0,0 +1,213 @@
+CC = 'gcc44'
+CXX = 'g++44'
+
+LCGDIR = '../lib/freebsd8'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON = '/usr/local'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_VERSION = '3.1'
+WITH_BF_STATICPYTHON = False
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr/local'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr/local'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+BF_LIBSAMPLERATE = '/usr/local'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
+WITH_BF_JACK = True
+BF_JACK = '/usr/local'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = '/usr/local'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+WITH_BF_TIFF = True
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = '/usr/local'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list