diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/blenkernel/CMakeLists.txt | |
parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 80888e9b348..c7db52d9c7c 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -23,7 +23,7 @@ # # ***** END GPL LICENSE BLOCK ***** -set(INC +set(INC . ../avi ../blenfont @@ -39,15 +39,11 @@ set(INC ../modifiers ../nodes ../render/extern/include - ../../../intern/bsp/extern - ../../../intern/decimation/extern - ../../../intern/elbeem/extern ../../../intern/guardedalloc ../../../intern/iksolver/extern ../../../intern/memutil ../../../intern/mikktspace ../../../intern/opennl/extern - ../../../intern/smoke/extern # XXX - BAD LEVEL CALL WM_api.h ../windowmanager @@ -336,10 +332,16 @@ if(WITH_OPENMP) endif() if(WITH_MOD_FLUID) + list(APPEND INC + ../../../intern/elbeem/extern + ) add_definitions(-DWITH_MOD_FLUID) endif() if(WITH_MOD_SMOKE) + list(APPEND INC + ../../../intern/smoke/extern + ) add_definitions(-DWITH_SMOKE) endif() @@ -347,6 +349,18 @@ if(WITH_MOD_OCEANSIM) add_definitions(-DWITH_OCEANSIM) endif() +if(WITH_MOD_DECIMATE) + list(APPEND INC + ../../../intern/decimation/extern + ) +endif() + +if(WITH_MOD_BOOLEAN) + list(APPEND INC + ../../../intern/bsp/extern + ) +endif() + if(WITH_JACK) add_definitions(-DWITH_JACK) endif() |