From 3f4bde9228229a5f5b1c3fac49eab43da06f9dc3 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 31 Mar 2014 03:11:07 +0000 Subject: [PATCH] Fix qmake file so that qmake builds still operate for those who prefer QtCreator as a full time build environment. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3970 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- qmake_only/svnversion.h | 4 ++++ wsjtx.pro | 25 ++++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 qmake_only/svnversion.h diff --git a/qmake_only/svnversion.h b/qmake_only/svnversion.h new file mode 100644 index 000000000..3f14daf7c --- /dev/null +++ b/qmake_only/svnversion.h @@ -0,0 +1,4 @@ +/* This is a dummy file required to make the qmake build compatible + with the CMake build. */ + +#define WSJTX_STRINGIZE(X) diff --git a/wsjtx.pro b/wsjtx.pro index 279c067e4..f9644a2a0 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -43,6 +43,7 @@ SOURCES += \ logbook/countriesworked.cpp \ logbook/logbook.cpp \ astro.cpp \ + Radio.cpp \ NetworkServerLookup.cpp \ Transceiver.cpp \ TransceiverBase.cpp \ @@ -52,9 +53,16 @@ SOURCES += \ HRDTransceiver.cpp \ DXLabSuiteCommanderTransceiver.cpp \ HamlibTransceiver.cpp \ - BandData.cpp \ + FrequencyLineEdit.cpp \ + Bands.cpp \ + FrequencyList.cpp \ + StationList.cpp \ + ForeignKeyDelegate.cpp \ + FrequencyItemDelegate.cpp \ + LiveFrequencyValidator.cpp \ Configuration.cpp \ psk_reporter.cpp \ + AudioDevice.cpp \ Modulator.cpp \ Detector.cpp \ logqso.cpp \ @@ -64,6 +72,7 @@ SOURCES += \ soundin.cpp \ meterwidget.cpp \ signalmeter.cpp \ + WFPalette.cpp \ plotter.cpp \ widegraph.cpp \ about.cpp \ @@ -73,14 +82,14 @@ SOURCES += \ HEADERS += qt_helpers.hpp \ pimpl_h.hpp pimpl_impl.hpp \ - NetworkServerLookup.hpp \ + Radio.hpp NetworkServerLookup.hpp \ mainwindow.h plotter.h soundin.h soundout.h astro.h \ - about.h widegraph.h getfile.h \ + about.h WFPalette.hpp widegraph.h getfile.h \ commons.h sleep.h displaytext.h logqso.h \ - AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \ + Bands.hpp FrequencyList.hpp StationList.hpp ForeignKeyDelegate.hpp FrequencyItemDelegate.hpp LiveFrequencyValidator.hpp \ + FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \ Transceiver.hpp TransceiverBase.hpp TransceiverFactory.hpp PollingTransceiver.hpp \ EmulateSplitTransceiver.hpp DXLabSuiteCommanderTransceiver.hpp HamlibTransceiver.hpp \ - BandData.hpp \ Configuration.hpp \ signalmeter.h \ meterwidget.h \ @@ -89,13 +98,15 @@ HEADERS += qt_helpers.hpp \ logbook/countriesworked.h \ logbook/adif.h +INCLUDEPATH += qmake_only + win32 { SOURCES += killbyname.cpp OmniRigTransceiver.cpp HEADERS += OmniRigTransceiver.hpp } FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \ - logqso.ui + logqso.ui wf_palette_design_dialog.ui RC_FILE = wsjtx.rc @@ -109,7 +120,7 @@ win32 { INCLUDEPATH += ${HAMLIB_DIR}/include LIBS += -L${HAMLIB_DIR}/lib -lhamlib #LIBS += -L${HAMLIB_DIR}/lib -lhamlib -LIBS += -L./lib -ljt9 +LIBS += -L./lib -lastro -ljt9 LIBS += -L. -lfftw3f_win LIBS += -lwsock32 LIBS += $$system($$F90 -print-file-name=libgfortran.a)