svn merge -r 12684:12691 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / extern / SConscript
index 0be34630600119b97ecac42f0960fd62aec77f50..766e2a5b188ad0c5af2f8685f9678481e98de468 100644 (file)
@@ -5,8 +5,9 @@ Import('env')
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['qhull/SConscript',
             'solid/SConscript'])
-    if env['WITH_BF_BULLET']:
-        SConscript(['bullet2/src/SConscript'])
+
+if env['WITH_BF_BULLET']:
+    SConscript(['bullet2/src/SConscript'])
 
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
@@ -14,5 +15,5 @@ if env['WITH_BF_INTERNATIONAL']:
 if env['WITH_BF_VERSE']:
     SConscript(['verse/dist/SConstruct'])
 
-if env['WITH_BF_FFMPEG']:
+if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['ffmpeg/SConscript']);