[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31989] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 31987.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Sep 18 02:50:13 CEST 2010
Revision: 31989
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31989
Author: kjym3
Date: 2010-09-18 02:50:13 +0200 (Sat, 18 Sep 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 31987.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31987
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/extern/libopenjpeg/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Debug.h
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/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.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/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
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/op/image.py
branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.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_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_exotic.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_unit.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fluidsim.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/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.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/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_color.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/dynlib.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.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/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.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_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.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/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/BIK_api.h
branches/soc-2008-mxcurioni/source/blender/ikplugin/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/ikplugin/SConscript
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/bmp.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filetype.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/iris.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/module.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/targa.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_boid_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.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/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
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.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/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_window.h
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
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_BlenderInputDevice.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/VectorValue.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TimeLogger.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Polygon.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/package_spec/
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install
branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install
branches/soc-2008-mxcurioni/release/scripts/cfg/
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-09-18 00:31:22 UTC (rev 31988)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-09-18 00:50:13 UTC (rev 31989)
@@ -70,6 +70,7 @@
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_IK_ITASC "Enable ITASC IK solver" ON)
OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
@@ -314,7 +315,7 @@
ENDIF(WITH_OPENMP)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
+ SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -363,15 +364,6 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- IF(WITH_PYTHON)
- SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_VERSION 3.1)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
- # SET(PYTHON_BINARY python) # not used yet
- SET(PYTHON_LIB python31)
- SET(PYTHON_LIBPATH ${PYTHON}/lib)
- ENDIF(WITH_PYTHON)
-
IF(WITH_OPENAL)
SET(OPENAL ${LIBDIR}/openal)
SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
@@ -528,6 +520,15 @@
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
# MSVC only, Mingw doesnt need
IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
@@ -539,19 +540,12 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+ SET(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
- SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
+ # Better warnings
+ 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")
- SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
- SET(CMAKE_CXX_FLAGS_RELEASE " -O2" CACHE STRING "Mingw release C++ flags ")
- SET(CMAKE_CXX_FLAGS_MINSIZEREL " -Os" CACHE STRING "Mingw minsize release C++ flags ")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
-
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C flags ")
- SET(CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "Mingw release C flags ")
- SET(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE STRING "Mingw minsize release C flags ")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
ADD_DEFINITIONS(-DFREE_WINDOWS)
IF(WITH_OPENMP)
@@ -615,6 +609,9 @@
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+
+ # TODO, gives linking errors, force off
+ SET(WITH_IMAGE_OPENEXR OFF)
ENDIF(WITH_IMAGE_OPENEXR)
IF(WITH_IMAGE_TIFF)
@@ -634,6 +631,15 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31mw)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
ENDIF(MSVC)
ENDIF(WIN32)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2010-09-18 00:31:22 UTC (rev 31988)
+++ branches/soc-2008-mxcurioni/SConstruct 2010-09-18 00:50:13 UTC (rev 31989)
@@ -492,6 +492,9 @@
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
+ # To ensure empty dirs are created too
+ if len(source)==0:
+ env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
Copied: branches/soc-2008-mxcurioni/build_files/package_spec (from rev 31987, trunk/blender/build_files/package_spec)
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/pacman (from rev 31987, trunk/blender/build_files/package_spec/pacman)
Deleted: branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD 2010-09-18 00:19:53 UTC (rev 31987)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD 2010-09-18 00:50:13 UTC (rev 31989)
@@ -1,48 +0,0 @@
-# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
-
-# custom blender vars
-blender_srcdir=$srcdir/../../../..
-blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_subversion
-
-pkgname=blender-beta
-pkgver=$blender_ver_string
-pkgrel=1
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-url="www.blender.org"
-license=('GPL')
-groups=()
-depends=('libjpeg' 'libpng' 'openexr' 'python3>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake' 'svn')
-optdepends=()
-provides=('blender')
-conflicts=('blender')
-replaces=()
-backup=()
-options=()
-install=blender.install
-# use current svn to make the package.
-# source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-# md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
-source=()
-md5sums=()
-noextract=()
-
-build() {
- mkdir -p $srcdir/build
- cd $srcdir/build
- cmake $blender_srcdir \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DWITH_PYTHON_INSTALL:BOOL=OFF \
- -DWITH_OPENCOLLADA:BOOL=OFF
-
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR="$pkgdir" install
-}
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD (from rev 31987, trunk/blender/build_files/package_spec/pacman/PKGBUILD)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD 2010-09-18 00:50:13 UTC (rev 31989)
@@ -0,0 +1,48 @@
+# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
+
+# custom blender vars
+blender_srcdir=$srcdir/../../../..
+blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_subversion
+
+pkgname=blender-beta
+pkgver=$blender_ver_string
+pkgrel=1
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+url="www.blender.org"
+license=('GPL')
+groups=()
+depends=('libjpeg' 'libpng' 'openexr' 'python3>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg')
+makedepends=('cmake' 'svn')
+optdepends=()
+provides=('blender')
+conflicts=('blender')
+replaces=()
+backup=()
+options=()
+install=blender.install
+# use current svn to make the package.
+# source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+# md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
+source=()
+md5sums=()
+noextract=()
+
+build() {
+ mkdir -p $srcdir/build
+ cd $srcdir/build
+ cmake $blender_srcdir \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DWITH_PYTHON_INSTALL:BOOL=OFF \
+ -DWITH_OPENCOLLADA:BOOL=OFF
+
+ make
+}
+
+package() {
+ cd $srcdir/build
+ make DESTDIR="$pkgdir" install
+}
Deleted: branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install
===================================================================
--- trunk/blender/build_files/package_spec/pacman/blender.install 2010-09-18 00:19:53 UTC (rev 31987)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install 2010-09-18 00:50:13 UTC (rev 31989)
@@ -1,29 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-Happy blending!
-
-EOF
- echo "update desktop mime database..."
- update-desktop-database
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- /bin/true
-}
-
-post_remove() {
- echo "update desktop mime database..."
- update-desktop-database
-}
-
-op=$1
-shift
-
-$op $*
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install (from rev 31987, trunk/blender/build_files/package_spec/pacman/blender.install)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install 2010-09-18 00:50:13 UTC (rev 31989)
@@ -0,0 +1,29 @@
+post_install() {
+ cat << EOF
+
+NOTE
+----
+Happy blending!
+
+EOF
+ echo "update desktop mime database..."
+ update-desktop-database
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ /bin/true
+}
+
+post_remove() {
+ echo "update desktop mime database..."
+ update-desktop-database
+}
+
+op=$1
+shift
+
+$op $*
Modified: branches/soc-2008-mxcurioni/extern/libopenjpeg/CMakeLists.txt
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list