diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
| commit | dfe2f8dc03267e041102837e92f547fb04881510 (patch) | |
| tree | d9582c4667ce5b9e39e2adce40832aa4f44b4fe7 /source/creator/SConscript | |
| parent | d7e08f2d33207fdf76b1b597ef0de9dec26e3987 (diff) | |
| parent | 00e46ef739cf2bfddb8805af056aa59fd3b3c71c (diff) | |
Merged changes in the trunk up to revision 28247.
Diffstat (limited to 'source/creator/SConscript')
| -rw-r--r-- | source/creator/SConscript | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/creator/SConscript b/source/creator/SConscript index da32370ad74..35c6ae40898 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -39,5 +39,11 @@ if env['WITH_BF_FHS']: # /usr -> /usr/share/blender/2.5 if env['BF_BUILDINFO']: defs.append('BUILD_DATE') defs.append('NAN_BUILDINFO') + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 ) |