diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-10-01 20:32:33 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-10-01 20:32:33 +0400 |
| commit | 15d81b21f6db8656b4784729b307a0a147c8e362 (patch) | |
| tree | fce19a3d2dec5d75984407d44cc8f8badc871f4c /source/blender/editors/space_node/SConscript | |
| parent | 37a729cb1d3aa4957a40f30267bb784c2376cf89 (diff) | |
Fixing scons compile on windows.
Since bli_threads.h now includes pthreads directly, we need to had instructions in SConscripts everywhere for proper include path.
Frankly, I feel like this should be done in a global manner and not in a per lib fashion, but that is for another day.
This commit also fixes more missing properties
Diffstat (limited to 'source/blender/editors/space_node/SConscript')
| -rw-r--r-- | source/blender/editors/space_node/SConscript | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 5453aa7dd44..fd0dfe83852 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -14,5 +14,12 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['CC'] == 'gcc': #cf.append('-Werror') pass - + +if env['OURPLATFORM'] == 'linux2': + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf ) |