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/makesrna/intern/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/makesrna/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 24bf6ff4aa1..a8b9b779ff8 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -54,7 +54,6 @@ set(DEFSRC rna_key.c rna_lamp.c rna_lattice.c - rna_linestyle.c rna_main.c rna_mask.c rna_material.c @@ -93,6 +92,12 @@ set(DEFSRC rna_world.c ) +if(WITH_FREESTYLE) + list(APPEND DEFSRC + rna_linestyle.c + ) +endif() + set(APISRC rna_action_api.c rna_actuator_api.c @@ -254,7 +259,6 @@ blender_include_dirs( ../../windowmanager ../../editors/include ../../render/extern/include - ../../freestyle ../../../../intern/audaspace/intern ../../../../intern/cycles/blender ../../../../intern/guardedalloc @@ -262,6 +266,13 @@ blender_include_dirs( ../../../../intern/smoke/extern ) +if(WITH_FREESTYLE) + blender_include_dirs( + ../../freestyle + ) + add_definitions(-DWITH_FREESTYLE) +endif() + blender_include_dirs_sys( ${GLEW_INCLUDE_PATH} ) |