Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-08 06:57:28 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-08 06:57:28 +0400
commitcb890a49fbd653c71d2fe639265a1a562136113f (patch)
tree10ddd1f7198c85408f83794fe560caa9512e2a2e /source/blender/blenkernel/SConscript
parentaea95c78606a99b0fa9c4c29c9e922e4a03f2a69 (diff)
parentf086201518b85f6dd2ae60ae37dc14f1d1406c01 (diff)
svn merge ^/trunk/blender -r41602:41638 .
Diffstat (limited to 'source/blender/blenkernel/SConscript')
-rw-r--r--source/blender/blenkernel/SConscript4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 7ae27aadd37..0cdcd4aa8eb 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -97,6 +97,10 @@ if env['WITH_BF_GAMEENGINE']:
else:
sources.remove('intern' + os.sep + 'navmesh_conversion.c')
+if env['WITH_BF_LIBMV']:
+ incs += ' #/extern/libmv'
+ defs.append('WITH_LIBMV')
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']