diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-14 00:11:07 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-14 00:11:07 +0000 |
| commit | cc84bf9a0219ccc1c23e71f18725aa0a34ef1060 (patch) | |
| tree | 3a0c3e62be937e141dce60dcac7e44d197b97abe /gr-qtgui/src | |
| parent | f38a7682e3eb4a8a2bfc36a1c771cbf3cd1bdd0e (diff) | |
Created configuration file for QWT library. This is in lieu of hand installing
a .pc file per the gr-qtgui README. Component gr-qtgui is still disabled in
configure.ac until testing is complete. Requires qwt files to be included using
the #include <qwt/...> syntax; this is the default for binary installations of
the qwt library. Normal users will user run ./configure without any changes.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4745 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-qtgui/src')
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 8 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/fftdisplay.cc | 8 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/fftdisplay.h | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 8adcd591bf..8314412bfb 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005 Free Software Foundation, Inc. +# Copyright 2004,2005,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -48,7 +48,7 @@ BUILT_SOURCES = \ nodist_qt_examples_SOURCES = \ $(BUILT_SOURCES) - + qt_examples_SOURCES = \ fftdisplay.cc \ qt_examples.cc @@ -57,9 +57,5 @@ qt_examples_LDADD = $(QWT_LIBS) \ $(QT_LIBS) \ $(GNURADIO_CORE_LA) - -qt_examples_LDFLAGS = $(QT_CFLAGS) \ - $(QWT_CFLAGS) - MOSTLYCLEANFILES = \ *~ $(BUILT_SOURCES) diff --git a/gr-qtgui/src/lib/fftdisplay.cc b/gr-qtgui/src/lib/fftdisplay.cc index d701642801..a87e0c0952 100644 --- a/gr-qtgui/src/lib/fftdisplay.cc +++ b/gr-qtgui/src/lib/fftdisplay.cc @@ -1,10 +1,10 @@ #ifndef FFT_DISPLAY_CC #define FFT_DISPLAY_CC -#include <qwt_painter.h> -#include <qwt_plot_canvas.h> -#include <qwt_plot_curve.h> -#include <qwt_scale_engine.h> +#include <qwt/qwt_painter.h> +#include <qwt/qwt_plot_canvas.h> +#include <qwt/qwt_plot_curve.h> +#include <qwt/qwt_scale_engine.h> #include <qapplication.h> #include <fftdisplay.h> diff --git a/gr-qtgui/src/lib/fftdisplay.h b/gr-qtgui/src/lib/fftdisplay.h index c567e88f5b..c58de86284 100644 --- a/gr-qtgui/src/lib/fftdisplay.h +++ b/gr-qtgui/src/lib/fftdisplay.h @@ -6,7 +6,7 @@ #include <vector> #include <qwidget.h> -#include <qwt_plot.h> +#include <qwt/qwt_plot.h> #include <qevent.h> class fft_display_event:public QCustomEvent{ |