Merged changes in the trunk up to revision 36551.
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index a619be07b6aeeee77cf2803f7dba37204257033c..0da260c3f2a7e1b567d7cb3141ce24e47557e9eb 100644 (file)
@@ -92,7 +92,6 @@ set(SRC
        intern/depsgraph.c
        intern/displist.c
        intern/effect.c
-       intern/exotic.c
        intern/fcurve.c
        intern/fluidsim.c
        intern/fmodifier.c
@@ -147,7 +146,7 @@ set(SRC
        intern/writeavi.c
        intern/writeffmpeg.c
        intern/writeframeserver.c
-
+       
        BKE_DerivedMesh.h
        BKE_action.h
        BKE_anim.h
@@ -178,7 +177,6 @@ set(SRC
        BKE_displist.h
        BKE_effect.h
        BKE_endian.h
-       BKE_exotic.h
        BKE_fcurve.h
        BKE_fluidsim.h
        BKE_font.h
@@ -242,6 +240,11 @@ if(WITH_BULLET)
        add_definitions(-DUSE_BULLET)
 endif()
 
+if(WITH_MOD_CLOTH_ELTOPO)
+       list(APPEND INC ../../../extern/eltopo)
+       add_definitions(-DWITH_ELTOPO)
+endif()
+
 if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
 endif()