Permalink
Browse files

refactoring c/c++ core.

  • Loading branch information...
raptor
raptor committed May 23, 2017
1 parent 0906f49 commit 1151318f2946d2d42165fe05faee55abfe3cefc8
@@ -309,6 +309,144 @@ set(SRC
intern/data_transfer_intern.h
)
+
+if (WITH_CPP_CORE)
+ SET_SOURCE_FILES_PROPERTIES(
+ intern/CCGSubSurf.c
+ intern/CCGSubSurf_legacy.c
+ intern/CCGSubSurf_opensubdiv.c
+ intern/CCGSubSurf_opensubdiv_converter.c
+ intern/CCGSubSurf_util.c
+ intern/DerivedMesh.c
+ intern/action.c
+ intern/addon.c
+ intern/anim.c
+ intern/anim_sys.c
+ intern/appdir.c
+ intern/armature.c
+ intern/armature_update.c
+ intern/autoexec.c
+ intern/blender.c
+ intern/blender_copybuffer.c
+ intern/blender_undo.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/collision.c
+ intern/colortools.c
+ intern/constraint.c
+ intern/context.c
+ intern/crazyspace.c
+ intern/curve.c
+ intern/customdata.c
+ intern/customdata_file.c
+ intern/data_transfer.c
+ intern/deform.c
+ intern/depsgraph.c
+ intern/displist.c
+ intern/dynamicpaint.c
+ intern/editderivedmesh.c
+ intern/editmesh.c
+ intern/editmesh_bvh.c
+ intern/effect.c
+ intern/fcurve.c
+ intern/fluidsim.c
+ intern/fmodifier.c
+ intern/font.c
+ intern/freestyle.c
+ intern/gpencil.c
+ intern/group.c
+ intern/icons.c
+ intern/idcode.c
+ intern/idprop.c
+ intern/image.c
+ intern/image_gen.c
+ intern/ipo.c
+ intern/key.c
+ intern/lamp.c
+ intern/lattice.c
+ intern/library.c
+ intern/library_idmap.c
+ intern/library_query.c
+ intern/library_remap.c
+ intern/linestyle.c
+ intern/mask.c
+ intern/mask_evaluate.c
+ intern/mask_rasterize.c
+ intern/material.c
+ intern/mball.c
+ intern/mball_tessellate.c
+ intern/mesh.c
+ intern/mesh_evaluate.c
+ intern/mesh_mapping.c
+ intern/mesh_remap.c
+ intern/mesh_validate.c
+ intern/modifier.c
+ intern/modifiers_bmesh.c
+ intern/movieclip.c
+ intern/multires.c
+ intern/nla.c
+ intern/node.c
+ intern/object.c
+ intern/object_deform.c
+ intern/object_dupli.c
+ intern/object_update.c
+ intern/ocean.c
+ intern/outliner_treehash.c
+ intern/packedFile.c
+ intern/paint.c
+ intern/particle.c
+ intern/particle_child.c
+ intern/particle_distribute.c
+ intern/particle_system.c
+ intern/pbvh.c
+ intern/pbvh_bmesh.c
+ intern/pointcache.c
+ intern/property.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/shrinkwrap.c
+ intern/sketch.c
+ intern/smoke.c
+ intern/softbody.c
+ intern/sound.c
+ intern/speaker.c
+ intern/subsurf_ccg.c
+ intern/suggestions.c
+ intern/text.c
+ intern/texture.c
+ intern/tracking.c
+ intern/tracking_auto.c
+ intern/tracking_detect.c
+ intern/tracking_plane_tracker.c
+ intern/tracking_region_tracker.c
+ intern/tracking_solver.c
+ intern/tracking_stabilize.c
+ intern/tracking_util.c
+ intern/unit.c
+ intern/world.c
+ intern/writeavi.c
+ intern/writeframeserver.c
+ PROPERTIES LANGUAGE CXX
+ )
+endif()
+
+
if(WITH_BINRELOC)
list(APPEND INC_SYS
${BINRELOC_INCLUDE_DIRS}
@@ -543,20 +681,5 @@ if(WITH_LEGACY_DEPSGRAPH)
add_definitions(-DWITH_LEGACY_DEPSGRAPH)
endif()
-if (WITH_CPP_CORE)
- SET_SOURCE_FILES_PROPERTIES( ${SRC} PROPERTIES LANGUAGE CXX )
- set_source_files_properties(
- depsgraph_private.h
- nla_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
- PROPERTIES HEADER_FILE_ONLY TRUE
- )
-
-endif()
blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
@@ -28,6 +28,7 @@
*/
#include "BLI_compiler_attrs.h"
+#include "BLI_compiler_compat.h"
#include "BLI_sys_types.h"
/* BLI_endian_switch_inline.h */
@@ -225,36 +225,92 @@ if(WIN32)
endif()
if (WITH_CPP_CORE)
- SET_SOURCE_FILES_PROPERTIES( ${SRC} PROPERTIES LANGUAGE CXX )
+ SET_SOURCE_FILES_PROPERTIES(
+ intern/BLI_args.c
+ 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
+ intern/BLI_kdtree.c
+ intern/BLI_linklist.c
+ intern/BLI_memarena.c
+ intern/BLI_mempool.c
+ intern/DLRB_tree.c
+ intern/array_store.c
+ intern/array_store_utils.c
+ intern/array_utils.c
+ intern/astar.c
+ intern/bitmap_draw_2d.c
+ intern/boxpack2d.c
+ intern/buffer.c
+ intern/callbacks.c
+ intern/convexhull2d.c
+ intern/dynlib.c
+ intern/easing.c
+ intern/edgehash.c
+ intern/endian_switch.c
+ intern/fileops.c
+ intern/fnmatch.c
+ 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
+ intern/math_geom.c
+ intern/math_geom_inline.c
+ 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/memory_utils.c
+ intern/noise.c
+ intern/path_util.c
+ intern/polyfill2d.c
+ intern/polyfill2d_beautify.c
+ intern/quadric.c
+ intern/rand.c
+ intern/rct.c
+ intern/scanfill.c
+ intern/scanfill_utils.c
+ intern/smallhash.c
+ intern/sort.c
+ intern/sort_utils.c
+ intern/stack.c
+ intern/storage.c
+ intern/string.c
+ intern/string_cursor_utf8.c
+ intern/string_utf8.c
+ intern/system.c
+ intern/task.c
+ intern/threads.c
+ intern/time.c
+ intern/timecode.c
+ intern/uvproject.c
+ intern/voronoi.c
+ intern/voxel.c
+ intern/winstuff.c
+ intern/winstuff_dir.c
+ PROPERTIES LANGUAGE CXX
+ )
endif()
-# 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
- intern/list_sort_impl.h
- BLI_endian_switch.h
- BLI_endian_switch_inline.h
- BLI_hash_md5.h
- BLI_hash_mm2a.h
- BLI_memarena.h
- BLI_memory_utils.h
- BLI_path_util.h
- BLI_rand.h
- BLI_scanfill.h
- BLI_smallhash.h
- BLI_stack.h
- BLI_string.h
- BLI_string_utf8.h
- BLI_string_cursor_utf8.h
- BLI_timecode.h
- BLI_winstuff.h
- PROPERTIES HEADER_FILE_ONLY TRUE
-)
+
blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}")
@@ -32,6 +32,7 @@
/** \file BLO_undofile.h
* \ingroup blenloader
*/
+#include "DNA_listBase.h"
typedef struct {
void *next, *prev;
@@ -89,7 +89,19 @@ if(WITH_ALEMBIC)
endif()
if (WITH_CPP_CORE)
- SET_SOURCE_FILES_PROPERTIES( ${SRC} PROPERTIES LANGUAGE CXX )
+ SET_SOURCE_FILES_PROPERTIES(
+ intern/readblenentry.c
+ intern/readfile.c
+ intern/runtime.c
+ intern/undofile.c
+ intern/versioning_250.c
+ intern/versioning_260.c
+ intern/versioning_270.c
+ intern/versioning_defaults.c
+ intern/versioning_legacy.c
+ intern/writefile.c
+ PROPERTIES LANGUAGE CXX
+ )
endif()
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
@@ -42,6 +42,14 @@ set(SRC
BLT_translation.h
)
+if (WITH_CPP_CORE)
+ SET_SOURCE_FILES_PROPERTIES(
+ intern/blt_lang.c
+ intern/blt_translation.c
+ PROPERTIES LANGUAGE CXX
+ )
+endif()
+
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
@@ -187,4 +187,38 @@ set_source_files_properties(
PROPERTIES HEADER_FILE_ONLY TRUE
)
+if (WITH_CPP_CORE)
+ SET_SOURCE_FILES_PROPERTIES(
+ intern/allocimbuf.c
+ intern/anim_movie.c
+ intern/bmp.c
+ intern/cache.c
+ #intern/colormanagement.c
+ #intern/colormanagement_inline.c
+ intern/divers.c
+ intern/filetype.c
+ intern/filter.c
+ intern/imageprocess.c
+ intern/indexer.c
+ intern/iris.c
+ intern/jpeg.c
+ intern/metadata.c
+ intern/module.c
+ intern/moviecache.c
+ intern/png.c
+ intern/readimage.c
+ #intern/rectop.c
+ intern/rotate.c
+ intern/scaling.c
+ intern/stereoimbuf.c
+ #intern/targa.c
+ intern/thumbs.c
+ intern/thumbs_blend.c
+ intern/thumbs_font.c
+ intern/util.c
+ intern/writeimage.c
+ PROPERTIES LANGUAGE CXX
+ )
+endif()
+
blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")
Oops, something went wrong.

0 comments on commit 1151318

Please sign in to comment.