diff options
author | Daniel Stokes <kupomail@gmail.com> | 2012-04-26 07:11:15 +0400 |
---|---|---|
committer | Daniel Stokes <kupomail@gmail.com> | 2012-04-26 07:11:15 +0400 |
commit | f306b50700b05707f44b5472ac0b38d58fb01b0d (patch) | |
tree | cfa63e4c17e02752b8c97752fa1ca31bc5b8546e /source/blender/render | |
parent | ef9fbb56f7d26d39de118f939995529710f141bc (diff) | |
parent | 2f74471dd96382521c57e53fc99fb0df3974f7dc (diff) |
Merged revisions 45910-45967 from trunk/blender
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index db35764a31c..8a044b19a79 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -29,7 +29,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] cxxflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] -if env['OURPLATFORM'] == 'win32-mingw': +if env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw'): if env['WITH_BF_RAYOPTIMIZATION']: cflags_raytrace = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] cxxflags_raytrace = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS'] @@ -60,7 +60,7 @@ if env['WITH_BF_OPENEXR']: if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs += ' ' + env['BF_PTHREADS_INC'] # |