From 86d746a1b946e2f73c3bf7143278d848bebcc466 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 19 Feb 2021 15:12:05 -0500 Subject: [PATCH] Make MAP65 buildable (from within QtCreator) on the K1JT shack computer. --- CMakeLists.txt | 3 ++- about.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 098a6d7ac..7cc4693d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,7 @@ include_directories (${fftw3f_INCLUDES}) if (WIN32) find_library (usb_RUNTIME NAMES usb0 PATH_SUFFIXES bin) + set (CMAKE_INSTALL_PREFIX C:/MAP65) endif (WIN32) # Qt5 setup @@ -111,7 +112,7 @@ add_subdirectory (libm65) qt5_wrap_ui (GENUISRCS ${UISRCS}) add_executable (map65 ${CXXSRCS} ${CSRCS} ${GENUISRCS} map65.rc) -target_link_libraries (map65 m65impl ${fftw3f_LIBRARIES} ${CMAKE_CURRENT_SOURCE_DIR}/palir-02.dll ${CMAKE_CURRENT_SOURCE_DIR}/libusb.a ${CMAKE_CURRENT_SOURCE_DIR}/libwsock32.a) +target_link_libraries (map65 m65impl ${fftw3f_LIBRARIES} ${CMAKE_CURRENT_SOURCE_DIR}/palir-02.dll ${CMAKE_CURRENT_SOURCE_DIR}/libusb0.dll ${CMAKE_CURRENT_SOURCE_DIR}/libwsock32.a) if (WIN32) target_link_libraries (map65) diff --git a/about.cpp b/about.cpp index 47815a617..79b03168a 100644 --- a/about.cpp +++ b/about.cpp @@ -12,7 +12,7 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) : m_Str += "MAP65 implements a wideband polarization-matching receiver
"; m_Str += "for the JT65 protocol, with a matching transmitting facility.
"; m_Str += "It is primarily intended for amateur radio EME communication.

"; - m_Str += "Copyright 2001-2014 by Joe Taylor, K1JT. Additional
"; + m_Str += "Copyright 2001-2021 by Joe Taylor, K1JT. Additional
"; m_Str += "acknowledgments are contained in the source code.
"; ui->labelTxt->setText(m_Str); }