diff options
| -rw-r--r-- | SConstruct | 20 | ||||
| -rw-r--r-- | intern/cycles/SConscript | 2 | ||||
| -rw-r--r-- | intern/locale/SConscript | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index b7b27baae5a..4af85f51a4b 100644 --- a/SConstruct +++ b/SConstruct @@ -422,16 +422,22 @@ if not quickie and do_clean: # with _any_ library but since we used a fixed python version this tends to # be most problematic. if env['WITH_BF_PYTHON']: - py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h") - - if not os.path.exists(py_h): - print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n" + found_python_h = found_pyconfig_h = False + for bf_python_inc in env.subst('${BF_PYTHON_INC}').split(): + py_h = os.path.join(Dir(bf_python_inc).abspath, "Python.h") + if os.path.exists(py_h): + found_python_h = True + py_h = os.path.join(Dir(bf_python_inc).abspath, "pyconfig.h") + if os.path.exists(py_h): + found_pyconfig_h = True + + if not (found_python_h and found_pyconfig_h): + print("\nMissing: Python.h and/or pyconfig.h in\"" + env.subst('${BF_PYTHON_INC}') + "\",\n" " Set 'BF_PYTHON_INC' to point " - "to a valid python include path.\n Containing " - "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"") + "to valid python include path(s).\n Containing " + "Python.h and pyconfig.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"") Exit() - del py_h if not os.path.isdir ( B.root_build_dir): 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]) |