diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-07 19:34:04 +0400 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-07 19:34:04 +0400 |
| commit | dbd6658d737b1592a633ddf6397be14e50e434d9 (patch) | |
| tree | 57081721d70622a3c3141909b258f9bce8a5b1e3 /source/blender/render/SConscript | |
| parent | b5bd86e5907c3fa98546dabeda9703dfb15862f4 (diff) | |
| parent | 884fc84793be1c5fdd6643ad267331381f8e1c6b (diff) | |
svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index a402139b927..4ec1ce3de6b 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -14,6 +14,8 @@ cxxflags_raytrace = env['CXXFLAGS'] defs = [] defs_raytrace = [] +defs.append('WITH_SMOKE') # TODO, make optional + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['WITH_BF_RAYOPTIMIZATION']: cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] @@ -29,7 +31,7 @@ if env['OURPLATFORM'] == 'darwin': cflags_raytrace = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] -if env['OURPLATFORM'] == 'linux2': +if env['OURPLATFORM'] == 'linux': if env['WITH_BF_RAYOPTIMIZATION']: cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] |