[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35621] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 35618.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Mar 19 01:05:32 CET 2011 

Revision: 35621
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35621
Author:   kjym3
Date:     2011-03-19 00:05:30 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 35618.

Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35618

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/GNUmakefile
    branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Menu.py
    branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.2.py
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/extern/glew/include/GL/glew.h
    branches/soc-2008-mxcurioni/extern/glew/include/GL/glxew.h
    branches/soc-2008-mxcurioni/extern/glew/include/GL/wglew.h
    branches/soc-2008-mxcurioni/extern/glew/src/glew.c
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
    branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_lightmap.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/release/text/readme.html
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/PIL_time.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ImageExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ImageExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseUtils.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_fileselect.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_markers.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rotate.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Vector.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/darwin/blender.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/darwin/blenderplayer.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt

Added Paths:
-----------
    branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
    branches/soc-2008-mxcurioni/release/release_todo.txt

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/darwin/blendercreator.app/
    branches/soc-2008-mxcurioni/source/darwin/blenderpublisher.app/

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/Platform/
    branches/soc-2008-mxcurioni/source/darwin/blender.app/Contents/Info.plist
    branches/soc-2008-mxcurioni/source/darwin/blenderplayer.app/Contents/Info.plist


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-35505
   + /trunk/blender:34011-35618

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-03-19 00:05:30 UTC (rev 35621)
@@ -125,7 +125,6 @@
 
 # Misc
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
-option(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 endif()
@@ -161,10 +160,6 @@
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
-	message("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
-endif()
-
 if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
 	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
 endif()
@@ -182,6 +177,9 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
+# remove old vars
+unset(WITH_INSTALL CACHE)
+
 TEST_SSE_SUPPORT()
 
 #-----------------------------------------------------------------------------
@@ -218,6 +216,11 @@
 #Platform specifics
 
 if(UNIX AND NOT APPLE)
+	
+	# needed for ubuntu 11.04
+	if(EXISTS "/usr/lib/x86_64-linux-gnu")
+		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
+	endif()
 
 	if(WITH_OPENAL)
 		find_package(OpenAL)
@@ -1038,7 +1041,8 @@
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_STRICT_PROTOTYPES -Werror=strict-prototypes)
+	# system headers sometimes do this, disable for now, was: -Werror=strict-prototypes
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_STRICT_PROTOTYPES -Wstrict-prototypes)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)

Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/GNUmakefile	2011-03-19 00:05:30 UTC (rev 35621)
@@ -52,7 +52,7 @@
 	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
 endif
 ifeq ($(OS), Darwin)
-	NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print $4}{next;}')
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
 endif
 ifeq ($(OS), FreeBSD)
 	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )

Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py	2011-03-19 00:05:30 UTC (rev 35621)
@@ -78,7 +78,7 @@
 
 
 def is_project_file(filename):
-    return (is_c_any(filename) or is_cmake(filename)) # and is_svn_file(filename)
+    return (is_c_any(filename) or is_cmake(filename))  # and is_svn_file(filename)
 
 
 def cmake_advanced_info():
@@ -185,7 +185,6 @@
         includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
         includes.sort()
 
-
         PROJECT_NAME = "Blender"
         f = open(join(base, "%s.files" % PROJECT_NAME), 'w')
         f.write("\n".join(files_rel))

Modified: branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/cmake/packaging.cmake	2011-03-19 00:05:30 UTC (rev 35621)
@@ -51,12 +51,6 @@
 
 	# Libraries are bundled directly
 	set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
-
-	# Bundle Properties
-	set(MACOSX_BUNDLE_BUNDLE_NAME blender)
-	set(MACOSX_BUNDLE_BUNDLE_VERSION ${BLENDER_VERSION})
-	set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION})
-	set(MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${BLENDER_VERSION}-r${BUILD_REV}")
 endif(APPLE)
 
 set(CPACK_PACKAGE_EXECUTABLES "blender")

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py	2011-03-19 00:05:30 UTC (rev 35621)
@@ -4,14 +4,15 @@
 LCGDIR = '../lib/freebsd7'
 LIBDIR = "${LCGDIR}"
 
+BF_PYTHON_ABI_FLAGS = ''
 BF_PYTHON = '/usr/local'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_VERSION = '3.2'
 WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
 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'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py	2011-03-19 00:05:30 UTC (rev 35621)
@@ -4,14 +4,15 @@
 LCGDIR = '../lib/freebsd8'
 LIBDIR = "${LCGDIR}"
 
+BF_PYTHON_ABI_FLAGS = ''
 BF_PYTHON = '/usr/local'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_VERSION = '3.2'
 WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
 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'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py	2011-03-19 00:05:30 UTC (rev 35621)
@@ -4,14 +4,15 @@
 LCGDIR = '../lib/freebsd9'
 LIBDIR = "${LCGDIR}"
 
+BF_PYTHON_ABI_FLAGS = ''
 BF_PYTHON = '/usr/local'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_VERSION = '3.2'
 WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
 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'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py	2011-03-19 00:05:30 UTC (rev 35621)
@@ -1,16 +1,16 @@
 LCGDIR = '../lib/linux2'
 LIBDIR = "${LCGDIR}"
 
-BF_PYTHON_ABI_FLAGS = "m"  # not a scons option
+BF_PYTHON_ABI_FLAGS = 'm'  # Most common for linux distros
 BF_PYTHON = '/usr'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_VERSION = '3.2'
 WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS  # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'  # 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/libpython${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS + '.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2011-03-18 23:58:13 UTC (rev 35620)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2011-03-19 00:05:30 UTC (rev 35621)
@@ -488,7 +488,8 @@
     if os.path.isdir(cmd):
         shutil.rmtree(cmd)
     shutil.copytree(sourcedir, cmd)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list