diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fdf876..6e0c51b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -734,13 +734,16 @@ ENDIF () IF (WIN32 AND NOT BUILD_INSTALLER) ADD_DEFINITIONS( -DRES_FOLDER="../share/cubicsdr/" - ) - + ) INSTALL(TARGETS CubicSDR DESTINATION bin) - install(FILES + INSTALL(FILES + ${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.dll + ${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/libliquid.dll + DESTINATION bin) + INSTALL(FILES ${CUBICSDR_RESOURCES} ${PROJECT_SOURCE_DIR}/src/CubicSDR.png - DESTINATION share/cubicsdr) + DESTINATION share/cubicsdr) ENDIF() IF (WIN32 AND BUILD_INSTALLER) diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp index 0d877af..4821ee3 100644 --- a/src/CubicSDR.cpp +++ b/src/CubicSDR.cpp @@ -805,11 +805,11 @@ int CubicSDR::FilterEvent(wxEvent& event) { return -1; } - if (event.GetEventType() == wxEVT_KEY_DOWN) { - return appframe->OnGlobalKeyDown((wxKeyEvent&)event); + if (event.GetEventType() == wxEVT_KEY_DOWN || event.GetEventType() == wxEVT_CHAR_HOOK) { + return appframe->OnGlobalKeyDown((wxKeyEvent&)event); } - if (event.GetEventType() == wxEVT_KEY_UP) { + if (event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_CHAR_HOOK) { return appframe->OnGlobalKeyUp((wxKeyEvent&)event); }