Merge branch 'master' into winbuild-updates

Merge pull request #950 from classabbyamp/fix-build
fix build errors caused by commented parameters in function declarations
2023-04-13 21:22:08 -04:00 · 2023-03-29 01:57:08 -04:00 · 2023-03-29 01:50:22 -04:00 · 2023-03-29 01:45:11 -04:00 · 2022-05-08 16:15:28 -04:00 · 2017-08-03 15:38:01 +02:00
3 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -689,7 +689,7 @@ IF (NOT BUNDLE_APP)
        configure_files(${CUBICSDR_HEADER_IMAGE_DIR} ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} ${CUBICSDR_HEADER_IMAGE_FILE})
    ENDIF()
    add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
-    target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
+    target_link_libraries(CubicSDR ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
 ENDIF (NOT BUNDLE_APP)

 IF (MSVC)
--- a/src/visual/TuningCanvas.cpp
+++ b/src/visual/TuningCanvas.cpp
@ -269,7 +269,7 @@ void TuningCanvas::StepTuner(ActiveState state, TuningDirection tuningDir, int d
    }
 }

-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
+void TuningCanvas::OnIdle(wxIdleEvent & event) {
    if (mouseTracker.mouseDown()) {
        if (downState != TUNING_HOVER_NONE) {
            dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
--- a/src/visual/WaterfallCanvas.cpp
+++ b/src/visual/WaterfallCanvas.cpp
@ -482,7 +482,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
    }

 }
-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
+void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
    processInputQueue();
    Refresh();
 }
Author	SHA1	Message	Date
Charles J. Cliffe	674bfa1246	Merge branch 'master' into winbuild-updates	2023-04-13 21:22:08 -04:00
Charles J. Cliffe	f9766ceaf0	Merge pull request #950 from classabbyamp/fix-build fix build errors caused by commented parameters in function declarations	2023-03-29 01:57:08 -04:00
Charles J. Cliffe	b12084d2e5	Merge branch 'master' into fix-build	2023-03-29 01:50:22 -04:00
Charles J. Cliffe	6c1cfcad65	Merge pull request #564 from f4grx/fix-liquid-libs Avoid build failure when liquid-dsp is not in a default libdir	2023-03-29 01:45:11 -04:00
classabbyamp	521f62900a	fix build errors caused by commented parameters in function declarations	2022-05-08 16:15:28 -04:00
Sebastien F4GRX	aa29aa41c6	Avoid build failure when liquid-dsp is not in a default libdir	2017-08-03 15:38:01 +02:00