diff options
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 108 |
1 files changed, 69 insertions, 39 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 45f2ac083dd..00b64379647 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -30,6 +30,7 @@ set(INC ../blenloader ../blentranslation ../depsgraph + ../draw ../gpu ../ikplugin ../imbuf @@ -37,6 +38,8 @@ set(INC ../makesrna ../bmesh ../modifiers + ../gpencil_modifiers + ../shader_fx ../nodes ../physics ../render/extern/include @@ -50,6 +53,7 @@ set(INC ../../../intern/atomic ../../../intern/clog ../../../intern/libmv + ../../../intern/opensubdiv ../../../extern/curve_fit_nd ) @@ -76,17 +80,17 @@ set(SRC intern/blender.c intern/blender_copybuffer.c intern/blender_undo.c + intern/blender_user_menu.c intern/blendfile.c - intern/bmfont.c 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 +103,14 @@ 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_cache.c + intern/editmesh_tangent.c intern/effect.c intern/fcurve.c intern/fluidsim.c @@ -113,8 +118,9 @@ set(SRC intern/font.c intern/freestyle.c intern/gpencil.c - intern/group.c + intern/gpencil_modifier.c intern/icons.c + intern/icons_rasterize.c intern/idcode.c intern/idprop.c intern/idprop_utils.c @@ -122,13 +128,16 @@ set(SRC intern/image_gen.c intern/ipo.c intern/key.c + intern/keyconfig.c intern/lamp.c 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 + intern/main.c intern/mask.c intern/mask_evaluate.c intern/mask_rasterize.c @@ -138,16 +147,22 @@ set(SRC intern/mesh.c intern/mesh_convert.c intern/mesh_evaluate.c + intern/mesh_iterators.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 intern/movieclip.c intern/multires.c + intern/multires_reshape.c + intern/multires_subdiv.c 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 @@ -155,6 +170,7 @@ set(SRC intern/outliner_treehash.c intern/packedFile.c intern/paint.c + intern/paint_toolslots.c intern/particle.c intern/particle_child.c intern/particle_distribute.c @@ -162,22 +178,35 @@ 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 intern/seqeffects.c intern/seqmodifier.c intern/sequencer.c + intern/shader_fx.c intern/shrinkwrap.c - intern/sketch.c intern/smoke.c intern/softbody.c intern/sound.c intern/speaker.c + intern/studiolight.c + intern/subdiv.c + intern/subdiv_ccg.c + intern/subdiv_ccg_mask.c + intern/subdiv_converter.c + intern/subdiv_converter_mesh.c + intern/subdiv_displacement.c + intern/subdiv_displacement_multires.c + intern/subdiv_eval.c + intern/subdiv_foreach.c + intern/subdiv_mesh.c + intern/subdiv_stats.c intern/subsurf_ccg.c intern/suggestions.c intern/text.c @@ -192,9 +221,9 @@ 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 BKE_DerivedMesh.h BKE_action.h @@ -207,20 +236,19 @@ set(SRC BKE_blender.h BKE_blender_copybuffer.h BKE_blender_undo.h + BKE_blender_user_menu.h BKE_blender_version.h BKE_blendfile.h - BKE_bmfont.h - BKE_bmfont_types.h 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 +260,13 @@ 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_cache.h + BKE_editmesh_tangent.h BKE_effect.h BKE_fcurve.h BKE_fluidsim.h @@ -245,17 +274,19 @@ set(SRC BKE_freestyle.h BKE_global.h BKE_gpencil.h - BKE_group.h + BKE_gpencil_modifier.h BKE_icons.h BKE_idcode.h BKE_idprop.h BKE_image.h BKE_ipo.h BKE_key.h + BKE_keyconfig.h BKE_lamp.h 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 @@ -265,14 +296,18 @@ set(SRC BKE_mball.h BKE_mball_tessellate.h BKE_mesh.h + BKE_mesh_iterators.h BKE_mesh_mapping.h BKE_mesh_remap.h + BKE_mesh_runtime.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,19 +316,25 @@ 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_shader_fx.h BKE_shrinkwrap.h - BKE_sketch.h BKE_smoke.h BKE_softbody.h BKE_sound.h BKE_speaker.h + BKE_studiolight.h + BKE_subdiv.h + BKE_subdiv_ccg.h + BKE_subdiv_eval.h + BKE_subdiv_foreach.h + BKE_subdiv_mesh.h BKE_subsurf.h BKE_suggestions.h BKE_text.h @@ -301,19 +342,21 @@ 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 + tracking_private.h intern/CCGSubSurf.h intern/CCGSubSurf_inline.h intern/CCGSubSurf_intern.h - intern/pbvh_intern.h intern/data_transfer_intern.h + intern/multires_inline.h + intern/pbvh_intern.h + intern/subdiv_converter.h + intern/subdiv_inline.h ) if(WITH_BINRELOC) @@ -332,7 +375,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 +463,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 +519,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() @@ -513,7 +548,6 @@ endif() if(WITH_OPENSUBDIV) add_definitions(-DWITH_OPENSUBDIV) list(APPEND INC_SYS - ../../../intern/opensubdiv ${OPENSUBDIV_INCLUDE_DIRS} ) endif() @@ -536,8 +570,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}") |