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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Oct 10 00:30:01 CEST 2010


Revision: 32391
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32391
Author:   kjym3
Date:     2010-10-10 00:30:01 +0200 (Sun, 10 Oct 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 32390.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32390

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
    branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-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/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ModifierKeys.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ModifierKeys.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/EventToBuf.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/SConscript
    branches/soc-2008-mxcurioni/intern/guardedalloc/cpp/mallocn.cpp
    branches/soc-2008-mxcurioni/intern/string/SConscript
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/operators.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/ops.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/export_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/op/presets.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.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_image.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fileops.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.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/DocumentExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.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/poselib.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    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/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Network/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/bge.events.rst
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/bge.types.rst
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SConscript

Added Paths:
-----------
    branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/CameraExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/CameraExporter.h
    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/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.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/InstanceWriter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/InstanceWriter.h
    branches/soc-2008-mxcurioni/source/blender/collada/LightExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/LightExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/SkinInfo.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/SkinInfo.h
    branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.h
    branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/release/scripts/presets/interaction/maya.py

Property Changed:
----------------
    branches/soc-2008-mxcurioni/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Name: svn:ignore
   - *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk

   + *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b


Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-10-09 21:31:32 UTC (rev 32390)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-10-09 22:30:01 UTC (rev 32391)
@@ -297,6 +297,7 @@
 
 	FIND_PACKAGE(X11 REQUIRED)
 
+	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
 
 	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -477,13 +478,15 @@
 			SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
 			SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
-			#pcre is bundled with openCollada
-			#SET(PCRE ${LIBDIR}/pcre)
-			#SET(PCRE_LIBPATH ${PCRE}/lib)
 			SET(PCRE_LIB pcre)
 		ENDIF(WITH_OPENCOLLADA)
 		
-		# TODO: IF(WITH_LCMS)
+		IF(WITH_LCMS)
+			SET(LCMS ${LIBDIR}/lcms)
+			SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+			SET(LCMS_LIBPATH ${LCMS}/lib)
+			SET(LCMS_LIB lcms)
+		ENDIF(WITH_LCMS)
         
 		IF(WITH_FFMPEG)
 			SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -547,7 +550,21 @@
 		SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
 		ADD_DEFINITIONS(-DFREE_WINDOWS)
-		
+
+		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+
+
+		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+
+		SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
+
+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+
+
 		IF(WITH_OPENMP)
 			SET(LLIBS "${LLIBS} -lgomp")
 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
@@ -591,9 +608,6 @@
 			SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
-			#pcre is bundled with openCollada
-			#SET(PCRE ${LIBDIR}/pcre)
-			#SET(PCRE_LIBPATH ${PCRE}/lib)
 			SET(PCRE_LIB pcre)
 		ENDIF(WITH_OPENCOLLADA)
 		

Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake	2010-10-09 21:31:32 UTC (rev 32390)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake	2010-10-09 22:30:01 UTC (rev 32391)
@@ -172,11 +172,17 @@
 				TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
 			ENDIF(EXPAT_LIB)
 		ELSE(WIN32)
-		TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+			TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
 			TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
 			TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
 		ENDIF(WIN32)
 	ENDIF(WITH_OPENCOLLADA)
+	IF(WITH_LCMS)
+		IF(WIN32)
+			TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d)
+			TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB})
+		ENDIF(WIN32)
+	ENDIF(WITH_LCMS)
 	IF(WIN32)
 		TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
 	ENDIF(WIN32)

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py	2010-10-09 21:31:32 UTC (rev 32390)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py	2010-10-09 22:30:01 UTC (rev 32391)
@@ -23,9 +23,11 @@
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
 BF_LIBSAMPLERATE = '/usr'
+WITH_BF_STATICLIBSAMPLERATE = False
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
 BF_LIBSAMPLERATE_LIB = 'samplerate'
 BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+BF_LIBSAMPLERATE_LIB_STATIC = '${BF_LIBSAMPLERATE}/lib/libsamplerate.a'
 
 WITH_BF_JACK = False
 BF_JACK = '/usr'
