merge with/from trunk at r35190

1 files changed, 262 insertions, 68 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index b196ddc8509..dc485f5dc5f 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -24,94 +24,288 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-FILE(GLOB SRC intern/*.c)
-
-SET(INC 
-	. ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna ../modifiers
-	../render/extern/include ../../../intern/decimation/extern
-	../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
-	../../../intern/iksolver/extern ../blenloader ../ikplugin ../bmesh
-	../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
-	../../../intern/bsp/extern ../blenfont
+set(INC 
+	.
+	../avi
+	../blenlib
+	../blenloader
+	../gpu
+	../ikplugin
+	../imbuf
+	../makesdna
+	../makesrna
+	../bmesh
+	../modifiers
+	../nodes
+	../editors/include
+	../render/extern/include
+	../../../extern/glew/include
 	../../../intern/audaspace/intern
+	../../../intern/bsp/extern ../blenfont
+	../../../intern/decimation/extern
+	../../../intern/elbeem/extern
+	../../../intern/guardedalloc
+	../../../intern/iksolver/extern
+	../../../intern/memutil
+	../../../intern/opennl/extern
+	../../../intern/smoke/extern
+	../../../intern/mikktspace
     ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
-	${ZLIB_INC}
+	${ZLIB_INCLUDE_DIRS}
 )
 
+set(SRC
+	intern/BME_Customdata.c
+	intern/BME_conversions.c
+	intern/BME_eulers.c
+	intern/BME_mesh.c
+	intern/BME_structure.c
+	intern/BME_tools.c
+	intern/CCGSubSurf.c
+	intern/DerivedMesh.c
+	intern/action.c
+	intern/anim.c
+	intern/anim_sys.c
+	intern/armature.c
+	intern/blender.c
+	intern/bmfont.c
+	intern/boids.c
+	intern/booleanops_mesh.c
+	intern/brush.c
+	intern/bullet.c
+	intern/bvhutils.c
+	intern/cdderivedmesh.c
+	intern/cloth.c
+	intern/collision.c
+	intern/colortools.c
+	intern/constraint.c
+	intern/context.c
+	intern/curve.c
+	intern/customdata.c
+	intern/customdata_file.c
+	intern/deform.c
+	intern/depsgraph.c
+	intern/displist.c
+	intern/effect.c
+	intern/editderivedbmesh.c
+	intern/exotic.c
+	intern/fcurve.c
+	intern/fluidsim.c
+	intern/fmodifier.c
+	intern/font.c
+	intern/gpencil.c
+	intern/group.c
+	intern/icons.c
+	intern/idcode.c
+	intern/idprop.c
+	intern/image.c
+	intern/image_gen.c
+	intern/implicit.c
+	intern/ipo.c
+	intern/key.c
+	intern/lattice.c
+	intern/library.c
+	intern/material.c
+	intern/mball.c
+	intern/mesh.c
+	intern/mesh_validate.c
+	intern/modifier.c
+	intern/modifiers_bmesh.c
+	intern/multires.c
+	intern/nla.c
+	intern/node.c
+	intern/object.c
+	intern/packedFile.c
+	intern/paint.c
+	intern/particle.c
+	intern/particle_system.c
+	intern/pointcache.c
+	intern/property.c
+	intern/report.c
+	intern/sca.c
+	intern/scene.c
+	intern/screen.c
+	intern/script.c
+	intern/seqcache.c
+	intern/seqeffects.c
+	intern/sequencer.c
+	intern/shrinkwrap.c
+	intern/sketch.c
+	intern/smoke.c
+	intern/softbody.c
+	intern/sound.c
+	intern/subsurf_ccg.c
+	intern/suggestions.c
+	intern/text.c
+	intern/texture.c
+	intern/unit.c
+	intern/world.c
+	intern/writeavi.c
+	intern/writeffmpeg.c
+	intern/writeframeserver.c
+
+	BKE_DerivedMesh.h
+	BKE_action.h
+	BKE_anim.h
+	BKE_animsys.h
+	BKE_armature.h
+	BKE_array_mallocn.h
+	BKE_blender.h
+	BKE_bmesh.h
+	BKE_bmeshCustomData.h
+	BKE_bmfont.h
+	BKE_bmfont_types.h
+	BKE_boids.h
+	BKE_booleanops_mesh.h
+	BKE_brush.h
+	BKE_bullet.h
+	BKE_bvhutils.h
+	BKE_cdderivedmesh.h
+	BKE_cloth.h
+	BKE_collision.h
+	BKE_colortools.h
+	BKE_constraint.h
+	BKE_context.h
+	BKE_curve.h
+	BKE_customdata.h
+	BKE_customdata_file.h
+	BKE_deform.h
+	BKE_depsgraph.h
+	BKE_displist.h
+	BKE_effect.h
+	BKE_endian.h
+	BKE_exotic.h
+	BKE_fcurve.h
+	BKE_fluidsim.h
+	BKE_font.h
+	BKE_global.h
+	BKE_gpencil.h
+	BKE_group.h
+	BKE_icons.h
+	BKE_idcode.h
+	BKE_idprop.h
+	BKE_image.h
+	BKE_ipo.h
+	BKE_key.h
+	BKE_lattice.h
+	BKE_library.h
+	BKE_main.h
+	BKE_material.h
+	BKE_mball.h
+	BKE_mesh.h
+	BKE_modifier.h
+	BKE_multires.h
+	BKE_nla.h
+	BKE_node.h
+	BKE_object.h
+	BKE_packedFile.h
+	BKE_paint.h
+	BKE_particle.h
+	BKE_plugin_types.h
+	BKE_pointcache.h
+	BKE_property.h
+	BKE_report.h
+	BKE_sca.h
+	BKE_scene.h
+	BKE_screen.h
+	BKE_script.h
+	BKE_sequencer.h
+	BKE_shrinkwrap.h
+	BKE_sketch.h
+	BKE_smoke.h
+	BKE_softbody.h
+	BKE_sound.h
+	BKE_subsurf.h
+	BKE_suggestions.h
+	BKE_text.h
+	BKE_texture.h
+	BKE_unit.h
+	BKE_utildefines.h
+	BKE_world.h
+	BKE_writeavi.h
+	BKE_writeffmpeg.h
+	BKE_writeframeserver.h
+	depsgraph_private.h
+	intern/CCGSubSurf.h
+	intern/bmesh_private.h
+	nla_private.h
+)
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+add_definitions(-DGLEW_STATIC)
 
-IF(WITH_BULLET)
-	SET(INC ${INC} ../../../extern/bullet2/src)
-	ADD_DEFINITIONS(-DUSE_BULLET)
-ENDIF(WITH_BULLET)
+if(WITH_BULLET)
+	list(APPEND INC ../../../extern/bullet2/src)
+	add_definitions(-DUSE_BULLET)
+endif()
 
-IF(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+if(WITH_IMAGE_OPENEXR)
+	add_definitions(-DWITH_OPENEXR)
+endif()
 
-IF(WITH_IMAGE_TIFF)
-	ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_IMAGE_TIFF)
+if(WITH_IMAGE_TIFF)
+	add_definitions(-DWITH_TIFF)
+endif()
 
-IF(WITH_IMAGE_OPENJPEG)
-	ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG)
+	add_definitions(-DWITH_OPENJPEG)
+endif()
 
-IF(WITH_IMAGE_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
-ENDIF(WITH_IMAGE_DDS)
+if(WITH_IMAGE_DDS)
+	add_definitions(-DWITH_DDS)
+endif()
 
-IF(WITH_IMAGE_CINEON)
-	ADD_DEFINITIONS(-DWITH_CINEON)
-ENDIF(WITH_IMAGE_CINEON)
+if(WITH_IMAGE_CINEON)
+	add_definitions(-DWITH_CINEON)
+endif()
 
-IF(WITH_IMAGE_HDR)
-	ADD_DEFINITIONS(-DWITH_HDR)
-ENDIF(WITH_IMAGE_HDR)
+if(WITH_IMAGE_HDR)
+	add_definitions(-DWITH_HDR)
+endif()
 
-IF(WITH_QUICKTIME)
-	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
+	list(APPEND INC ../quicktime ${QUICKTIME_INC})
+	add_definitions(-DWITH_QUICKTIME)
+endif()
 
-IF(WITH_FFMPEG)
-	SET(INC ${INC} ${FFMPEG_INC})
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
+if(WITH_CODEC_FFMPEG)
+	list(APPEND INC ${FFMPEG_INC})
+	add_definitions(-DWITH_FFMPEG)
+endif()
 
-IF(WITH_LCMS)
-	SET(INC ${INC} ${LCMS_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DWITH_LCMS)
-ENDIF(WITH_LCMS)
+if(WITH_LCMS)
+	list(APPEND INC ${LCMS_INCLUDE_DIR})
+	add_definitions(-DWITH_LCMS)
+endif()
 
-IF(WITH_PYTHON)
-	SET(INC ${INC} ../python ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-	ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
+if(WITH_PYTHON)
+	list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS})
+	add_definitions(-DWITH_PYTHON)
+endif()
 
-IF(WITH_OPENMP)
-		ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
+if(WITH_OPENMP)
+	add_definitions(-DPARALLEL=1)
+endif()
 
-IF(NOT WITH_FLUID)
-	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+if(NOT WITH_MOD_FLUID)
+	add_definitions(-DDISABLE_ELBEEM)
+endif()
 
-IF(WITH_LZO)
-	SET(INC ${INC} ../../../extern/lzo/minilzo)
-	ADD_DEFINITIONS(-DWITH_LZO)
-ENDIF(WITH_LZO)
+if(WITH_JACK)
+	add_definitions(-DWITH_JACK)
+endif()
 
-IF(WITH_LZMA)
-	SET(INC ${INC} ../../../extern/lzma)
-	ADD_DEFINITIONS(-DWITH_LZMA)
-ENDIF(WITH_LZMA)
+if(WITH_LZO)
+	list(APPEND INC ../../../extern/lzo/minilzo)
+	add_definitions(-DWITH_LZO)
+endif()
 
-IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
+if(WITH_LZMA)
+	list(APPEND INC ../../../extern/lzma)
+	add_definitions(-DWITH_LZMA)
+endif()
 
-BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
+if(MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+endif()
 
+blender_add_lib(bf_blenkernel "${SRC}" "${INC}")