comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows install DLLs, fix Windows arrow key input handling

This commit is contained in:
Charles J. Cliffe 2016-03-03 20:41:28 -05:00
parent 0f82d24d44
commit a60eae1305
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -734,13 +734,16 @@ ENDIF ()
IF (WIN32 AND NOT BUILD_INSTALLER) IF (WIN32 AND NOT BUILD_INSTALLER)
ADD_DEFINITIONS( ADD_DEFINITIONS(
-DRES_FOLDER="../share/cubicsdr/" -DRES_FOLDER="../share/cubicsdr/"
) )
INSTALL(TARGETS CubicSDR DESTINATION bin) 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} ${CUBICSDR_RESOURCES}
${PROJECT_SOURCE_DIR}/src/CubicSDR.png ${PROJECT_SOURCE_DIR}/src/CubicSDR.png
DESTINATION share/cubicsdr) DESTINATION share/cubicsdr)
ENDIF() ENDIF()
IF (WIN32 AND BUILD_INSTALLER) IF (WIN32 AND BUILD_INSTALLER)

6
src/CubicSDR.cpp
View File

@ -805,11 +805,11 @@ int CubicSDR::FilterEvent(wxEvent& event) {
return -1; return -1;
} }
if (event.GetEventType() == wxEVT_KEY_DOWN) { if (event.GetEventType() == wxEVT_KEY_DOWN || event.GetEventType() == wxEVT_CHAR_HOOK) {
return appframe->OnGlobalKeyDown((wxKeyEvent&)event); 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); return appframe->OnGlobalKeyUp((wxKeyEvent&)event);
} }