summaryrefslogtreecommitdiff
path: root/gr-usrp
diff options
context:
space:
mode:
authorDon Ward <don2387ward@sprynet.com>2011-03-25 11:53:04 -0400
committerTom Rondeau <trondeau@vt.edu>2011-03-25 11:53:04 -0400
commit64dac6a1f62fb8484e879f0d20ee60bc02da179c (patch)
tree0e0ab0ad264a5af0d0f6256260295b8563179da5 /gr-usrp
parent34313eace681a82e230c38a8cd26c0001ee823ea (diff)
Fixing missing include files and various other patches for Windows build issues.
Diffstat (limited to 'gr-usrp')
-rw-r--r--gr-usrp/src/Makefile.am1
-rw-r--r--gr-usrp/src/usrp_swig.i1
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>
%}