diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-11 19:17:54 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-11 19:17:54 +0400 |
commit | 0e3856d506bec2844b12198cb2a02429aac7e9d9 (patch) | |
tree | a9f38219f74744ee8b5b6d39f5604dfca723d77e /source/blender | |
parent | b988a2abf815d74aba7bd9bf910b712735ea8f53 (diff) |
Fixes for Win+SCons and disable recastnavigationif game engine is disabled in SCons
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index e7999f18b34..632188b2d86 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -1,5 +1,6 @@ #!/usr/bin/python Import ('env') +import os sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') @@ -94,7 +95,7 @@ if env['WITH_BF_GAMEENGINE']: 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'] |