[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26184] branches/nurbs25: merge: 26031: 26183
Emmanuel Stone
emmanuel.stone at gmail.com
Fri Jan 22 06:47:11 CET 2010
Revision: 26184
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26184
Author: eman
Date: 2010-01-22 06:47:09 +0100 (Fri, 22 Jan 2010)
Log Message:
-----------
merge: 26031:26183
Modified Paths:
--------------
branches/nurbs25/CMake/macros.cmake
branches/nurbs25/CMakeLists.txt
branches/nurbs25/config/darwin-config.py
branches/nurbs25/config/irix6-config.py
branches/nurbs25/config/linuxcross-config.py
branches/nurbs25/config/openbsd3-config.py
branches/nurbs25/config/sunos5-config.py
branches/nurbs25/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/nurbs25/intern/bsp/intern/BSP_CSGMesh.cpp
branches/nurbs25/intern/ghost/SConscript
branches/nurbs25/intern/ghost/intern/GHOST_WindowX11.cpp
branches/nurbs25/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/nurbs25/intern/guardedalloc/intern/mallocn.c
branches/nurbs25/intern/string/intern/STR_String.cpp
branches/nurbs25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/nurbs25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/nurbs25/release/datafiles/blenderbuttons
branches/nurbs25/release/scripts/io/export_fbx.py
branches/nurbs25/release/scripts/io/export_obj.py
branches/nurbs25/release/scripts/io/export_x3d.py
branches/nurbs25/release/scripts/modules/bpy/__init__.py
branches/nurbs25/release/scripts/modules/bpy/app.py
branches/nurbs25/release/scripts/modules/bpy/utils.py
branches/nurbs25/release/scripts/modules/rigify/__init__.py
branches/nurbs25/release/scripts/modules/rigify/arm_biped.py
branches/nurbs25/release/scripts/modules/rigify/finger_curl.py
branches/nurbs25/release/scripts/modules/rigify/leg_biped.py
branches/nurbs25/release/scripts/modules/rigify/leg_quadruped.py
branches/nurbs25/release/scripts/modules/rigify/mouth.py
branches/nurbs25/release/scripts/modules/rigify/neck_flex.py
branches/nurbs25/release/scripts/modules/rigify/palm_curl.py
branches/nurbs25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/nurbs25/release/scripts/op/uv.py
branches/nurbs25/release/scripts/ui/space_image.py
branches/nurbs25/release/scripts/ui/space_info.py
branches/nurbs25/release/scripts/ui/space_text.py
branches/nurbs25/release/scripts/ui/space_time.py
branches/nurbs25/release/scripts/ui/space_userpref.py
branches/nurbs25/release/scripts/ui/space_view3d.py
branches/nurbs25/release/scripts/ui/space_view3d_toolbar.py
branches/nurbs25/source/blender/blenkernel/BKE_anim.h
branches/nurbs25/source/blender/blenkernel/BKE_blender.h
branches/nurbs25/source/blender/blenkernel/BKE_colortools.h
branches/nurbs25/source/blender/blenkernel/BKE_deform.h
branches/nurbs25/source/blender/blenkernel/BKE_image.h
branches/nurbs25/source/blender/blenkernel/BKE_node.h
branches/nurbs25/source/blender/blenkernel/BKE_object.h
branches/nurbs25/source/blender/blenkernel/BKE_sequencer.h
branches/nurbs25/source/blender/blenkernel/intern/BME_Customdata.c
branches/nurbs25/source/blender/blenkernel/intern/BME_mesh.c
branches/nurbs25/source/blender/blenkernel/intern/anim.c
branches/nurbs25/source/blender/blenkernel/intern/armature.c
branches/nurbs25/source/blender/blenkernel/intern/brush.c
branches/nurbs25/source/blender/blenkernel/intern/colortools.c
branches/nurbs25/source/blender/blenkernel/intern/customdata.c
branches/nurbs25/source/blender/blenkernel/intern/deform.c
branches/nurbs25/source/blender/blenkernel/intern/fcurve.c
branches/nurbs25/source/blender/blenkernel/intern/idprop.c
branches/nurbs25/source/blender/blenkernel/intern/image.c
branches/nurbs25/source/blender/blenkernel/intern/modifier.c
branches/nurbs25/source/blender/blenkernel/intern/nla.c
branches/nurbs25/source/blender/blenkernel/intern/node.c
branches/nurbs25/source/blender/blenkernel/intern/object.c
branches/nurbs25/source/blender/blenkernel/intern/particle_system.c
branches/nurbs25/source/blender/blenkernel/intern/sca.c
branches/nurbs25/source/blender/blenkernel/intern/sequencer.c
branches/nurbs25/source/blender/blenkernel/intern/text.c
branches/nurbs25/source/blender/blenlib/BLI_math_color.h
branches/nurbs25/source/blender/blenlib/BLI_mempool.h
branches/nurbs25/source/blender/blenlib/intern/BLI_mempool.c
branches/nurbs25/source/blender/blenlib/intern/math_color.c
branches/nurbs25/source/blender/blenloader/intern/readfile.c
branches/nurbs25/source/blender/blenloader/intern/writefile.c
branches/nurbs25/source/blender/editors/CMakeLists.txt
branches/nurbs25/source/blender/editors/animation/anim_draw.c
branches/nurbs25/source/blender/editors/animation/anim_filter.c
branches/nurbs25/source/blender/editors/animation/anim_ops.c
branches/nurbs25/source/blender/editors/animation/keyframes_draw.c
branches/nurbs25/source/blender/editors/armature/poseobject.c
branches/nurbs25/source/blender/editors/datafiles/B.blend.c
branches/nurbs25/source/blender/editors/datafiles/blenderbuttons.c
branches/nurbs25/source/blender/editors/include/ED_fileselect.h
branches/nurbs25/source/blender/editors/include/ED_object.h
branches/nurbs25/source/blender/editors/include/UI_icons.h
branches/nurbs25/source/blender/editors/include/UI_interface.h
branches/nurbs25/source/blender/editors/include/UI_resources.h
branches/nurbs25/source/blender/editors/interface/interface.c
branches/nurbs25/source/blender/editors/interface/interface_draw.c
branches/nurbs25/source/blender/editors/interface/interface_handlers.c
branches/nurbs25/source/blender/editors/interface/interface_intern.h
branches/nurbs25/source/blender/editors/interface/interface_panel.c
branches/nurbs25/source/blender/editors/interface/interface_regions.c
branches/nurbs25/source/blender/editors/interface/interface_templates.c
branches/nurbs25/source/blender/editors/interface/interface_widgets.c
branches/nurbs25/source/blender/editors/interface/resources.c
branches/nurbs25/source/blender/editors/mesh/editmesh.c
branches/nurbs25/source/blender/editors/mesh/editmesh_add.c
branches/nurbs25/source/blender/editors/mesh/editmesh_mods.c
branches/nurbs25/source/blender/editors/mesh/editmesh_tools.c
branches/nurbs25/source/blender/editors/object/object_add.c
branches/nurbs25/source/blender/editors/object/object_bake.c
branches/nurbs25/source/blender/editors/object/object_edit.c
branches/nurbs25/source/blender/editors/object/object_intern.h
branches/nurbs25/source/blender/editors/object/object_ops.c
branches/nurbs25/source/blender/editors/object/object_transform.c
branches/nurbs25/source/blender/editors/object/object_vgroup.c
branches/nurbs25/source/blender/editors/screen/area.c
branches/nurbs25/source/blender/editors/screen/screen_intern.h
branches/nurbs25/source/blender/editors/screen/screen_ops.c
branches/nurbs25/source/blender/editors/screen/screendump.c
branches/nurbs25/source/blender/editors/sculpt_paint/paint_image.c
branches/nurbs25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/nurbs25/source/blender/editors/space_action/action_edit.c
branches/nurbs25/source/blender/editors/space_action/space_action.c
branches/nurbs25/source/blender/editors/space_api/spacetypes.c
branches/nurbs25/source/blender/editors/space_file/file_draw.c
branches/nurbs25/source/blender/editors/space_file/file_intern.h
branches/nurbs25/source/blender/editors/space_file/file_ops.c
branches/nurbs25/source/blender/editors/space_file/space_file.c
branches/nurbs25/source/blender/editors/space_graph/graph_buttons.c
branches/nurbs25/source/blender/editors/space_graph/graph_edit.c
branches/nurbs25/source/blender/editors/space_graph/graph_select.c
branches/nurbs25/source/blender/editors/space_graph/space_graph.c
branches/nurbs25/source/blender/editors/space_image/image_buttons.c
branches/nurbs25/source/blender/editors/space_image/image_draw.c
branches/nurbs25/source/blender/editors/space_image/image_intern.h
branches/nurbs25/source/blender/editors/space_image/image_ops.c
branches/nurbs25/source/blender/editors/space_image/space_image.c
branches/nurbs25/source/blender/editors/space_logic/Makefile
branches/nurbs25/source/blender/editors/space_logic/SConscript
branches/nurbs25/source/blender/editors/space_logic/logic_buttons.c
branches/nurbs25/source/blender/editors/space_logic/logic_intern.h
branches/nurbs25/source/blender/editors/space_logic/logic_window.c
branches/nurbs25/source/blender/editors/space_logic/space_logic.c
branches/nurbs25/source/blender/editors/space_node/drawnode.c
branches/nurbs25/source/blender/editors/space_node/node_draw.c
branches/nurbs25/source/blender/editors/space_node/node_edit.c
branches/nurbs25/source/blender/editors/space_node/node_header.c
branches/nurbs25/source/blender/editors/space_node/node_intern.h
branches/nurbs25/source/blender/editors/space_text/space_text.c
branches/nurbs25/source/blender/editors/space_time/space_time.c
branches/nurbs25/source/blender/editors/space_time/time_ops.c
branches/nurbs25/source/blender/editors/space_view3d/drawanimviz.c
branches/nurbs25/source/blender/editors/space_view3d/drawarmature.c
branches/nurbs25/source/blender/editors/space_view3d/drawobject.c
branches/nurbs25/source/blender/editors/space_view3d/space_view3d.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_draw.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_edit.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_header.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_intern.h
branches/nurbs25/source/blender/editors/space_view3d/view3d_ops.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_select.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_toolbar.c
branches/nurbs25/source/blender/editors/space_view3d/view3d_view.c
branches/nurbs25/source/blender/editors/transform/transform.c
branches/nurbs25/source/blender/editors/transform/transform.h
branches/nurbs25/source/blender/editors/transform/transform_constraints.c
branches/nurbs25/source/blender/editors/transform/transform_conversions.c
branches/nurbs25/source/blender/editors/transform/transform_generics.c
branches/nurbs25/source/blender/editors/transform/transform_numinput.c
branches/nurbs25/source/blender/editors/transform/transform_snap.c
branches/nurbs25/source/blender/gpu/intern/gpu_buffers.c
branches/nurbs25/source/blender/makesdna/DNA_ID.h
branches/nurbs25/source/blender/makesdna/DNA_action_types.h
branches/nurbs25/source/blender/makesdna/DNA_anim_types.h
branches/nurbs25/source/blender/makesdna/DNA_brush_types.h
branches/nurbs25/source/blender/makesdna/DNA_color_types.h
branches/nurbs25/source/blender/makesdna/DNA_node_types.h
branches/nurbs25/source/blender/makesdna/DNA_object_types.h
branches/nurbs25/source/blender/makesdna/DNA_scene_types.h
branches/nurbs25/source/blender/makesdna/DNA_space_types.h
branches/nurbs25/source/blender/makesdna/DNA_userdef_types.h
branches/nurbs25/source/blender/makesdna/DNA_view3d_types.h
branches/nurbs25/source/blender/makesdna/intern/SConscript
branches/nurbs25/source/blender/makesdna/intern/makesdna.c
branches/nurbs25/source/blender/makesrna/RNA_access.h
branches/nurbs25/source/blender/makesrna/RNA_enum_types.h
branches/nurbs25/source/blender/makesrna/RNA_types.h
branches/nurbs25/source/blender/makesrna/intern/SConscript
branches/nurbs25/source/blender/makesrna/intern/makesrna.c
branches/nurbs25/source/blender/makesrna/intern/rna_access.c
branches/nurbs25/source/blender/makesrna/intern/rna_brush.c
branches/nurbs25/source/blender/makesrna/intern/rna_color.c
branches/nurbs25/source/blender/makesrna/intern/rna_curve.c
branches/nurbs25/source/blender/makesrna/intern/rna_fcurve.c
branches/nurbs25/source/blender/makesrna/intern/rna_image.c
branches/nurbs25/source/blender/makesrna/intern/rna_main_api.c
branches/nurbs25/source/blender/makesrna/intern/rna_material.c
branches/nurbs25/source/blender/makesrna/intern/rna_modifier.c
branches/nurbs25/source/blender/makesrna/intern/rna_nla.c
branches/nurbs25/source/blender/makesrna/intern/rna_nodetree.c
branches/nurbs25/source/blender/makesrna/intern/rna_nodetree_types.h
branches/nurbs25/source/blender/makesrna/intern/rna_scene.c
branches/nurbs25/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/nurbs25/source/blender/makesrna/intern/rna_space.c
branches/nurbs25/source/blender/makesrna/intern/rna_texture.c
branches/nurbs25/source/blender/makesrna/intern/rna_timeline.c
branches/nurbs25/source/blender/makesrna/intern/rna_ui_api.c
branches/nurbs25/source/blender/makesrna/intern/rna_userdef.c
branches/nurbs25/source/blender/makesrna/intern/rna_wm.c
branches/nurbs25/source/blender/nodes/CMP_node.h
branches/nurbs25/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/nurbs25/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
branches/nurbs25/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
branches/nurbs25/source/blender/nodes/intern/node_util.h
branches/nurbs25/source/blender/python/generic/vector.c
branches/nurbs25/source/blender/python/intern/bpy_array.c
branches/nurbs25/source/blender/python/intern/bpy_interface.c
branches/nurbs25/source/blender/python/intern/bpy_operator_wrap.c
branches/nurbs25/source/blender/python/intern/bpy_rna.c
branches/nurbs25/source/blender/python/intern/bpy_rna.h
branches/nurbs25/source/blender/python/sphinx_doc_gen.py
branches/nurbs25/source/blender/render/intern/source/pipeline.c
branches/nurbs25/source/blender/render/intern/source/texture.c
branches/nurbs25/source/blender/render/intern/source/voxeldata.c
branches/nurbs25/source/blender/windowmanager/WM_types.h
branches/nurbs25/source/blender/windowmanager/intern/wm_event_system.c
branches/nurbs25/source/blender/windowmanager/intern/wm_files.c
branches/nurbs25/source/blender/windowmanager/intern/wm_init_exit.c
branches/nurbs25/source/blender/windowmanager/intern/wm_operators.c
branches/nurbs25/source/blender/windowmanager/intern/wm_window.c
branches/nurbs25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/nurbs25/source/creator/CMakeLists.txt
branches/nurbs25/source/gameengine/Ketsji/KX_Camera.cpp
branches/nurbs25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/nurbs25/source/gameengine/Ketsji/KX_GameObject.h
branches/nurbs25/source/nan_definitions.mk
Added Paths:
-----------
branches/nurbs25/config/aix4-config.py
branches/nurbs25/release/scripts/modules/rigify/eye_balls.py
branches/nurbs25/release/scripts/modules/rigify/eye_lid.py
branches/nurbs25/release/scripts/modules/rigify/shape_key_distance.py
branches/nurbs25/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/nurbs25/release/scripts/op/object_randomize_transform.py
branches/nurbs25/release/scripts/ui/properties_animviz.py
branches/nurbs25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/nurbs25/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/nurbs25/source/blender/python/intern/bpy_props.c
branches/nurbs25/source/blender/python/intern/bpy_props.h
Modified: branches/nurbs25/CMake/macros.cmake
===================================================================
--- branches/nurbs25/CMake/macros.cmake 2010-01-22 04:52:32 UTC (rev 26183)
+++ branches/nurbs25/CMake/macros.cmake 2010-01-22 05:47:09 UTC (rev 26184)
@@ -135,15 +135,35 @@
TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
ENDIF(WITH_QUICKTIME)
IF(WITH_OPENEXR)
- TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+ 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)
- TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
- TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+ 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})
Modified: branches/nurbs25/CMakeLists.txt
===================================================================
--- branches/nurbs25/CMakeLists.txt 2010-01-22 04:52:32 UTC (rev 26183)
+++ branches/nurbs25/CMakeLists.txt 2010-01-22 05:47:09 UTC (rev 26184)
@@ -79,14 +79,14 @@
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
+OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON)
# Unix defaults to OpenMP On
-IF (UNIX)
+IF(UNIX AND NOT APPLE)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
-ELSE(UNIX)
+ELSE()
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
-ENDIF(UNIX)
+ENDIF()
IF (APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -248,7 +248,7 @@
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
- SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
@@ -608,7 +608,7 @@
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
# Better warnings
- SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
ENDIF(APPLE)
Copied: branches/nurbs25/config/aix4-config.py (from rev 26183, trunk/blender/config/aix4-config.py)
===================================================================
--- branches/nurbs25/config/aix4-config.py (rev 0)
+++ branches/nurbs25/config/aix4-config.py 2010-01-22 05:47:09 UTC (rev 26184)
@@ -0,0 +1,225 @@
+import os
+
+LCGDIR = os.getcwd()+"/../lib/aix-4.3-ppc"
+LIBDIR = LCGDIR
+print LCGDIR
+
+WITH_BF_VERSE = 'false'
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+BF_PYTHON = LCGDIR+'/python'
+BF_PYTHON_VERSION = '3.1'
+WITH_BF_STATICPYTHON = 'true'
+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/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = 'false'
+WITH_BF_STATICOPENAL = 'false'
+BF_OPENAL = LCGDIR+'/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+BF_OPENAL_LIBPATH = LIBDIR + '/lib'
+
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = 'false'
+BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_OPENEXR = 'false'
+WITH_BF_STATICOPENEXR = 'false'
+BF_OPENEXR = '/usr'
+# 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 = 'false'
+
+WITH_BF_JPEG = 'false'
+BF_JPEG = LCGDIR+'/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = 'false'
+BF_PNG = LCGDIR+"/png"
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = '/usr/nekoware'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = 'true'
+BF_ZLIB = LCGDIR+"/zlib"
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = 'false'
+
+BF_GETTEXT = LCGDIR+'/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextpo intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = 'false'
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE='false'
+
+WITH_BF_ODE = 'false'
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = 'true'
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = 'true'
+
+#WITH_BF_NSPR = 'true'
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB =
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = 'true'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LCGDIR+'/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = 'false'
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv charset'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = 'false'
+
+# enable ffmpeg support
+WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
+# Uncomment the following two lines to use system's ffmpeg
+BF_FFMPEG = LCGDIR+'/ffmpeg'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice faad faac vorbis x264 ogg mp3lame z'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = 'false' # -DWITH_OGG
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+
+WITH_BF_OPENJPEG = 'false'
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = 'false'
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = 'false'
+BF_OPENGL = '/usr'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi Xext'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
+
+
+CC = 'gcc'
+CXX = 'g++'
+
+CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
+
+CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ]
+CXXFLAGS = ['-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
+REL_CFLAGS = [ '-O2' ]
+REL_CCFLAGS = [ '-O2' ]
+C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
+
+CC_WARN = [ '-Wall' ]
+
+
+
+##BF_DEPEND = 'true'
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = 'c m dl pthread dmedia movie'
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE = 'false'
+
+BF_DEBUG = 'false'
+BF_DEBUG_FLAGS = '-g'
+
+BF_BUILDDIR = '../build/aix4'
+BF_INSTALLDIR='../install/aix4'
+BF_DOCDIR='../install/doc'
+
+#Link against pthread
+LDIRS = []
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list