mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-03-21 15:49:53 +01:00
Fixed M17 module on android
This commit is contained in:
parent
b8bc942b84
commit
03f173a3ac
@ -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", "-DUSE_INTERNAL_LIBCORRECT=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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -17,8 +17,14 @@ if(COMPILER_SUPPORTS_WPEDANTIC)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpedantic")
|
||||
endif()
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -fsanitize=address")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie,")
|
||||
# On android, keep optimisations and don't use asan
|
||||
if (ANDROID)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O3")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,")
|
||||
else()
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -fsanitize=address")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie,")
|
||||
endif()
|
||||
else()
|
||||
if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
|
||||
|
@ -260,6 +260,8 @@ int sdrpp_main(int argc, char* argv[]) {
|
||||
core::configManager.conf["modules"][modCount++] = "network_sink.so";
|
||||
core::configManager.conf["modules"][modCount++] = "audio_sink.so";
|
||||
|
||||
core::configManager.conf["modules"][modCount++] = "m17_decoder.so";
|
||||
core::configManager.conf["modules"][modCount++] = "meteor_demodulator.so";
|
||||
core::configManager.conf["modules"][modCount++] = "radio.so";
|
||||
|
||||
core::configManager.conf["modules"][modCount++] = "frequency_manager.so";
|
||||
|
@ -1,7 +1,6 @@
|
||||
#pragma once
|
||||
#include <config.h>
|
||||
#include <module.h>
|
||||
#include <module.h>
|
||||
#include <module_com.h>
|
||||
#include "command_args.h"
|
||||
|
||||
|
@ -26,13 +26,13 @@ if (MSVC)
|
||||
elseif (ANDROID)
|
||||
target_include_directories(m17_decoder PUBLIC
|
||||
/mnt/android_sdr/codec2/src
|
||||
/mnt/android_sdr/codec2/build_${ANDROID_ABI}/
|
||||
/mnt/android_sdr/output/codec2/${ANDROID_ABI}/
|
||||
)
|
||||
|
||||
target_link_libraries(m17_decoder PUBLIC
|
||||
/mnt/android_sdr/output/codec2/${ANDROID_ABI}/libcodec2.so
|
||||
)
|
||||
else (MSVC)
|
||||
else ()
|
||||
find_package(PkgConfig)
|
||||
|
||||
pkg_check_modules(LIBCODEC2 REQUIRED codec2)
|
||||
|
Loading…
x
Reference in New Issue
Block a user