[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53997] trunk/blender/SConstruct: revert scons fix, it is necessary after all

Antony Riakiotakis kalast at gmail.com
Tue Jan 22 15:25:21 CET 2013


Revision: 53997
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53997
Author:   psy-fi
Date:     2013-01-22 14:25:20 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
revert scons fix, it is necessary after all

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-01-22 14:14:30 UTC (rev 53996)
+++ trunk/blender/SConstruct	2013-01-22 14:25:20 UTC (rev 53997)
@@ -438,15 +438,17 @@
 # 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".
 




More information about the Bf-blender-cvs mailing list