Skip to content

Commit

Permalink
Remove vendored libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
emilazy committed Aug 3, 2024
1 parent 8abe638 commit 86ed2b8
Show file tree
Hide file tree
Showing 26 changed files with 19 additions and 2,767 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ addons:
- libavcodec-dev
- libavformat-dev
- libavutil-dev
- libresample-dev
- libkissfft-dev
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,18 @@ pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET
libavcodec
libavformat
libavutil)
pkg_check_modules(LIBRESAMPLE REQUIRED IMPORTED_TARGET libresample)
pkg_search_module(KISSFFT REQUIRED IMPORTED_TARGET
kissfft-simd
kissfft-double
kissfft-float
kissfft-int32_t
kissfft-int16_t
kissfft-simd-openmp
kissfft-double-openmp
kissfft-float-openmp
kissfft-int32_t-openmp
kissfft-int16_t-openmp)

include_directories(
"${PROJECT_SOURCE_DIR}/include")
Expand Down
12 changes: 3 additions & 9 deletions libmusly/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,11 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external")
PROPERTIES COMPILE_FLAGS "-DLIBMUSLY_EXTERNAL ${LIBMUSLY_EXTERNAL_FLAGS}")
endif()

if(USE_OPENMP AND OPENMP_FOUND)
# disable OpenMP for kiss FFT, it slows things down terribly
set_source_files_properties(kissfft/kiss_fft.c
PROPERTIES COMPILE_FLAGS "-U_OPENMP")
endif()

include_directories(
${LIBMUSLY_INCLUDE}
${CMAKE_CURRENT_SOURCE_DIR})

add_library(libmusly
kissfft/kiss_fft.c
kissfft/kiss_fftr.c
methods/mandelellis.cpp
methods/timbre.cpp
decoders/libav.cpp
Expand Down Expand Up @@ -56,7 +48,9 @@ set_target_properties(libmusly
target_link_libraries(libmusly
${LIBMUSLY_LIBS}
PkgConfig::EIGEN3
PkgConfig::FFMPEG)
PkgConfig::FFMPEG
PkgConfig::LIBRESAMPLE
PkgConfig::KISSFFT)
if(WIN32 OR MINGW)
# link against winsock2 for ntohl() and htonl()
target_link_libraries(libmusly ws2_32)
Expand Down
123 changes: 0 additions & 123 deletions libmusly/kissfft/CHANGELOG

This file was deleted.

11 changes: 0 additions & 11 deletions libmusly/kissfft/COPYING

This file was deleted.

134 changes: 0 additions & 134 deletions libmusly/kissfft/README

This file was deleted.

Loading

0 comments on commit 86ed2b8

Please sign in to comment.