diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /gr-usrp/src | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
Merge branch 'master' into constell_obj
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'gr-usrp/src')
| -rw-r--r-- | gr-usrp/src/Makefile.am | 1 | ||||
| -rw-r--r-- | gr-usrp/src/usrp_swig.i | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index a0c6b7a82e..29cedc96aa 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -86,6 +86,7 @@ usrp_swig_pythondir_category = \ # additional arguments to the SWIG command usrp_swig_swig_args = \ + $(DEFAULT_INCLUDES) \ $(USRP_INCLUDES) # additional libraries for linking with the SWIG-generated library diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i index b1797d7589..80d59abc98 100644 --- a/gr-usrp/src/usrp_swig.i +++ b/gr-usrp/src/usrp_swig.i @@ -23,6 +23,7 @@ %include "gnuradio.i" // the common stuff %{ +#include "config.h" // for NOMINMAX #include <vector> %} |