@@ -34,10 +36,12 @@
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
 WITH_BF_SNDFILE = False
+WITH_BF_STATICSNDFILE = False
 BF_SNDFILE = '/usr'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
 BF_SNDFILE_LIB = 'sndfile'
 BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
 
 WITH_BF_SDL = True
 BF_SDL = '/usr' #$(shell sdl-config --prefix)
@@ -136,10 +140,12 @@
 BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
 WITH_BF_FFTW3 = False
-BF_FFTW3 = LIBDIR + '/usr'
+WITH_BF_STATICFFTW3 = False
+BF_FFTW3 = '/usr'
 BF_FFTW3_INC = '${BF_FFTW3}/include'
 BF_FFTW3_LIB = 'fftw3'
 BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a'
 
 WITH_BF_REDCODE = False  
 BF_REDCODE = '#extern/libredcode'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2010-10-09 21:31:32 UTC (rev 32390)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2010-10-09 22:30:01 UTC (rev 32391)
@@ -149,6 +149,12 @@
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
+WITH_BF_LCMS = True
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
@@ -188,7 +194,6 @@
 # BF_PROFILE_LINKFLAGS = ['-pg']
 # BF_PROFILE = False
 
-#turn off makebsc by default ( as 64 bit version does ) .. takes ages to build .. for nothing ( well some M$ addicts may disagree )
 BF_BSC=False
 
 BF_BUILDDIR = '..\\build\\win32-vc'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2010-10-09 21:31:32 UTC (rev 32390)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2010-10-09 22:30:01 UTC (rev 32391)
@@ -107,23 +107,6 @@
 
 WITH_BF_BINRELOC = False
 
-#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_WITH_FREETYPE = True
 BF_FREETYPE = LIBDIR + '/freetype'
@@ -162,6 +145,12 @@
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
+WITH_BF_LCMS = True
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
@@ -194,9 +183,6 @@
 
 LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
-BF_DEBUG=False
-BF_BSC=False
-
 if BF_DEBUG:
 	BF_NUMJOBS=1
 else:
@@ -207,10 +193,3 @@
 BF_BUILDDIR = '..\\build\\blender25-win64-vc'
 BF_INSTALLDIR='..\\install\\blender25-win64-vc'
 
-
-
-######################### MERGE WITH ABOVE ################################
-
-
-
-

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2010-10-09 21:31:32 UTC (rev 32390)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2010-10-09 22:30:01 UTC (rev 32391)
@@ -158,6 +158,8 @@
         statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
     if lenv['WITH_BF_FFTW3']:
         libincs += Split(lenv['BF_FFTW3_LIBPATH'])
+        if lenv['WITH_BF_STATICFFTW3']:
+            statlibs += Split(lenv['BF_FFTW3_LIB_STATIC'])
     if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
         statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC'])
     if lenv['WITH_BF_INTERNATIONAL']:
@@ -178,6 +180,9 @@
     if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']:
         statlibs += Split(lenv['BF_PYTHON_LIB_STATIC'])
 
+    if lenv['WITH_BF_SNDFILE'] and lenv['WITH_BF_STATICSNDFILE']:
+        statlibs += Split(lenv['BF_SNDFILE_LIB_STATIC'])
+
     if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
         libincs += Split(lenv['BF_PTHREADS_LIBPATH'])
 
@@ -191,6 +196,9 @@
         if lenv['OURPLATFORM'] == 'linuxcross':
             libincs += Split(lenv['BF_OPENMP_LIBPATH'])
 
+    if lenv['WITH_BF_STATICLIBSAMPLERATE']:
+        statlibs += Split(lenv['BF_LIBSAMPLERATE_LIB_STATIC'])
+
     # setting this last so any overriding of manually libs could be handled

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list