From 197d41a3e23cab35848f623c6133baccc62aacbe Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 26 Aug 2026 17:56:52 -0400 Subject: OSD stuff and Android fixes Signed-off-by: Andrew Opalach --- src/fruits/cmv/meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/fruits/cmv/meson.build') diff --git a/src/fruits/cmv/meson.build b/src/fruits/cmv/meson.build index ec27c81..301fa58 100644 --- a/src/fruits/cmv/meson.build +++ b/src/fruits/cmv/meson.build @@ -14,7 +14,10 @@ if use_tui endif cmv_link_args = [] -if is_windows +if is_android + # https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358 + cmv_link_args += ['-Wl,-Bsymbolic', '-static-libstdc++'] +elif is_windows windows = import('windows') cmv_src += [windows.compile_resources('icon.rc')] if not is_msvc @@ -22,4 +25,10 @@ if is_windows endif endif -executable('cmv', cmv_src, dependencies: cmv_deps, c_args: cmv_args, link_args: cmv_link_args, install: true) +if is_android + cmv_args += ['-DAPPLICATION_NAME="CTV"'] + shared_library('ctv', cmv_src, dependencies: cmv_deps, c_args: cmv_args, link_args: cmv_link_args) +else + cmv_args += ['-DAPPLICATION_NAME="CMV"'] + executable('cmv', cmv_src, dependencies: cmv_deps, c_args: cmv_args, link_args: cmv_link_args, install: true) +endif -- cgit v1.2.3-101-g0448