diff options
| author | Eric Jones <eric@enthought.com> | 2002-10-13 06:04:06 +0000 |
|---|---|---|
| committer | Eric Jones <eric@enthought.com> | 2002-10-13 06:04:06 +0000 |
| commit | f190948b11b4ec4b642c2ba8716804d9613e4a0f (patch) | |
| tree | b6038c8829b34f06bd43a0dcbe339c48f32ecf9f /weave/ext_tools.py | |
| parent | 59ef24c5db762d648c6f36032a7b12206f8f90e3 (diff) | |
| download | numpy-f190948b11b4ec4b642c2ba8716804d9613e4a0f.tar.gz | |
cleaned up a few examples.
added support for wxPython on Unix. Configuration information is gathered
by running wx-config with the proper flags specified (--cxxflags, --ldflags,
--libs, --gl-libs) to find libraries and include directories needed. I
wish we could query the wxPython module directly and ask it for this
information, as it would be much more robust. Currently we look in the
/usr/lib/wxPython directory for wx stuff. If it isn't there, we're out of
luck. The wxPython development files are required for this stuff to work.
Windows is actually worse. I've updated the config files to support
wx2.3.3.1. Is there a way to discover build type (ansi/unicode) from the
wxPython library? Right now, it is hard coded to use the Unicode version
of the DLLs. As for macros and libraries, I borrowed them from the make
file in the wx2.3.3.1/src/make.env file. The wxPython devel package must
be installed the c:\ directory for all of this to work.
If people use alternative directories in either case, they'll have to hand
edit the wx_spec file to deal with this.
Diffstat (limited to 'weave/ext_tools.py')
| -rw-r--r-- | weave/ext_tools.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/weave/ext_tools.py b/weave/ext_tools.py index 436a068c5..6d21e11ef 100644 --- a/weave/ext_tools.py +++ b/weave/ext_tools.py @@ -307,10 +307,15 @@ class ext_module: # add internally specified macros, includes, etc. to the key words # values of the same names so that distutils will use them. - kw['define_macros'] = kw.get('define_macros',[]) + info.define_macros() + kw['define_macros'] = kw.get('define_macros',[]) + \ + info.define_macros() kw['include_dirs'] = kw.get('include_dirs',[]) + info.include_dirs() kw['libraries'] = kw.get('libraries',[]) + info.libraries() kw['library_dirs'] = kw.get('library_dirs',[]) + info.library_dirs() + kw['extra_compile_args'] = kw.get('extra_compile_args',[]) + \ + info.extra_compile_args() + kw['extra_link_args'] = kw.get('extra_link_args',[]) + \ + info.extra_link_args() file = self.generate_file(location=location) # This is needed so that files build correctly even when different |