fixed linking with CMake
authorCampbell Barton <ideasman42@gmail.com>
Sat, 10 Sep 2011 03:42:45 +0000 (03:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 10 Sep 2011 03:42:45 +0000 (03:42 +0000)
extern/CMakeLists.txt
extern/recastnavigation/CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt

index 7a59e41..266ac6d 100644 (file)
@@ -42,7 +42,11 @@ endif()
 if(WITH_BUILTIN_GLEW)
        add_subdirectory(glew)
 endif()
-add_subdirectory(recastnavigation)
+
+## TODO MAKE GAME ENGINE ONLY
+# if(WITH_GAMEENGINE)
+   add_subdirectory(recastnavigation)
+# endif()
 
 if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
        add_subdirectory(libopenjpeg)
index 694f142..1af01b1 100644 (file)
@@ -63,4 +63,4 @@ set(SRC
                Recast/Include/RecastTimer.h    
 )
 
-blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
\ No newline at end of file
+blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
index 243f51f..93236f9 100644 (file)
@@ -819,6 +819,8 @@ endif()
                bf_blenfont
                bf_intern_audaspace
                bf_intern_mikktspace
+               extern_recastnavigation
+               bf_editor_util          # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release!
        )
 
        if(WITH_MOD_CLOTH_ELTOPO)
index 6846da5..4b2d828 100644 (file)
@@ -59,7 +59,7 @@ set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ../../../extern/recastnavigation/Recast/Include
        ../../../extern/recastnavigation/Detour/Include
-       ../../../source/blender/editors/include
+       ../../blender/editors/include
 )
 
 set(SRC