attempt at re-enabling M17 on android

This commit is contained in:
AlexandreRouma 2023-02-18 18:22:53 +01:00
parent b7ca19583a
commit 290c989451
2 changed files with 3 additions and 4 deletions

View File

@ -14,7 +14,7 @@ android {
externalNativeBuild {
cmake {
arguments "-DOPT_BACKEND_GLFW=OFF", "-DOPT_BACKEND_ANDROID=ON", "-DOPT_BUILD_SOAPY_SOURCE=OFF", "-DOPT_BUILD_ANDROID_AUDIO_SINK=ON", "-DOPT_BUILD_AUDIO_SINK=OFF", "-DOPT_BUILD_DISCORD_PRESENCE=OFF", "-DOPT_BUILD_M17_DECODER=OFF", "-DOPT_BUILD_PLUTOSDR_SOURCE=OFF"
arguments "-DOPT_BACKEND_GLFW=OFF", "-DOPT_BACKEND_ANDROID=ON", "-DOPT_BUILD_SOAPY_SOURCE=OFF", "-DOPT_BUILD_ANDROID_AUDIO_SINK=ON", "-DOPT_BUILD_AUDIO_SINK=OFF", "-DOPT_BUILD_DISCORD_PRESENCE=OFF", "-DOPT_BUILD_M17_DECODER=ON", "-DOPT_BUILD_PLUTOSDR_SOURCE=OFF"
}
}
}

View File

@ -15,12 +15,11 @@ if (MSVC)
target_link_libraries(m17_decoder PRIVATE libcodec2)
elseif (ANDROID)
target_include_directories(m17_decoder PUBLIC
/mnt/android_sdr/codec2/src
/mnt/android_sdr/output/codec2/${ANDROID_ABI}/
/sdr-kit/${ANDROID_ABI}/include/codec2
)
target_link_libraries(m17_decoder PUBLIC
/mnt/android_sdr/output/codec2/${ANDROID_ABI}/libcodec2.so
/sdr-kit/${ANDROID_ABI}/lib/libcodec2.so
)
else ()
find_package(PkgConfig)