Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: switch from kfr to fftw3 #212

Merged
merged 2 commits into from
Nov 26, 2024
Merged

fix: switch from kfr to fftw3 #212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
840c5e6
fix: switch from kfr to fftw3
Nov 25, 2024
01f4a30
fix: removed comments form cmakelists
Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions packages/react-native-audio-api/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ file(GLOB_RECURSE SOURCE_FILES
"../common/cpp/types/*.h"
)

add_subdirectory(../external/kfr ${CMAKE_CURRENT_BINARY_DIR}/kfr-build)
# add_subdirectory(../external/kfr ${CMAKE_CURRENT_BINARY_DIR}/kfr-build)

add_library(react-native-audio-api SHARED ${SOURCE_FILES})

Expand All @@ -48,8 +48,11 @@ target_include_directories(
"${REACT_NATIVE_DIR}/ReactCommon/jsi"
"${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/jni"
"${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/third-party/folly"
"${CMAKE_CURRENT_SOURCE_DIR}/libs/include/fftw3"
)

set(fftw3 ${CMAKE_CURRENT_SOURCE_DIR}/libs/fftw3/${ANDROID_ABI}/libfftw3.a)

find_package(ReactAndroid REQUIRED CONFIG)
find_package(fbjni REQUIRED CONFIG)
find_package(oboe REQUIRED CONFIG)
Expand All @@ -60,10 +63,11 @@ set(LINK_LIBRARIES
android
log
oboe::oboe
kfr
kfr_dsp
kfr_dft
kfr_io
${fftw3}
# kfr
# kfr_dsp
# kfr_dft
# kfr_io
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the commented out code before merging :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done ;)

)

if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
Expand Down
Binary file added packages/react-native-audio-api/android/libs/fftw3/arm64-v8a/libfftw3.a
View file
Open in desktop
Binary file not shown.
Binary file added packages/react-native-audio-api/android/libs/fftw3/armeabi-v7a/libfftw3.a
View file
Open in desktop
Binary file not shown.
Binary file added packages/react-native-audio-api/android/libs/fftw3/x86/libfftw3.a
View file
Open in desktop
Binary file not shown.
Binary file added packages/react-native-audio-api/android/libs/fftw3/x86_64/libfftw3.a
View file
Open in desktop
Binary file not shown.
Loading