Skip to content

build: Add missing flags for x86 asm support #3804

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: Add missing flags for x86 asm support #3804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@ cpp_lib = '-lstdc++'
libm_dep = cpp.find_library('m', required : false)
deps += [libm_dep]

if ['linux', 'freebsd', 'android', 'ios', 'darwin'].contains(system)
# https://github.com/cisco/openh264/issues/2534
if cpu_family == 'x86'
c_args += ['-DX86_32_PICASM']
cpp_args += ['-DX86_32_PICASM']
asm_args += ['-DX86_32_PICASM']
endif

if ['linux', 'android', 'ios', 'darwin'].contains(system)
asm_format32 = 'elf'
asm_format64 = 'elf64'
if ['ios', 'darwin'].contains(system)
Expand Down Expand Up @@ -199,11 +206,15 @@ subdir ('test')

libopenh264 = library('openh264',
link_whole: [libcommon, libprocessing, libencoder, libdecoder],
# failsafe for ASM relocations
link_args: cpp.get_supported_link_arguments(['-Wl,-Bsymbolic', '-Wl,-z,text']),
install: true,
soversion: major_version,
version: meson.project_version(),
vs_module_defs: 'openh264.def',
dependencies: deps)
dependencies: deps,
pic: true
)

openh264_dep = declare_dependency(
link_with: libopenh264,
Expand Down