From 7fe1e9d204e90407ba9ccd5fd17e20587df374c4 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 22 Jan 2013 11:37:12 +0000 Subject: scons compile fix for Ton's matcaps work --- SConstruct | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 3b1be71aebd..b7665d14228 100644 --- a/SConstruct +++ b/SConstruct @@ -574,6 +574,23 @@ data_to_c_simple("release/datafiles/brushicons/thumb.png") data_to_c_simple("release/datafiles/brushicons/twist.png") data_to_c_simple("release/datafiles/brushicons/vertexdraw.png") +data_to_c_simple("release/datafiles/matcaps/mc01.jpg") +data_to_c_simple("release/datafiles/matcaps/mc02.jpg") +data_to_c_simple("release/datafiles/matcaps/mc03.jpg") +data_to_c_simple("release/datafiles/matcaps/mc04.jpg") +data_to_c_simple("release/datafiles/matcaps/mc05.jpg") +data_to_c_simple("release/datafiles/matcaps/mc06.jpg") +data_to_c_simple("release/datafiles/matcaps/mc07.jpg") +data_to_c_simple("release/datafiles/matcaps/mc08.jpg") +data_to_c_simple("release/datafiles/matcaps/mc09.jpg") +data_to_c_simple("release/datafiles/matcaps/mc10.jpg") +data_to_c_simple("release/datafiles/matcaps/mc11.jpg") +data_to_c_simple("release/datafiles/matcaps/mc12.jpg") +data_to_c_simple("release/datafiles/matcaps/mc13.jpg") +data_to_c_simple("release/datafiles/matcaps/mc14.jpg") +data_to_c_simple("release/datafiles/matcaps/mc15.jpg") +data_to_c_simple("release/datafiles/matcaps/mc16.jpg") + ##### END DATAFILES ########## Help(opts.GenerateHelpText(env)) -- cgit v1.2.3 From 598d84efedbea06dc28a95dd7fe58c1d3577a41d Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 22 Jan 2013 14:14:30 +0000 Subject: ubuntu 12.10 does not have pyconfig.h in include directory causing scons to fail. Omitting since it looks like cmake only uses Python.h too --- SConstruct | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index b7665d14228..e4cbb9cd470 100644 --- a/SConstruct +++ b/SConstruct @@ -438,17 +438,15 @@ 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 = found_pyconfig_h = False + found_python_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 "%s" + if not (found_python_h): + print("""\nMissing: Python.h in "%s" Set 'BF_PYTHON_INC' to point to valid include path(s), containing Python.h and pyconfig.h for Python version "%s". -- cgit v1.2.3 From f758c7bd25245ae0d6d286f4ff0c10460a2763e3 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 22 Jan 2013 14:25:20 +0000 Subject: revert scons fix, it is necessary after all --- SConstruct | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'SConstruct') 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". -- cgit v1.2.3