[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40086] trunk/blender: disable navmesh feature when building without the game engine.

[Campbell Barton]

Revision: 40086
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40086
Author:   campbellbarton
Date:     2011-09-10 04:21:58 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
disable navmesh feature when building without the game engine.

Modified Paths:
--------------
    trunk/blender/extern/CMakeLists.txt
    trunk/blender/source/blender/editors/object/CMakeLists.txt
    trunk/blender/source/blender/editors/object/object_ops.c
    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/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
+++ trunk/blender/extern/CMakeLists.txt	2011-09-10 04:21:58 UTC (rev 40086)
@@ -43,10 +43,9 @@
 	add_subdirectory(glew)
 endif()
 
-## TODO MAKE GAME ENGINE ONLY
-# if(WITH_GAMEENGINE)
+if(WITH_GAMEENGINE)
    add_subdirectory(recastnavigation)
-# endif()
+endif()
 
 if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
 	add_subdirectory(libopenjpeg)

Modified: trunk/blender/source/blender/editors/object/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/object/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
+++ trunk/blender/source/blender/editors/object/CMakeLists.txt	2011-09-10 04:21:58 UTC (rev 40086)
@@ -49,7 +49,6 @@
 	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 @@
 	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}")

Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c	2011-09-10 03:42:45 UTC (rev 40085)
+++ trunk/blender/source/blender/editors/object/object_ops.c	2011-09-10 04:21:58 UTC (rev 40086)
@@ -213,11 +213,14 @@
 	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;

Modified: trunk/blender/source/blender/editors/util/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/util/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
+++ trunk/blender/source/blender/editors/util/CMakeLists.txt	2011-09-10 04:21:58 UTC (rev 40086)
@@ -40,7 +40,6 @@
 	editmode_undo.c
 	numinput.c
 	undo.c
-	navmesh_conversion.cpp
 	crazyspace.c
 
 	util_intern.h
@@ -90,4 +89,10 @@
 	../include/UI_view2d.h
 )
 
+if(WITH_GAMEENGINE)
+	list(APPEND SRC
+		navmesh_conversion.cpp
+	)
+endif()
+
 blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt	2011-09-10 04:21:58 UTC (rev 40086)
@@ -119,4 +119,8 @@
 	add_definitions(-DDISABLE_ELBEEM)
 endif()
 
+if(WITH_GAMEENGINE)
+	add_definitions(-DWITH_GAMEENGINE)
+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 03:42:45 UTC (rev 40085)
+++ trunk/blender/source/blender/modifiers/intern/MOD_navmesh.cpp	2011-09-10 04:21:58 UTC (rev 40086)
@@ -33,7 +33,10 @@
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
@@ -47,13 +50,13 @@
 
 static void initData(ModifierData *md)
 {
-	NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
+	/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */ /* UNUSED */
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
 {
-	NavMeshModifierData *nmmd = (NavMeshModifierData*) md;
-	NavMeshModifierData *tnmmd = (NavMeshModifierData*) target;
+	/* NavMeshModifierData *nmmd = (NavMeshModifierData*) md; */
+	/* NavMeshModifierData *tnmmd = (NavMeshModifierData*) target; */
 
 	//.todo - deep copy
 }
@@ -62,6 +65,8 @@
 static void (*drawFacesSolid_original)(DerivedMesh *dm, float (*partial_redraw_planes)[4],
 					   int fast, int (*setMaterial)(int, void *attribs)) = NULL;*/
 
+#ifdef WITH_GAMEENGINE
+
 static void drawNavMeshColored(DerivedMesh *dm)
 {
 	int a, glmode;
@@ -122,9 +127,11 @@
 	//drawFacesSolid_original(dm, partial_redraw_planes, fast, setMaterial);
 	drawNavMeshColored(dm);
 }
+#endif /* WITH_GAMEENGINE */
 
 static DerivedMesh *createNavMeshForVisualization(NavMeshModifierData *mmd,DerivedMesh *dm)
 {
+#ifdef WITH_GAMEENGINE
 	DerivedMesh *result;
 	int maxFaces = dm->getNumFaces(dm);
 
@@ -194,6 +201,9 @@
 		delete trisToFacesMap;		
 
 	return result;
+#else // WITH_GAMEENGINE
+	return dm;
+#endif // WITH_GAMEENGINE
 }
 
 /*