From 5b7fc417ffa56fbe3b8fb1c6ac61f433a054defb Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sat, 2 Oct 2021 17:24:23 +0200 Subject: [PATCH] fixed typo + switched off pkg-config for codec2 --- m17_decoder/CMakeLists.txt | 10 +--------- m17_decoder/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/m17_decoder/CMakeLists.txt b/m17_decoder/CMakeLists.txt index e9362fd7..4cf87558 100644 --- a/m17_decoder/CMakeLists.txt +++ b/m17_decoder/CMakeLists.txt @@ -29,15 +29,7 @@ if (MSVC) target_link_libraries(m17_decoder PRIVATE libcodec2) else (MSVC) - find_package(PkgConfig) - - pkg_check_modules(LIBCODEC2 REQUIRED codec2) - - target_include_directories(m17_decoder PUBLIC ${LIBCODEC2_INCLUDE_DIRS}) - target_link_directories(m17_decoder PUBLIC ${LIBCODEC2_LIBRARY_DIRS}) - target_link_libraries(m17_decoder PUBLIC ${LIBCODEC2_LIBRARIES}) - - target_link_libraries(m17_decoder PUBLIC correct) + target_link_libraries(m17_decoder PUBLIC codec2) # Include it because for some reason pkgconfig doesn't look here? if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/m17_decoder/src/main.cpp b/m17_decoder/src/main.cpp index 8a1de89e..941db5c5 100644 --- a/m17_decoder/src/main.cpp +++ b/m17_decoder/src/main.cpp @@ -60,7 +60,7 @@ public: vfo = sigpath::vfoManager.createVFO(name, ImGui::WaterfallVFO::REF_CENTER, 0, 9600, INPUT_SAMPLE_RATE, 9600, 9600, true); vfo->setSnapInterval(250); - // Intialize DSP here + // Initialize DSP here decoder.init(vfo->output, INPUT_SAMPLE_RATE, lsfHandler, this); resampWin.init(4000, 4000, audioSampRate);