Merged changes in the trunk up to revision 32684.
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 5252003c5b3ea54da9aabb9ff7dd8568d4205199..7e701f19a186c2c877296c45e11ae2bfd51a52e8 100644 (file)
@@ -29,6 +29,7 @@ SET(INC
        ../avi
        ../blenlib
        ../blenloader
+       ../freestyle
        ../gpu
        ../ikplugin
        ../imbuf
@@ -102,6 +103,7 @@ SET(SRC
        intern/key.c
        intern/lattice.c
        intern/library.c
+       intern/linestyle.c
        intern/material.c
        intern/mball.c
        intern/mesh.c
@@ -193,7 +195,7 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_OPENMP)
-       ADD_DEFINITIONS(-DPARALLEL=1)
+               ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
 IF(NOT WITH_MOD_FLUID)