diff options
| -rw-r--r-- | extern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | extern/recastnavigation/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | source/blender/editors/object/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_navmesh.cpp | 2 | ||||
| -rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 3 |
9 files changed, 47 insertions, 4 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index b15c8a31c73..79d615ba730 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -33,6 +33,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") ADD_SUBDIRECTORY(glew) +ADD_SUBDIRECTORY(recastnavigation) IF(WITH_IMAGE_OPENJPEG) ADD_SUBDIRECTORY(libopenjpeg) diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt new file mode 100644 index 00000000000..d36de44a766 --- /dev/null +++ b/extern/recastnavigation/CMakeLists.txt @@ -0,0 +1,32 @@ +# $Id$ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Daniel Genrich +# +# ***** END GPL LICENSE BLOCK ***** + +SET(INC Recast/Include Detour/Include) + +FILE(GLOB SRC Recast/Source/*.cpp Detour/Source/*.cpp) + +BLENDERLIB(extern_recastnavigation "${SRC}" "${INC}") +#, libtype='blender', priority = 0 ) diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index a41b9e89f83..56f144ce63c 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -19,7 +19,7 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) +FILE(GLOB SRC *.c *.cpp) SET(INC ../include @@ -34,6 +34,7 @@ SET(INC ../../windowmanager ../../render/extern/include ../../../../intern/guardedalloc + ../../../../extern/recastnavigation/Recast/Include ) IF(NOT WITH_PYTHON) diff --git a/source/blender/editors/object/object_navmesh.cpp b/source/blender/editors/object/object_navmesh.cpp index 572edcff976..95738a05db4 100644 --- a/source/blender/editors/object/object_navmesh.cpp +++ b/source/blender/editors/object/object_navmesh.cpp @@ -1,5 +1,5 @@ /** -* $Id:$ +* $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index b4b2fd12cef..2c55b0773be 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -19,13 +19,14 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) +FILE(GLOB SRC *.c *.cpp) SET(INC ../../blenkernel ../../blenlib ../include ../../../../intern/guardedalloc + ../../../../extern/recastnavigation/Recast/Include ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index b6dcc9c03f9..1c3c772de38 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) +FILE(GLOB SRC intern/*.c intern/*.cpp) SET(INC . ./intern @@ -33,10 +33,13 @@ SET(INC ../blenkernel ../blenkernel/intern ../render/extern/include + ../editors/include + ../gpu ../../../intern/guardedalloc ../../../intern/decimation/extern ../../../intern/elbeem/extern ../../../intern/bsp/extern + ../../../extern/recastnavigation/Recast/Include ${ZLIB_INC} ) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4088369a05b..cec5793ae97 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -498,6 +498,7 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") extern_binreloc extern_glew extern_libopenjpeg + extern_recastnavigation bf_videotex bf_rna bf_dna diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 97c367dd1f1..135ed820c4f 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -61,6 +61,7 @@ SET(INC ../../../source/blender/gpu ../../../source/blender/ikplugin ../../../extern/bullet2/src + ../../../extern/recastnavigation/Detour/Include ) IF(WITH_PYTHON) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index d8f6e3164ec..a4f9dffb360 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -59,6 +59,9 @@ SET(INC ../../../source/blender/gpu ../../../extern/bullet2/src ../../../extern/glew/include + ../../../extern/recastnavigation/Recast/Include + ../../../extern/recastnavigation/Detour/Include + ../../../source/blender/editors/include ) ADD_DEFINITIONS(-DGLEW_STATIC) |