fixed typo + switched off pkg-config for codec2

This commit is contained in:
AlexandreRouma 2021-10-02 17:24:23 +02:00
parent b4213ea049
commit 5b7fc417ff
2 changed files with 2 additions and 10 deletions

View File

@ -29,15 +29,7 @@ if (MSVC)
target_link_libraries(m17_decoder PRIVATE libcodec2) target_link_libraries(m17_decoder PRIVATE libcodec2)
else (MSVC) else (MSVC)
find_package(PkgConfig) target_link_libraries(m17_decoder PUBLIC codec2)
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)
# Include it because for some reason pkgconfig doesn't look here? # Include it because for some reason pkgconfig doesn't look here?
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

View File

@ -60,7 +60,7 @@ public:
vfo = sigpath::vfoManager.createVFO(name, ImGui::WaterfallVFO::REF_CENTER, 0, 9600, INPUT_SAMPLE_RATE, 9600, 9600, true); vfo = sigpath::vfoManager.createVFO(name, ImGui::WaterfallVFO::REF_CENTER, 0, 9600, INPUT_SAMPLE_RATE, 9600, 9600, true);
vfo->setSnapInterval(250); vfo->setSnapInterval(250);
// Intialize DSP here // Initialize DSP here
decoder.init(vfo->output, INPUT_SAMPLE_RATE, lsfHandler, this); decoder.init(vfo->output, INPUT_SAMPLE_RATE, lsfHandler, this);
resampWin.init(4000, 4000, audioSampRate); resampWin.init(4000, 4000, audioSampRate);