Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index c2b2fc4f869715f87b8b98e39a702376bb2d907e..a64d35e09bd1b010d72c3c183d8ef880d4be6b27 100644 (file)
@@ -30,6 +30,7 @@ set(INC
        ../blenloader
        ../blentranslation
        ../depsgraph
+       ../draw
        ../gpu
        ../ikplugin
        ../imbuf
@@ -81,12 +82,12 @@ set(SRC
        intern/boids.c
        intern/bpath.c
        intern/brush.c
-       intern/bullet.c
        intern/bvhutils.c
        intern/cachefile.c
        intern/camera.c
        intern/cdderivedmesh.c
        intern/cloth.c
+       intern/collection.c
        intern/collision.c
        intern/colorband.c
        intern/colortools.c
@@ -99,13 +100,13 @@ set(SRC
        intern/customdata_file.c
        intern/data_transfer.c
        intern/deform.c
-       intern/depsgraph.c
        intern/displist.c
        intern/dynamicpaint.c
        intern/editderivedmesh.c
        intern/editlattice.c
        intern/editmesh.c
        intern/editmesh_bvh.c
+       intern/editmesh_tangent.c
        intern/effect.c
        intern/fcurve.c
        intern/fluidsim.c
@@ -115,6 +116,7 @@ set(SRC
        intern/gpencil.c
        intern/group.c
        intern/icons.c
+       intern/icons_rasterize.c
        intern/idcode.c
        intern/idprop.c
        intern/idprop_utils.c
@@ -126,6 +128,7 @@ set(SRC
        intern/lattice.c
        intern/library.c
        intern/library_idmap.c
+       intern/library_override.c
        intern/library_query.c
        intern/library_remap.c
        intern/linestyle.c
@@ -139,7 +142,10 @@ set(SRC
        intern/mesh_convert.c
        intern/mesh_evaluate.c
        intern/mesh_mapping.c
+       intern/mesh_merge.c
        intern/mesh_remap.c
+       intern/mesh_runtime.c
+       intern/mesh_tangent.c
        intern/mesh_validate.c
        intern/modifier.c
        intern/modifiers_bmesh.c
@@ -148,6 +154,7 @@ set(SRC
        intern/nla.c
        intern/node.c
        intern/object.c
+       intern/object_facemap.c
        intern/object_deform.c
        intern/object_dupli.c
        intern/object_update.c
@@ -162,10 +169,11 @@ set(SRC
        intern/pbvh.c
        intern/pbvh_bmesh.c
        intern/pointcache.c
-       intern/property.c
+       intern/layer.c
+       intern/layer_utils.c
+       intern/lightprobe.c
        intern/report.c
        intern/rigidbody.c
-       intern/sca.c
        intern/scene.c
        intern/screen.c
        intern/seqcache.c
@@ -173,7 +181,6 @@ set(SRC
        intern/seqmodifier.c
        intern/sequencer.c
        intern/shrinkwrap.c
-       intern/sketch.c
        intern/smoke.c
        intern/softbody.c
        intern/sound.c
@@ -192,6 +199,7 @@ set(SRC
        intern/tracking_util.c
        intern/undo_system.c
        intern/unit.c
+       intern/workspace.c
        intern/world.c
        intern/writeavi.c
        intern/writeframeserver.c
@@ -214,13 +222,13 @@ set(SRC
        BKE_boids.h
        BKE_bpath.h
        BKE_brush.h
-       BKE_bullet.h
        BKE_bvhutils.h
        BKE_cachefile.h
        BKE_camera.h
        BKE_ccg.h
        BKE_cdderivedmesh.h
        BKE_cloth.h
+       BKE_collection.h
        BKE_collision.h
        BKE_colorband.h
        BKE_colortools.h
@@ -232,12 +240,12 @@ set(SRC
        BKE_customdata_file.h
        BKE_data_transfer.h
        BKE_deform.h
-       BKE_depsgraph.h
        BKE_displist.h
        BKE_dynamicpaint.h
        BKE_editlattice.h
        BKE_editmesh.h
        BKE_editmesh_bvh.h
+       BKE_editmesh_tangent.h
        BKE_effect.h
        BKE_fcurve.h
        BKE_fluidsim.h
@@ -256,6 +264,7 @@ set(SRC
        BKE_lattice.h
        BKE_library.h
        BKE_library_idmap.h
+       BKE_library_override.h
        BKE_library_query.h
        BKE_library_remap.h
        BKE_linestyle.h
@@ -267,12 +276,14 @@ set(SRC
        BKE_mesh.h
        BKE_mesh_mapping.h
        BKE_mesh_remap.h
+       BKE_mesh_tangent.h
        BKE_modifier.h
        BKE_movieclip.h
        BKE_multires.h
        BKE_nla.h
        BKE_node.h
        BKE_object.h
+       BKE_object_facemap.h
        BKE_object_deform.h
        BKE_ocean.h
        BKE_outliner_treehash.h
@@ -281,15 +292,14 @@ set(SRC
        BKE_particle.h
        BKE_pbvh.h
        BKE_pointcache.h
-       BKE_property.h
+       BKE_layer.h
+       BKE_lightprobe.h
        BKE_report.h
        BKE_rigidbody.h
-       BKE_sca.h
        BKE_scene.h
        BKE_screen.h
        BKE_sequencer.h
        BKE_shrinkwrap.h
-       BKE_sketch.h
        BKE_smoke.h
        BKE_softbody.h
        BKE_sound.h
@@ -301,11 +311,11 @@ set(SRC
        BKE_tracking.h
        BKE_undo_system.h
        BKE_unit.h
+       BKE_workspace.h
        BKE_world.h
        BKE_writeavi.h
        BKE_writeframeserver.h
 
-       depsgraph_private.h
        nla_private.h
        tracking_private.h
        particle_private.h
@@ -332,7 +342,7 @@ if(WIN32)
 endif()
 
 if(WITH_AUDASPACE)
-       add_definitions(${AUDASPACE_DEFINITIONS})
+       add_definitions(-DWITH_AUDASPACE)
 
        list(APPEND INC_SYS
                ${AUDASPACE_C_INCLUDE_DIRS}
@@ -420,6 +430,10 @@ if(WITH_PYTHON)
        )
        add_definitions(-DWITH_PYTHON)
 
+       if(WITH_PYTHON_SAFETY)
+               add_definitions(-DWITH_PYTHON_SAFETY)
+       endif()
+
        if(WITH_PYTHON_SECURITY)
                add_definitions(-DWITH_PYTHON_SECURITY)
        endif()
@@ -472,18 +486,6 @@ if(WITH_LZMA)
        add_definitions(-DWITH_LZMA)
 endif()
 
-if(WITH_GAMEENGINE)
-       list(APPEND INC_SYS
-               ../../../extern/recastnavigation
-       )
-       list(APPEND SRC
-               intern/navmesh_conversion.c
-               BKE_navmesh_conversion.h
-       )
-
-       add_definitions(-DWITH_GAMEENGINE)
-endif()
-
 if(WITH_LIBMV)
        add_definitions(-DWITH_LIBMV)
 endif()
@@ -536,8 +538,4 @@ endif()
 #      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 #endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-       add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")