VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

Add codec2 library for Windows. Export AudioResampler class.

Browse Source
This commit is contained in:
Jon Beniston 2020-08-29 18:12:56 +01:00
parent a88b2074c4
commit fbb848d940
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -225,6 +225,11 @@ elseif (WIN32)
set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv" CACHE INTERNAL "") set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv" CACHE INTERNAL "")
set(PKG_CONFIG_EXECUTABLE "${EXTERNAL_LIBRARY_FOLDER}/pkg-config-lite/bin/pkg-config.exe" CACHE INTERNAL "") set(PKG_CONFIG_EXECUTABLE "${EXTERNAL_LIBRARY_FOLDER}/pkg-config-lite/bin/pkg-config.exe" CACHE INTERNAL "")
set(CODEC2_FOUND ON CACHE INTERNAL "")
set(CODEC2_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/codec2/include" CACHE INTERNAL "")
set(CODEC2_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/codec2/lib/codec2.lib" CACHE INTERNAL "")
set(CODEC2_DLL_DIR "${EXTERNAL_LIBRARY_FOLDER}/codec2/lib" CACHE INTERNAL "")
# ffmpeg # ffmpeg
set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/ffmpeg/include" CACHE INTERNAL "") set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/ffmpeg/include" CACHE INTERNAL "")
set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/ffmpeg/bin" CACHE INTERNAL "") set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/ffmpeg/bin" CACHE INTERNAL "")

8
cmake/cpack/CMakeLists.txt
View File

@ -211,6 +211,14 @@ elseif(WIN32 OR MINGW)
) )
endforeach(opencv_dll) endforeach(opencv_dll)
file(GLOB CODEC2_DLLS "${CODEC2_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
foreach(codec2_dll ${CODEC2_DLLS})
get_filename_component(codec2_dll_name "${codec2_dll}" NAME)
add_custom_target(copy_codec2_${codec2_dll_name} ALL
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${codec2_dll}" "${SDRANGEL_BINARY_BIN_DIR}/"
)
endforeach(codec2_dll)
# TODO we need a way to fixup_bundle() on the build bin/ directory without call install # TODO we need a way to fixup_bundle() on the build bin/ directory without call install
if(BUILD_GUI) if(BUILD_GUI)
install(CODE " install(CODE "

2
sdrbase/audio/audioresampler.h
View File

@ -22,7 +22,7 @@
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"
#include "audiofilter.h" #include "audiofilter.h"
class AudioResampler class SDRBASE_API AudioResampler
{ {
public: public:
AudioResampler(); AudioResampler();