From ac154e5ff9f5018b8a2b30ce90cb5a12b7a81855 Mon Sep 17 00:00:00 2001 From: "dev@dev.com" Date: Sat, 15 Jan 2022 21:13:10 +0800 Subject: [PATCH] windows Ok --- specwidget.h | 6 ------ uhdspectrum.pro | 12 ++++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/specwidget.h b/specwidget.h index 4ea79d5..93692a3 100644 --- a/specwidget.h +++ b/specwidget.h @@ -28,13 +28,7 @@ #include #include #include - -#ifdef Q_OS_WINDOWS -#include "uhd_device_win32.h" -#endif -#ifdef Q_OS_LINUX #include "uhd_device.h" -#endif #include "stdout_watcher.h" namespace Ui { class specWidget; diff --git a/uhdspectrum.pro b/uhdspectrum.pro index 2af1df6..14eb9a8 100644 --- a/uhdspectrum.pro +++ b/uhdspectrum.pro @@ -23,7 +23,8 @@ SOURCES += \ qtgui/meter.cpp \ qtgui/plotter.cpp \ specwidget.cpp \ - stdout_watcher.cpp + stdout_watcher.cpp \ + uhd_device.cpp HEADERS += \ qtgui/bookmarks.h \ @@ -33,7 +34,8 @@ HEADERS += \ qtgui/meter.h \ qtgui/plotter.h \ specwidget.h \ - stdout_watcher.h + stdout_watcher.h \ + uhd_device.h FORMS += \ specwidget.ui @@ -48,13 +50,7 @@ win32{ } INCLUDEPATH +="$(UHD_PKG_PATH)/include" LIBS += -L"$(UHD_PKG_PATH)/lib" - SOURCES += - HEADERS += }else { -SOURCES += \ - uhd_device.cpp -HEADERS += \ - uhd_device.h LIBS+=-lfftw3 -lpthread -lboost_system } -- GitLab