diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 08:21:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 08:21:58 +0400 |
| commit | 01dca44a840cb6066adb4845a5e93e0d118f239c (patch) | |
| tree | 28c5914124a0c060b0c6e3b10e2fcb0d52625490 /source/blender/editors | |
| parent | fb4abf2e414064449624d169e8f10708990ea0d9 (diff) | |
disable navmesh feature when building without the game engine.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | source/blender/editors/object/object_ops.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 7 |
3 files changed, 19 insertions, 2 deletions
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index de74a0321c7..58ebb12e345 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -49,7 +49,6 @@ set(SRC object_hook.c object_lattice.c object_modifier.c - object_navmesh.cpp object_ops.c object_relations.c object_select.c @@ -60,8 +59,18 @@ set(SRC object_intern.h ) +if(WITH_GAMEENGINE) + list(APPEND SRC + object_navmesh.cpp + ) +endif() + if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) endif() +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +endif() + blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 29d536c1dab..5eb17268d19 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -213,11 +213,14 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_bake_image); WM_operatortype_append(OBJECT_OT_drop_named_material); +#ifdef WITH_GAMEENGINE WM_operatortype_append(OBJECT_OT_create_navmesh); WM_operatortype_append(OBJECT_OT_assign_navpolygon); WM_operatortype_append(OBJECT_OT_assign_new_navpolygon); +#endif } + void ED_operatormacros_object(void) { wmOperatorType *ot; diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index da6e1990622..5e05342f3dc 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -40,7 +40,6 @@ set(SRC editmode_undo.c numinput.c undo.c - navmesh_conversion.cpp crazyspace.c util_intern.h @@ -90,4 +89,10 @@ set(SRC ../include/UI_view2d.h ) +if(WITH_GAMEENGINE) + list(APPEND SRC + navmesh_conversion.cpp + ) +endif() + blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}") |