Revision: 28993
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28993
Author: leifandersen
Date: 2010-05-26 04:00:55 +0200 (Wed, 26 May 2010)
Log Message:
-----------
1. Merged with trunk, using this command.
svn merge -r 28768:28992
https://svn.blender.org/svnroot/bf-blender/trunk/blender/ .
2. Tested a bit more with CTest after realizing that all of the tests were
passing, even if they should fail.
3. Grately improved the bpy.data.scenes unit tests, still only a small
percentage of code coverage, but it's better.
4. Thanks to elube's patch, gtest tests are now linking properly with blender
using ctest. Although not all API calls are working on all platforms. But the
code is compiling.
I think that's all. Also, this project's webpage is now at:
http://wiki.blender.org/index.php/User:LeifAndersen/GSoC2010
Modified Paths:
--------------
branches/soc-2010-leifandersen/CMake/macros.cmake
branches/soc-2010-leifandersen/CMakeLists.txt
branches/soc-2010-leifandersen/SConstruct
branches/soc-2010-leifandersen/config/darwin-config.py
branches/soc-2010-leifandersen/config/linux2-config.py
branches/soc-2010-leifandersen/config/linuxcross-config.py
branches/soc-2010-leifandersen/config/win32-mingw-config.py
branches/soc-2010-leifandersen/config/win32-vc-config.py
branches/soc-2010-leifandersen/config/win64-vc-config.py
branches/soc-2010-leifandersen/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2010-leifandersen/intern/ghost/CMakeLists.txt
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-leifandersen/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2010-leifandersen/release/scripts/io/engine_render_pov.py
branches/soc-2010-leifandersen/release/scripts/io/export_fbx.py
branches/soc-2010-leifandersen/release/scripts/io/import_anim_bvh.py
branches/soc-2010-leifandersen/release/scripts/io/import_shape_mdd.py
branches/soc-2010-leifandersen/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/utils.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy_types.py
branches/soc-2010-leifandersen/release/scripts/modules/rna_info.py
branches/soc-2010-leifandersen/release/scripts/op/add_mesh_torus.py
branches/soc-2010-leifandersen/release/scripts/op/object.py
branches/soc-2010-leifandersen/release/scripts/op/sequencer.py
branches/soc-2010-leifandersen/release/scripts/op/uv.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_animviz.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_bone.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_camera.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_curve.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_empty.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_game.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_material.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_particle.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_common.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_field.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_render.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_scene.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_texture.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_world.py
branches/soc-2010-leifandersen/release/scripts/ui/space_image.py
branches/soc-2010-leifandersen/release/scripts/ui/space_info.py
branches/soc-2010-leifandersen/release/scripts/ui/space_logic.py
branches/soc-2010-leifandersen/release/scripts/ui/space_sequencer.py
branches/soc-2010-leifandersen/release/scripts/ui/space_text.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d.py
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_global.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2010-leifandersen/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/blenkernel/SConscript
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/Makefile
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/anim.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/armature.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/blender.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/collision.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/multires.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_args.h
branches/soc-2010-leifandersen/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/bpath.c
branches/soc-2010-leifandersen/source/blender/blenloader/BLO_writefile.h
branches/soc-2010-leifandersen/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/readfile.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/writefile.c
branches/soc-2010-leifandersen/source/blender/editors/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-leifandersen/source/blender/editors/animation/anim_filter.c
branches/soc-2010-leifandersen/source/blender/editors/armature/poselib.c
branches/soc-2010-leifandersen/source/blender/editors/curve/curve_intern.h
branches/soc-2010-leifandersen/source/blender/editors/curve/curve_ops.c
branches/soc-2010-leifandersen/source/blender/editors/curve/editcurve.c
branches/soc-2010-leifandersen/source/blender/editors/include/ED_anim_api.h
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_layout.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_regions.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_templates.c
branches/soc-2010-leifandersen/source/blender/editors/interface/resources.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_add.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_constraint.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_edit.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_intern.h
branches/soc-2010-leifandersen/source/blender/editors/object/object_modifier.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_ops.c
branches/soc-2010-leifandersen/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_internal.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_opengl.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_action/action_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_action/action_select.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/Makefile
branches/soc-2010-leifandersen/source/blender/editors/space_file/SConscript
branches/soc-2010-leifandersen/source/blender/editors/space_file/filelist.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/writeimage.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-leifandersen/source/blender/editors/space_image/Makefile
branches/soc-2010-leifandersen/source/blender/editors/space_image/SConscript
branches/soc-2010-leifandersen/source/blender/editors/space_image/image_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-leifandersen/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_text/space_text.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_generics.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-leifandersen/source/blender/gpu/GPU_draw.h
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-leifandersen/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/imbuf/IMB_thumbs.h
branches/soc-2010-leifandersen/source/blender/imbuf/SConscript
branches/soc-2010-leifandersen/source/blender/imbuf/intern/Makefile
branches/soc-2010-leifandersen/source/blender/imbuf/intern/anim.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/filetype.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/jp2.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-leifandersen/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/tiff.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/util.c
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-leifandersen/source/blender/makesrna/RNA_types.h
branches/soc-2010-leifandersen/source/blender/makesrna/SConscript
branches/soc-2010-leifandersen/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/makesrna/intern/Makefile
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-leifandersen/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-leifandersen/source/blender/python/generic/bgl.c
branches/soc-2010-leifandersen/source/blender/python/generic/blf_api.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_color.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_app.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_driver.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/pipeline.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/rendercore.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/texture.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
branches/soc-2010-leifandersen/source/creator/Makefile
branches/soc-2010-leifandersen/source/creator/SConscript
branches/soc-2010-leifandersen/source/creator/creator.c
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2010-leifandersen/source/gameengine/Expressions/ListValue.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-leifandersen/source/nan_definitions.mk
branches/soc-2010-leifandersen/source/nan_link.mk
branches/soc-2010-leifandersen/tests/CMakeLists.txt
branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt
branches/soc-2010-leifandersen/tests/gtest/secondtest.c
branches/soc-2010-leifandersen/tests/pyunit/CMakeLists.txt
branches/soc-2010-leifandersen/tests/pyunit/data/CMakeLists.txt
branches/soc-2010-leifandersen/tests/pyunit/data/scenes.py
branches/soc-2010-leifandersen/tools/Blender.py
branches/soc-2010-leifandersen/tools/btools.py
branches/soc-2010-leifandersen/tools/crossmingw.py
Added Paths:
-----------
branches/soc-2010-leifandersen/release/scripts/modules/add_object_utils.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-leifandersen/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2010-leifandersen/source/gameengine/PyDoc/bge.events.rst
branches/soc-2010-leifandersen/source/gameengine/PyDoc/bge.logic.rst
branches/soc-2010-leifandersen/source/gameengine/PyDoc/bge.render.rst
branches/soc-2010-leifandersen/source/gameengine/PyDoc/bge.types.rst
Removed Paths:
-------------
branches/soc-2010-leifandersen/source/blender/imbuf/intern/dynlibtiff.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/dynlibtiff.h
branches/soc-2010-leifandersen/source/gameengine/PyDoc/GameKeys.py
branches/soc-2010-leifandersen/source/gameengine/PyDoc/GameLogic.py
branches/soc-2010-leifandersen/source/gameengine/PyDoc/GameTypes.py
branches/soc-2010-leifandersen/source/gameengine/PyDoc/Rasterizer.py
Property Changed:
----------------
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/layout.html
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/page.html
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/static/bg.png
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/static/pygments.css
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/static/rnd.png
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/static/rndbl.png
branches/soc-2010-leifandersen/source/blender/python/doc/blender-org/static/rndbr.png
Modified: branches/soc-2010-leifandersen/CMake/macros.cmake
===================================================================
--- branches/soc-2010-leifandersen/CMake/macros.cmake 2010-05-26 00:55:35 UTC
(rev 28992)
+++ branches/soc-2010-leifandersen/CMake/macros.cmake 2010-05-26 02:00:55 UTC
(rev 28993)
@@ -61,6 +61,9 @@
IF(WITH_OPENEXR)
LINK_DIRECTORIES(${OPENEXR_LIBPATH})
ENDIF(WITH_OPENEXR)
+ IF(WITH_TIFF)
+ LINK_DIRECTORIES(${TIFF_LIBPATH})
+ ENDIF(WITH_TIFF)
IF(WITH_QUICKTIME)
LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
ENDIF(WITH_QUICKTIME)
@@ -134,6 +137,9 @@
IF(WITH_QUICKTIME)
TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
ENDIF(WITH_QUICKTIME)
+ IF(WITH_TIFF)
+ TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
+ ENDIF(WITH_TIFF)
IF(WITH_OPENEXR)
IF(WIN32)
FOREACH(loop_var ${OPENEXR_LIB})
Modified: branches/soc-2010-leifandersen/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/CMakeLists.txt 2010-05-26 00:55:35 UTC
(rev 28992)
+++ branches/soc-2010-leifandersen/CMakeLists.txt 2010-05-26 02:00:55 UTC
(rev 28993)
@@ -63,6 +63,7 @@
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_TIFF "Enable LibTIFF Support" ON)
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
@@ -124,11 +125,9 @@
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
- IF(OPENAL_FOUND)
- SET(WITH_OPENAL ON)
- ELSE(OPENAL_FOUND)
+ IF(NOT OPENAL_FOUND)
SET(WITH_OPENAL OFF)
- ENDIF(OPENAL_FOUND)
+ ENDIF(NOT OPENAL_FOUND)
ENDIF(WITH_OPENAL)
IF(WITH_JACK)
@@ -185,11 +184,11 @@
ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL)
- SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+ SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
FIND_PATH(OPENEXR_INC
ImfXdr.h
PATHS
- ${OPENEXR}/include/OpenEXR
+ ${OPENEXR}/include/OpenEXR
/usr/local/include/OpenEXR
/sw/include/OpenEXR
/opt/local/include/OpenEXR
@@ -215,6 +214,13 @@
SET(LIBSAMPLERATE_LIB samplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ IF(WITH_TIFF)
+ FIND_PACKAGE(TIFF)
+ IF(NOT TIFF_FOUND)
+ SET(WITH_TIFF OFF)
+ ENDIF(NOT TIFF_FOUND)
+ ENDIF(WITH_TIFF)
+
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
@@ -409,7 +415,9 @@
SET(JPEG_LIBPATH ${JPEG}/lib)
SET(TIFF ${LIBDIR}/tiff)
- SET(TIFF_INC ${TIFF}/include)
+ SET(TIFF_INCLUDE_DIR ${TIFF}/include)
+ SET(TIFF_LIBRARY tiff)
+ SET(TIFF_LIBPATH ${TIFF}/lib)
SET(WINTAB_INC ${LIBDIR}/wintab/include)
@@ -478,7 +486,7 @@
# SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") #
not used yet
SET(PYTHON_LIB python${PYTHON_VERSION})
SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
- # SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build
with this enabled
+ # SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with
this enabled
ELSE(PYTHON_VERSION MATCHES 3.1)
# otherwise, use custom system framework
@@ -585,7 +593,9 @@
SET(JPEG_LIBPATH ${JPEG}/lib)
SET(TIFF ${LIBDIR}/tiff)
- SET(TIFF_INC ${TIFF}/include)
+ SET(TIFF_INCLUDE_DIR ${TIFF}/include)
+ SET(TIFF_LIBRARY tiff)
+ SET(TIFF_LIBPATH ${TIFF}/lib)
SET(EXETYPE MACOSX_BUNDLE)
Modified: branches/soc-2010-leifandersen/SConstruct
===================================================================
--- branches/soc-2010-leifandersen/SConstruct 2010-05-26 00:55:35 UTC (rev
28992)
+++ branches/soc-2010-leifandersen/SConstruct 2010-05-26 02:00:55 UTC (rev
28993)
@@ -182,7 +182,7 @@
else:
print B.bc.WARNING + userconfig + " not found, no user overrides" +
B.bc.ENDC
-opts = btools.read_opts(optfiles, B.arguments)
+opts = btools.read_opts(env, optfiles, B.arguments)
opts.Update(env)
if not env['BF_FANCY']:
@@ -572,7 +572,9 @@
dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
'${BF_ZLIB_LIBPATH}/zlib.dll']
- dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
+ # Used when linking to libtiff was dynamic
+ # keep it here until compilation on all platform would be ok
+ # dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
if env['OURPLATFORM'] != 'linuxcross':
# pthreads library is already added
Modified: branches/soc-2010-leifandersen/config/darwin-config.py
===================================================================
--- branches/soc-2010-leifandersen/config/darwin-config.py 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/config/darwin-config.py 2010-05-26
02:00:55 UTC (rev 28993)
@@ -163,8 +163,11 @@
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
WITH_BF_ZLIB = True
BF_ZLIB = '/usr'
Modified: branches/soc-2010-leifandersen/config/linux2-config.py
===================================================================
--- branches/soc-2010-leifandersen/config/linux2-config.py 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/config/linux2-config.py 2010-05-26
02:00:55 UTC (rev 28993)
@@ -68,8 +68,10 @@
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
+WITH_BF_TIFF = True
BF_TIFF = '/usr'
BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
WITH_BF_ZLIB = True
BF_ZLIB = '/usr'
Modified: branches/soc-2010-leifandersen/config/linuxcross-config.py
===================================================================
--- branches/soc-2010-leifandersen/config/linuxcross-config.py 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/config/linuxcross-config.py 2010-05-26
02:00:55 UTC (rev 28993)
@@ -75,9 +75,9 @@
BF_PNG_LIBPATH = '${BF_PNG}/lib'
WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF = LIBDIR + '/gcc/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIB = 'tiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
WITH_BF_ZLIB = True
@@ -174,9 +174,6 @@
WITH_BF_RAYOPTIMIZATION = False
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
-CC = 'i586-mingw32msvc-gcc'
-CXX = 'i586-mingw32msvc-g++'
-
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS']
Modified: branches/soc-2010-leifandersen/config/win32-mingw-config.py
===================================================================
--- branches/soc-2010-leifandersen/config/win32-mingw-config.py 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/config/win32-mingw-config.py 2010-05-26
02:00:55 UTC (rev 28993)
@@ -73,9 +73,10 @@
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
-BF_TIFF = LIBDIR + '/tiff'
+WITH_BF_TIFF = True
+BF_TIFF = LIBDIR + '/gcc/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIB = 'tiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
WITH_BF_ZLIB = True
Modified: branches/soc-2010-leifandersen/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-leifandersen/config/win32-vc-config.py 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/config/win32-vc-config.py 2010-05-26
02:00:55 UTC (rev 28993)
@@ -79,6 +79,7 @@
BF_PNG_LIB = 'libpng_st'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff'
Modified: branches/soc-2010-leifandersen/config/win64-vc-config.py
===================================================================
--- branches/soc-2010-leifandersen/config/win64-vc-config.py 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/config/win64-vc-config.py 2010-05-26
02:00:55 UTC (rev 28993)
@@ -75,6 +75,7 @@
BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff'
Modified:
branches/soc-2010-leifandersen/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
===================================================================
---
branches/soc-2010-leifandersen/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
2010-05-26 00:55:35 UTC (rev 28992)
+++
branches/soc-2010-leifandersen/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
2010-05-26 02:00:55 UTC (rev 28993)
@@ -23,6 +23,9 @@
* ***** END LGPL LICENSE BLOCK *****
*/
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+
#include "AUD_FFMPEGFactory.h"
#include "AUD_FFMPEGReader.h"
#include "AUD_Buffer.h"
Modified: branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_C-API.cpp
2010-05-26 00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_C-API.cpp
2010-05-26 02:00:55 UTC (rev 28993)
@@ -27,6 +27,11 @@
#include <cstring>
#include <cmath>
+#ifdef WITH_FFMPEG
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+#endif
+
#include "AUD_NULLDevice.h"
#include "AUD_I3DDevice.h"
#include "AUD_FileFactory.h"
@@ -62,6 +67,7 @@
#include "AUD_JackDevice.h"
#endif
+
#ifdef WITH_FFMPEG
extern "C" {
#include <libavformat/avformat.h>
Modified:
branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_FileFactory.cpp
===================================================================
--- branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_FileFactory.cpp
2010-05-26 00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_FileFactory.cpp
2010-05-26 02:00:55 UTC (rev 28993)
@@ -29,6 +29,9 @@
#include <cstring>
#ifdef WITH_FFMPEG
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+
#include "AUD_FFMPEGReader.h"
#endif
#ifdef WITH_SNDFILE
Modified: branches/soc-2010-leifandersen/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/intern/ghost/CMakeLists.txt 2010-05-26
00:55:35 UTC (rev 28992)
+++ branches/soc-2010-leifandersen/intern/ghost/CMakeLists.txt 2010-05-26
02:00:55 UTC (rev 28993)
@@ -24,57 +24,67 @@
#
# ***** END GPL LICENSE BLOCK *****
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
