diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-29 04:59:04 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-29 04:59:04 +0400 |
| commit | 2585d524057da908668bb6d5ff7ec8b344d23093 (patch) | |
| tree | 2494aaa2281e568e4904fbe419f6a032535c65ad /source/blender/render/SConscript | |
| parent | d8e12e8710f7c24e046c132e84eff416b8e8d06c (diff) | |
| parent | 4465d2f419a8515df41a8fc415774eedaef0e6f6 (diff) | |
Merged changes in the trunk up to revision 46045.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
Diffstat (limited to 'source/blender/render/SConscript')
| -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 6295399597e..5addc45571d 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -30,7 +30,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'] @@ -61,7 +61,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'] # |