diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/SConstruct | 4 | ||||
| -rw-r--r-- | numpy/core/include/numpy/numpyconfig.h.in | 23 | ||||
| -rw-r--r-- | numpy/core/setupscons.py | 11 |
3 files changed, 32 insertions, 6 deletions
diff --git a/numpy/core/SConstruct b/numpy/core/SConstruct index bffdf0d5d..174627f07 100644 --- a/numpy/core/SConstruct +++ b/numpy/core/SConstruct @@ -1,4 +1,4 @@ -# Last Change: Sun Jan 06 07:00 PM 2008 J +# Last Change: Sun Jan 06 10:00 PM 2008 J # vim:syntax=python import os import sys @@ -143,7 +143,7 @@ else: build_blasdot = 0 config.Finish() -write_info(env) +#write_info(env) #========== # Build diff --git a/numpy/core/include/numpy/numpyconfig.h.in b/numpy/core/include/numpy/numpyconfig.h.in new file mode 100644 index 000000000..477989964 --- /dev/null +++ b/numpy/core/include/numpy/numpyconfig.h.in @@ -0,0 +1,23 @@ +#define NPY_SIZEOF_SHORT @SIZEOF_SHORT@ +#define NPY_SIZEOF_INT @SIZEOF_INT@ +#define NPY_SIZEOF_LONG @SIZEOF_LONG@ +#define NPY_SIZEOF_FLOAT @SIZEOF_FLOAT@ +#define NPY_SIZEOF_DOUBLE @SIZEOF_DOUBLE@ +#define NPY_SIZEOF_LONGDOUBLE @SIZEOF_LONG_DOUBLE@ +#define NPY_SIZEOF_PY_INTPTR_T @SIZEOF_PY_INTPTR_T@ + +#define NPY_NOSMP @NPY_NOSMP@ + +/* XXX: this has really nothing to do in a config file... */ +#define NPY_MATHLIB @MATHLIB@ + +/* XXX: this has to be done outside config files !!!! */ +#ifdef PY_LONG_LONG + #define NPY_SIZEOF_LONGLONG @SIZEOF_PY_LONG_LONG@ + #define NPY_SIZEOF_PY_LONG_LONG @SIZEOF_PY_LONG_LONG@ +#endif + +#ifndef CHAR_BIT + #error Configuration for undefined CHAR_BIT is not supported, contact the maintainter + #define CHAR_BIT @CHAR_BIT@ +#endif diff --git a/numpy/core/setupscons.py b/numpy/core/setupscons.py index 5b79d2501..7118b1dab 100644 --- a/numpy/core/setupscons.py +++ b/numpy/core/setupscons.py @@ -2,8 +2,11 @@ import os import sys import glob from os.path import join, basename + from numpy.distutils import log +from numscons import get_scons_build_dir + def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration,dot_join from numpy.distutils.system_info import get_info, default_lib_dirs @@ -33,7 +36,7 @@ def configuration(parent_package='',top_path=None): # Add generated files to distutils... def add_config_header(): - scons_build_dir = config.get_scons_build_dir() + scons_build_dir = get_scons_build_dir() # XXX: I really have to think about how to communicate path info # between scons and distutils, and set the options at one single # location. @@ -43,7 +46,7 @@ def configuration(parent_package='',top_path=None): config.numpy_include_dirs.append(incl_dir) def add_numpyconfig_header(): - scons_build_dir = config.get_scons_build_dir() + scons_build_dir = get_scons_build_dir() # XXX: I really have to think about how to communicate path info # between scons and distutils, and set the options at one single # location. @@ -54,7 +57,7 @@ def configuration(parent_package='',top_path=None): config.add_data_files((header_dir, target)) def add_array_api(): - scons_build_dir = config.get_scons_build_dir() + scons_build_dir = get_scons_build_dir() # XXX: I really have to think about how to communicate path info # between scons and distutils, and set the options at one single # location. @@ -64,7 +67,7 @@ def configuration(parent_package='',top_path=None): (header_dir, t_file)) def add_ufunc_api(): - scons_build_dir = config.get_scons_build_dir() + scons_build_dir = get_scons_build_dir() # XXX: I really have to think about how to communicate path info # between scons and distutils, and set the options at one single # location. |