diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2013-08-14 17:07:32 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2013-08-14 17:07:32 +0000 |
| commit | e67102e1102e8ce04cff51f14cc4fa60f786a9ea (patch) | |
| tree | 311ca4851c776b28fd6ee18330a4cfac61576d6d /comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro | |
| parent | Update gnulib to stable release of 20130805 (diff) | |
- Update to 0.96 .
- Remove now obsolete MAKE_JOBS_SAFE.
- Remove 7.x cruft.
Notes
Notes:
svn path=/head/; revision=324740
Diffstat (limited to 'comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro')
| -rw-r--r-- | comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro | 90 |
1 files changed, 52 insertions, 38 deletions
diff --git a/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro b/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro index 35f6d41eca81..17bf51327f46 100644 --- a/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro +++ b/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro @@ -1,48 +1,62 @@ --- spectrum-viewer/spectrum-viewer.pro.orig +++ spectrum-viewer/spectrum-viewer.pro -@@ -63,24 +63,27 @@ LIBS += -lsamplerate +@@ -67,32 +67,33 @@ LIBS += -lsamplerate #} #for fedora use the second set -unix { -- HEADERS += ../input/dabstick.h -- SOURCES += ../input/dabstick.cpp -- INCLUDEPATH += /usr/include/qwt5-qt4 -- INCLUDEPATH += /usr/include/ -- INCLUDEPATH += /usr/local/include -- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl +-HEADERS += ../input/dabstick.h +-SOURCES += ../input/dabstick.cpp +-DEPENDPATH += ../scopes-qwt6 +-INCLUDEPATH += ../scopes-qwt6 +-HEADERS += ../scopes-qwt6/scope.h +-SOURCES += ../scopes-qwt6/scope.cpp +-INCLUDEPATH += /usr/include/qwt +-INCLUDEPATH += /usr/include/ +-INCLUDEPATH += /usr/local/include +-LIBS+= -lqwt -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl -} -+#unix { -+# HEADERS += ../input/dabstick.h -+# SOURCES += ../input/dabstick.cpp -+# INCLUDEPATH += /usr/include/qwt5-qt4 -+# INCLUDEPATH += /usr/include/ -+# INCLUDEPATH += /usr/local/include -+# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl -+#} - - #for FreeBSD use the third set (thanks Juergen Lock) +- +-#for FreeBSD use the third set (thanks Juergen Lock) -#unix { --# QMAKE_CXXFLAGS += -D__FREEBSD__ --# HEADERS += ../input/dabstick.h --# SOURCES += ../input/dabstick.cpp --# INCLUDEPATH += ${LOCALBASE}/include/qwt --# INCLUDEPATH += ${LOCALBASE}/include --# INCLUDEPATH += /usr/include/ --# QMAKE_LIBDIR += ${LOCALBASE}/lib --# LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr --#} +-#QMAKE_CXXFLAGS += -D__FREEBSD__ +-#HEADERS += ../input/dabstick.h +-#SOURCES += ../input/dabstick.cpp ++#unix { ++#HEADERS += ../input/dabstick.h ++#SOURCES += ../input/dabstick.cpp + #DEPENDPATH += ../scopes-qwt6 + #INCLUDEPATH += ../scopes-qwt6 +-#HEADERS += ../scopes-qwt6/scope.h +-#SOURCES += ../scopes-qwt6/scope.cpp +-#INCLUDEPATH += ${LOCALBASE}/include/qwt +-#INCLUDEPATH += ${LOCALBASE}/include +-#INCLUDEPATH += /usr/include/ +-#QMAKE_LIBDIR += ${LOCALBASE}/lib +-#LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr ++#HEADERS += ../scopes-qwt6/scope.h ++#SOURCES += ../scopes-qwt6/scope.cpp ++#INCLUDEPATH += /usr/include/qwt ++#INCLUDEPATH += /usr/include/ ++#INCLUDEPATH += /usr/local/include ++#LIBS+= -lqwt -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl + #} +-# ++ ++#for FreeBSD use the third set (thanks Juergen Lock) +unix { -+ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2 -+ HEADERS += ../input/dabstick.h -+ SOURCES += ../input/dabstick.cpp -+ INCLUDEPATH += ${LOCALBASE}/include/qwt -+ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 -+ INCLUDEPATH += ${LOCALBASE}/include -+ INCLUDEPATH += /usr/include/ -+ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 -+ QMAKE_LIBDIR += ${LOCALBASE}/lib -+ LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr ++QMAKE_CXXFLAGS += -D__FREEBSD__ ++HEADERS += ../input/dabstick.h ++SOURCES += ../input/dabstick.cpp ++DEPENDPATH += ../scopes-qwt5 ++INCLUDEPATH += ../scopes-qwt5 ++HEADERS += ../scopes-qwt5/scope.h ++SOURCES += ../scopes-qwt5/scope.cpp ++INCLUDEPATH += ${LOCALBASE}/include/qwt ++INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++INCLUDEPATH += ${LOCALBASE}/include ++INCLUDEPATH += /usr/include/ ++QMAKE_LIBDIR += ${LOCALBASE}/lib ++LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr +} - # ++ |