[Bf-blender-cvs] [19ae921] master: CMake: fix for standalone player and remove recast modifier reference

Campbell Barton noreply at git.blender.org
Fri Mar 14 07:06:21 CET 2014


Commit: 19ae921495442ed5801b8b660bec0c275e10f494
Author: Campbell Barton
Date:   Fri Mar 14 15:56:35 2014 +1100
https://developer.blender.org/rB19ae921495442ed5801b8b660bec0c275e10f494

CMake: fix for standalone player and remove recast modifier reference

===================================================================

M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/modifiers/CMakeLists.txt

===================================================================

diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 87f07ac..3fc6e2e 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -33,10 +33,10 @@ set(SRC
 
 data_to_c_simple(../../../../release/datafiles/bfont.pfb SRC)
 data_to_c_simple(../../../../release/datafiles/bfont.ttf SRC)
+data_to_c_simple(../../../../release/datafiles/bmonofont.ttf SRC)
 
 if(WITH_BLENDER)
 	# blender only (not player)
-	data_to_c_simple(../../../../release/datafiles/bmonofont.ttf SRC)
 
 	if(NOT WITH_HEADLESS)
 		# blender UI only
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 7b43f98..b841356 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -133,15 +133,6 @@ if(WITH_MOD_OCEANSIM)
 	add_definitions(-DWITH_OCEANSIM)
 endif()
 
-if(WITH_GAMEENGINE)
-	# for MOD_navmesh.c
-	add_definitions(-DWITH_GAMEENGINE)
-	list(APPEND INC
-		../gpu
-		../../../extern/recastnavigation
-	)
-endif()
-
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()




More information about the Bf-blender-cvs mailing list