diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-12 22:31:15 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-12 22:31:15 +0400 |
| commit | e811a2d0ffe1e15190dd210d13ef3b50afc37d90 (patch) | |
| tree | e6f19277d788c83f1014faa943b0494094a3ea9f /intern | |
| parent | f0caab41b22744c97352a7f710f7dde4c163194f (diff) | |
Fix to allow several include dirs for python under scons build system (needed with new py3.3 debian-like packages).
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/SConscript | 2 | ||||
| -rw-r--r-- | intern/locale/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index c0e0353d37d..c7d7720e0fe 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -32,7 +32,7 @@ incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.sp incs.extend('#extern/glew/include #intern/mikktspace'.split()) incs.append(cycles['BF_OIIO_INC']) incs.append(cycles['BF_BOOST_INC']) -incs.append(cycles['BF_PYTHON_INC']) +incs.extend(cycles['BF_PYTHON_INC'].split()) if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split()) diff --git a/intern/locale/SConscript b/intern/locale/SConscript index 4a1357b76e4..df745f093ea 100644 --- a/intern/locale/SConscript +++ b/intern/locale/SConscript @@ -11,4 +11,4 @@ if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') incs += ' ' + env['BF_BOOST_INC'] -env.BlenderLib( 'bf_intern_locale', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) +env.BlenderLib( 'bf_intern_locale', sources, Split(incs), defs, libtype=['intern','player'], priority=[10, 185]) |