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/python/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/python/SConscript')
-rw-r--r-- | source/blender/python/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index dad1949bcf4..fb04db6f99c 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -10,7 +10,7 @@ incs += ' ../freestyle/intern/python' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] -is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']) +is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc', 'win64-mingw') and env['BF_DEBUG']) # bmesh defs = [] @@ -57,7 +57,7 @@ if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] sources = env.Glob('intern/*.c') |