Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-01-22 18:25:20 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-01-22 18:25:20 +0400
commitf758c7bd25245ae0d6d286f4ff0c10460a2763e3 (patch)
tree1908e841d61fb29eb4d4ce829cd144d7564f1671 /SConstruct
parent598d84efedbea06dc28a95dd7fe58c1d3577a41d (diff)
revert scons fix, it is necessary after all
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct8
1 files changed, 5 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index e4cbb9cd470..b7665d14228 100644
--- a/SConstruct
+++ b/SConstruct
@@ -438,15 +438,17 @@ 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']:
- found_python_h = False
+ 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):
- print("""\nMissing: Python.h in "%s"
+ if not (found_python_h and found_pyconfig_h):
+ print("""\nMissing: Python.h and/or pyconfig.h in "%s"
Set 'BF_PYTHON_INC' to point to valid include path(s),
containing Python.h and pyconfig.h for Python version "%s".