w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-21 11:38:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change the build scripts so that MAP65 is automatically built again, on Windows.

Browse Source
This commit is contained in:
Joe Taylor 2023-03-09 14:25:47 -05:00
parent 715e8d1b14
commit 4baca1ca60
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1431,7 +1431,7 @@ endif (${OPENMP_FOUND} OR APPLE)
if (WIN32)
find_package (Portaudio REQUIRED)
# build map65 OR qmap
# add_subdirectory (map65)
add_subdirectory (map65)
add_subdirectory (qmap)
endif ()

2
qmap/CMakeLists.txt
View File

@ -40,7 +40,7 @@ qt5_wrap_ui (qmap_GENUISRCS ${qmap_UISRCS})
add_executable (qmap ${qmap_CXXSRCS} ${qmap_CSRCS} ${qmap_GENUISRCS} qmap.rc)
target_include_directories (qmap PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS})
target_link_libraries (qmap wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Usb::Usb)
target_link_libraries (qmap wsjt_qt qmap_impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Usb::Usb)
if (WSJT_CREATE_WINMAIN)
set_target_properties (qmap PROPERTIES WIN32_EXECUTABLE ON)

4
qmap/libqmap/CMakeLists.txt
View File

@ -49,6 +49,6 @@ set_property (SOURCE ${libq65_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CM
#
# build our targets
#
add_library (m65impl STATIC ${libq65_FSRCS} ${libq65_CSRCS} ${libq65_CXXSRCS})
target_link_libraries (m65impl wsjt_fort wsjt_cxx Qt5::Core)
add_library (qmap_impl STATIC ${libq65_FSRCS} ${libq65_CSRCS} ${libq65_CXXSRCS})
target_link_libraries (qmap_impl wsjt_fort wsjt_cxx Qt5::Core)