[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40107] trunk/blender/source/blender: cmake edits to navmesh so includes are not added unless the game engines enabled .

[Campbell Barton]

Revision: 40107
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40107
Author:   campbellbarton
Date:     2011-09-11 00:08:07 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
cmake edits to navmesh so includes are not added unless the game engines enabled.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/CMakeLists.txt
    trunk/blender/source/blender/editors/util/CMakeLists.txt
    trunk/blender/source/blender/modifiers/CMakeLists.txt
    trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp

Modified: trunk/blender/source/blender/editors/object/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/object/CMakeLists.txt	2011-09-10 23:49:39 UTC (rev 40106)
+++ trunk/blender/source/blender/editors/object/CMakeLists.txt	2011-09-11 00:08:07 UTC (rev 40107)
@@ -33,7 +33,6 @@
 	../../render/extern/include
 	../../windowmanager
 	../../../../intern/guardedalloc
-	../../../../extern/recastnavigation/Recast/Include
 )
 
 set(INC_SYS
@@ -60,6 +59,10 @@
 )
 
 if(WITH_GAMEENGINE)
+	list(APPEND INC
+		../../../../extern/recastnavigation/Recast/Include
+	)
+
 	list(APPEND SRC
 		object_navmesh.cpp
 	)

Modified: trunk/blender/source/blender/editors/util/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/util/CMakeLists.txt	2011-09-10 23:49:39 UTC (rev 40106)
+++ trunk/blender/source/blender/editors/util/CMakeLists.txt	2011-09-11 00:08:07 UTC (rev 40107)
@@ -24,7 +24,6 @@
 	../../blenkernel
 	../../blenlib
 	../../blenloader
-	../../../../extern/recastnavigation/Recast/Include
 	../../makesdna
 	../../makesrna
 	../../windowmanager
@@ -63,7 +62,6 @@
 	../include/ED_markers.h
 	../include/ED_mball.h
 	../include/ED_mesh.h
-	../include/ED_navmesh_conversion.h
 	../include/ED_node.h
 	../include/ED_numinput.h
 	../include/ED_object.h
@@ -90,8 +88,14 @@
 )
 
 if(WITH_GAMEENGINE)
+	list(APPEND INC
+		../../../../extern/recastnavigation/Recast/Include
+	)
+
 	list(APPEND SRC
 		navmesh_conversion.cpp
+
+		../include/ED_navmesh_conversion.h
 	)
 endif()
 

Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt	2011-09-10 23:49:39 UTC (rev 40106)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt	2011-09-11 00:08:07 UTC (rev 40107)
@@ -34,11 +34,8 @@
 	../makesdna
 	../makesrna
 	../render/extern/include
-	../editors/include
-	../gpu
 	../../../intern/elbeem/extern
 	../../../intern/guardedalloc
-	../../../extern/recastnavigation/Recast/Include
 )
 
 set(INC_SYS
@@ -120,7 +117,13 @@
 endif()
 
 if(WITH_GAMEENGINE)
+	# for MOD_navmesh.cpp
 	add_definitions(-DWITH_GAMEENGINE)
+	list(APPEND INC
+		../gpu
+		../../../extern/recastnavigation/Recast/Include
+		../editors/include  # XXX - BAD LEVEL CALL, REMOVE BEFORE RELEASE
+	)
 endif()
 
 blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp	2011-09-10 23:49:39 UTC (rev 40106)
+++ trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp	2011-09-11 00:08:07 UTC (rev 40107)
@@ -26,11 +26,21 @@
 *
 */
 #include <math.h>
-#include "Recast.h"
 
+#ifdef WITH_GAMEENGINE
+#  include "Recast.h"
+#endif
+
 extern "C"{
-#include "ED_navmesh_conversion.h"
 
+#ifdef WITH_GAMEENGINE
+#  include "ED_navmesh_conversion.h"
+#  include "BIF_gl.h"
+#  include "GPU_buffers.h"
+#  include "GPU_draw.h"
+#  include "UI_resources.h"
+#endif
+
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
@@ -43,10 +53,6 @@
 #include "BKE_particle.h"
 #include "BKE_customdata.h"
 #include "MEM_guardedalloc.h"
-#include "BIF_gl.h"
-#include "GPU_buffers.h"
-#include "GPU_draw.h"
-#include "UI_resources.h"
 
 static void initData(ModifierData *md)
 {