diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-14 14:38:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-14 14:38:11 +0400 |
| commit | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (patch) | |
| tree | 78aa22e116cf7aed6d10d851978a5bdcf807fa84 /source/blender/python/SConscript | |
| parent | 5f02b167d191969474c8f3575abdd6dbaeffeb57 (diff) | |
| parent | 9a79bd38ade00fc663c27ffda9892629ef5ca755 (diff) | |
Merged changes in the trunk up to revision 45619.
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index a755c916ef3..dad1949bcf4 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -56,6 +56,9 @@ if env['WITH_BF_CYCLES']: 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'): + incs += ' ' + env['BF_PTHREADS_INC'] sources = env.Glob('intern/*.c') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361]) |