From fd0072e77cd28d52e00ea77542ba6d11018889b5 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Sun, 17 Aug 2008 17:08:00 +0000 Subject: Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported! --- source/blender/render/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/render/SConscript') diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index b1bc9673f23..f0d1353b0d3 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -incs += ' ../quicktime ../include ../../kernel/gen_messaging' +incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader' defs = [] -- cgit v1.2.3 From 2ecf987dc665eff477fb03a0cef0b2972e4b78d2 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 22 Oct 2008 11:28:10 +0000 Subject: * Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly --- source/blender/render/SConscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/render/SConscript') diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index f0d1353b0d3..607ddf5c7a3 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -10,16 +10,16 @@ incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader' defs = [] -if env['WITH_BF_YAFRAY'] == 1: +if env['WITH_BF_YAFRAY']: incs += ' ../yafray' else: defs.append('DISABLE_YAFRAY') -if env['WITH_BF_QUICKTIME'] == 1: +if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ' + env['BF_QUICKTIME_INC'] -if env['WITH_BF_FFMPEG'] == 1: +if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') if env['WITH_BF_OPENEXR']: -- cgit v1.2.3 From 483136c8e4d73fafe2b3e0953a6325107558d896 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 11 Nov 2008 14:14:22 +0000 Subject: Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building. writefile.c had usless include. --- source/blender/render/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/render/SConscript') diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 607ddf5c7a3..50c4b554193 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader' +incs += ' ../include ../blenloader' defs = [] @@ -17,7 +17,7 @@ else: if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') - incs += ' ' + env['BF_QUICKTIME_INC'] + incs += ' ../quicktime ' + env['BF_QUICKTIME_INC'] if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') -- cgit v1.2.3