Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.

writefile.c had usless include.

1 files changed, 10 insertions, 7 deletions

diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 4ebaad673f2..b95e4f096b1 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -23,22 +23,22 @@ incs = ' #/intern/guardedalloc #/intern/memutil'
 incs += ' ../blenlib ../makesdna ../blenkernel'
 incs += ' ../include #/intern/bmfont ../imbuf ../render/extern/include'
 incs += ' #/intern/bsp/extern ../radiosity/extern/include'
-incs += ' #/intern/decimation/extern ../blenloader ../python'
+incs += ' #/intern/decimation/extern ../blenloader'
 incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
-incs += ' ../quicktime #/intern/elbeem/extern'
+incs += ' #/intern/elbeem/extern'
 incs += ' #/intern/ghost #/intern/opennl/extern'
 incs += ' ../gpu #extern/glew/include'
 
-
-incs += ' ' + env['BF_PYTHON_INC']
-incs += ' ' + env['BF_SDL_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
 defs = []
 
-if not env['WITH_BF_PYTHON']:
+if env['WITH_BF_PYTHON']:
+    incs += ' ../python ' + env['BF_PYTHON_INC']
+else:
     defs.append('DISABLE_PYTHON')
 
+
 if env['BF_TWEAK_MODE']:
     defs.append('TWEAK_MODE')
 
@@ -61,6 +61,7 @@ if env['WITH_BF_QUICKTIME']:
     defs.append('WITH_QUICKTIME')
 
 if env['WITH_BF_ICONV']:
+    incs += ' ../quicktime'
     incs += ' ' + env['BF_ICONV_INC']
     defs.append('WITH_ICONV')
 
@@ -85,7 +86,9 @@ if env['BF_BUILDINFO']:
 if env['BF_NO_ELBEEM']:
     defs.append('DISABLE_ELBEEM')
 
-if not env['WITH_BF_SDL']:
+if env['WITH_BF_SDL']:
+    incs += ' ' + env['BF_SDL_INC']
+else:
     defs.append('DISABLE_SDL')
 
 if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'):