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/makesrna/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/makesrna/SConscript')
| -rw-r--r-- | source/blender/makesrna/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 20862aa626d..371a0e32155 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -69,7 +69,7 @@ if env['OURPLATFORM'] == 'linux': cflags='-pthread' incs += ' ../../../extern/binreloc/include' -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'] if env['WITH_BF_INTERNATIONAL']: |