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/nodes/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/nodes/SConscript')
-rw-r--r-- | source/blender/nodes/SConscript | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 771ce42e1dc..01319dc1eb4 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -38,6 +38,13 @@ if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ' + env['BF_QUICKTIME_INC'] +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 ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] ) env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) |