diff options
Diffstat (limited to 'source/blender/blenlib/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 9efa20da13e..dcf7c3b5d39 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -23,15 +23,14 @@ # # ***** END GPL LICENSE BLOCK ***** -# XXX allowing blenkernel and RNA includes in blenlib is a hack, -# but needed in a few places atm (bpath.c for instance) set(INC . # ../blenkernel # dont add this back! ../makesdna - ../../../intern/ghost ../../../intern/guardedalloc + ../../../intern/atomic ../../../extern/wcwidth + ../../../extern/Eigen3 ) set(INC_SYS @@ -44,6 +43,7 @@ set(SRC intern/BLI_array.c intern/BLI_dial.c intern/BLI_dynstr.c + intern/BLI_filelist.c intern/BLI_ghash.c intern/BLI_heap.c intern/BLI_kdopbvh.c @@ -52,6 +52,8 @@ set(SRC intern/BLI_memarena.c intern/BLI_mempool.c intern/DLRB_tree.c + intern/array_utils.c + intern/astar.c intern/boxpack2d.c intern/buffer.c intern/callbacks.c @@ -65,11 +67,15 @@ set(SRC intern/freetypefont.c intern/graph.c intern/gsqueue.c + intern/hash_md5.c + intern/hash_mm2a.c intern/jitter.c intern/lasso.c + intern/list_sort_impl.h intern/listbase.c intern/math_base.c intern/math_base_inline.c + intern/math_bits_inline.c intern/math_color.c intern/math_color_blend_inline.c intern/math_color_inline.c @@ -78,12 +84,14 @@ set(SRC intern/math_interp.c intern/math_matrix.c intern/math_rotation.c + intern/math_solvers.c + intern/math_statistics.c intern/math_vector.c intern/math_vector_inline.c - intern/md5.c intern/noise.c intern/path_util.c intern/polyfill2d.c + intern/polyfill2d_beautify.c intern/quadric.c intern/rand.c intern/rct.c @@ -111,6 +119,8 @@ set(SRC BLI_alloca.h BLI_args.h BLI_array.h + BLI_array_utils.h + BLI_astar.h BLI_bitmap.h BLI_blenlib.h BLI_boxpack2d.h @@ -134,6 +144,8 @@ set(SRC BLI_ghash.h BLI_graph.h BLI_gsqueue.h + BLI_hash_md5.h + BLI_hash_mm2a.h BLI_heap.h BLI_jitter.h BLI_kdopbvh.h @@ -145,6 +157,7 @@ set(SRC BLI_listbase.h BLI_math.h BLI_math_base.h + BLI_math_bits.h BLI_math_color.h BLI_math_color_blend.h BLI_math_geom.h @@ -152,13 +165,15 @@ set(SRC BLI_math_interp.h BLI_math_matrix.h BLI_math_rotation.h + BLI_math_solvers.h + BLI_math_statistics.h BLI_math_vector.h - BLI_md5.h BLI_memarena.h BLI_mempool.h BLI_noise.h BLI_path_util.h BLI_polyfill2d.h + BLI_polyfill2d_beautify.h BLI_quadric.h BLI_rand.h BLI_rect.h @@ -187,13 +202,6 @@ set(SRC PIL_time_utildefines.h ) -if(WITH_BINRELOC) - list(APPEND INC_SYS - ${BINRELOC_INCLUDE_DIRS} - ) - add_definitions(-DWITH_BINRELOC) -endif() - if(WITH_MEM_VALGRIND) add_definitions(-DWITH_MEM_VALGRIND) endif() @@ -204,10 +212,15 @@ if(WIN32) ) endif() -blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}") +# no need to compile object files for inline headers. +set_source_files_properties( + intern/math_base_inline.c + intern/math_bits_inline.c + intern/math_color_blend_inline.c + intern/math_color_inline.c + intern/math_geom_inline.c + intern/math_vector_inline.c + PROPERTIES HEADER_FILE_ONLY TRUE +) -if(MSVC) - # Quiet warning about inline math library files that do not export symbols. - # (normally you'd exclude from project, but we still want to see the files in MSVC) - set_target_properties(bf_blenlib PROPERTIES STATIC_LIBRARY_FLAGS /ignore:4221) -endif() +blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}") |