[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40129] trunk/blender: Fixes for Win+SCons and disable recastnavigationif game engine is disabled in SCons

[Sergey Sharybin]

Revision: 40129
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40129
Author:   nazgul
Date:     2011-09-11 15:17:54 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
Fixes for Win+SCons and disable recastnavigationif game engine is disabled in SCons

Modified Paths:
--------------
    trunk/blender/extern/SConscript
    trunk/blender/source/blender/blenkernel/SConscript

Modified: trunk/blender/extern/SConscript
===================================================================
--- trunk/blender/extern/SConscript	2011-09-11 14:43:53 UTC (rev 40128)
+++ trunk/blender/extern/SConscript	2011-09-11 15:17:54 UTC (rev 40129)
@@ -3,8 +3,10 @@
 Import('env')
 
 SConscript(['glew/SConscript'])
-SConscript(['recastnavigation/SConscript'])
 
+if env['WITH_BF_GAMEENGINE']:
+    SConscript(['recastnavigation/SConscript'])
+
 if env['WITH_BF_ELTOPO']:
     SConscript(['eltopo/SConscript'])
 

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2011-09-11 14:43:53 UTC (rev 40128)
+++ trunk/blender/source/blender/blenkernel/SConscript	2011-09-11 15:17:54 UTC (rev 40129)
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 Import ('env')
+import os
 
 sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
 
@@ -94,7 +95,7 @@
     incs += ' #/extern/recastnavigation/Recast/Include'
     defs.append('WITH_GAMEENGINE')
 else:
-    sources.remove('intern/navmesh_conversion.cpp')
+    sources.remove('intern' + os.sep + 'navmesh_conversion.cpp')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']