mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-21 15:51:47 -05:00
Compare commits
No commits in common. "9f957696088a6075f172f6dcb8adbd17c5dd200f" and "86f4a5bc690fa40c68044a44135f57d2c595ffbc" have entirely different histories.
9f95769608
...
86f4a5bc69
6
.github/workflows/mac.yml
vendored
6
.github/workflows/mac.yml
vendored
@ -9,12 +9,16 @@ on:
|
||||
|
||||
jobs:
|
||||
build_mac_x64:
|
||||
runs-on: macos-12
|
||||
runs-on: macos-13
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: true
|
||||
fetch-depth: 0
|
||||
- name: Update brew
|
||||
run: brew update
|
||||
- name: Install brew packages
|
||||
run: brew install nasm subversion
|
||||
- name: Install SDRplay API
|
||||
run: |
|
||||
wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg
|
||||
|
@ -36,7 +36,7 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
|
||||
set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
|
||||
set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
|
||||
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
|
||||
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_mac-${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
|
||||
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
|
||||
set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
|
||||
|
||||
# copy SoapySDR Modules
|
||||
@ -175,7 +175,7 @@ elseif(WIN32 OR MINGW)
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${fftw3f_dll}" "${SDRANGEL_BINARY_BIN_DIR}/"
|
||||
)
|
||||
endforeach(fftw3f_dll)
|
||||
|
||||
|
||||
file(GLOB LIBUSB_DLLS "${LIBUSB_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||
foreach(libusb_dll ${LIBUSB_DLLS})
|
||||
get_filename_component(libusb_dll_name "${libusb_dll}" NAME)
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
// Map main table column numbers to combo box indices
|
||||
std::vector<int> PagerDemodNotificationDialog::m_columnMap = {
|
||||
PagerDemodSettings::MESSAGE_COL_ADDRESS, PagerDemodSettings::MESSAGE_COL_MESSAGE, PagerDemodSettings::MESSAGE_COL_ALPHA, PagerDemodSettings::MESSAGE_COL_NUMERIC
|
||||
PagerDemodSettings::MESSAGE_COL_ADDRESS, PagerDemodSettings::MESSAGE_COL_MESSAGE
|
||||
};
|
||||
|
||||
PagerDemodNotificationDialog::PagerDemodNotificationDialog(PagerDemodSettings *settings,
|
||||
@ -132,8 +132,6 @@ void PagerDemodNotificationDialog::addRow(PagerDemodSettings::NotificationSettin
|
||||
|
||||
match->addItem("Address");
|
||||
match->addItem("Message");
|
||||
match->addItem("Alpha");
|
||||
match->addItem("Numeric");
|
||||
|
||||
QTableWidgetItem *regExpItem = new QTableWidgetItem();
|
||||
QTableWidgetItem *speechItem = new QTableWidgetItem();
|
||||
|
Loading…
Reference in New Issue
Block a user