diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
| commit | 9c42afb1c02cafa21632bd2e19b47c012a230368 (patch) | |
| tree | 90d7e190e9ba59437f1e3e31337984a2200aa764 /source/blender/blenkernel/SConscript | |
| parent | 5582d9fac13123397297db54a0478a63a1b75194 (diff) | |
| parent | 8f5112f191e24aac86da7b70f461a50825e764da (diff) | |
Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 4f19b353351..66d51810413 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -2,7 +2,7 @@ Import ('env') import os -sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') +sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc #/intern/memutil' incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' @@ -92,10 +92,10 @@ if env['WITH_BF_LZMA']: defs.append('WITH_LZMA') if env['WITH_BF_GAMEENGINE']: - incs += ' #/extern/recastnavigation/Recast/Include' + incs += ' #/extern/recastnavigation' defs.append('WITH_GAMEENGINE') else: - sources.remove('intern' + os.sep + 'navmesh_conversion.cpp') + sources.remove('intern' + os.sep + 'navmesh_conversion.c') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |