diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/blenkernel/CMakeLists.txt | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 70a3f927b23..7a11bdb1f39 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -28,7 +28,6 @@ set(INC ../blenfont ../blenlib ../blenloader - ../freestyle ../gpu ../ikplugin ../imbuf @@ -103,7 +102,6 @@ set(SRC intern/lamp.c intern/lattice.c intern/library.c - intern/linestyle.c intern/mask.c intern/mask_evaluate.c intern/mask_rasterize.c @@ -198,7 +196,6 @@ set(SRC BKE_lamp.h BKE_lattice.h BKE_library.h - BKE_linestyle.h BKE_main.h BKE_mask.h BKE_material.h @@ -418,6 +415,17 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_FREESTYLE) + list(APPEND SRC + intern/linestyle.c + BKE_linestyle.h + ) + list(APPEND INC + ../freestyle + ) + add_definitions(-DWITH_FREESTYLE) +endif() + ## Warnings as errors, this is too strict! #if(MSVC) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") |