diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2023-11-29 03:14:27 +0300 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2023-11-29 03:14:27 +0300 |
commit | c28b0f10bc6f683ddfb025781960f92d1d3b52e1 (patch) | |
tree | ff52fb8e8081c868c2a3e523ad2b3a33a69f51f0 /silk | |
parent | 147b72293f0bc2e3cb17c3f2dc6c21d9d599ec70 (diff) |
Trying to fix/update meson build
Still don't quite know what I'm doing
Diffstat (limited to 'silk')
-rw-r--r-- | silk/meson.build | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/silk/meson.build b/silk/meson.build index 610fef2d..80a59b05 100644 --- a/silk/meson.build +++ b/silk/meson.build @@ -2,6 +2,8 @@ silk_sources = sources['SILK_SOURCES'] silk_sources_sse4_1 = sources['SILK_SOURCES_SSE4_1'] +silk_sources_avx2 = sources['SILK_SOURCES_AVX2'] + silk_sources_neon_intr = sources['SILK_SOURCES_ARM_NEON_INTR'] silk_sources_fixed_neon_intr = sources['SILK_SOURCES_FIXED_ARM_NEON_INTR'] @@ -10,6 +12,10 @@ silk_sources_fixed = sources['SILK_SOURCES_FIXED'] silk_sources_fixed_sse4_1 = sources['SILK_SOURCES_FIXED_SSE4_1'] +silk_sources_float_sse4_1 = [] +silk_sources_float_neon_intr = [] +silk_sources_float_avx2 = sources['SILK_SOURCES_FLOAT_AVX2'] + silk_sources_float = sources['SILK_SOURCES_FLOAT'] if opt_fixed_point @@ -31,7 +37,7 @@ if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm endif endif -foreach intr_name : ['sse4_1', 'neon_intr'] +foreach intr_name : ['sse4_1', 'avx2', 'neon_intr'] have_intr = get_variable('have_' + intr_name) if not have_intr continue @@ -40,6 +46,8 @@ foreach intr_name : ['sse4_1', 'neon_intr'] intr_sources = get_variable('silk_sources_' + intr_name) if opt_fixed_point intr_sources += get_variable('silk_sources_fixed_' + intr_name) + else + intr_sources += get_variable('silk_sources_float_' + intr_name) endif intr_args = get_variable('opus_@0@_args'.format(intr_name), []) @@ -54,30 +62,10 @@ if host_machine.system() == 'windows' silk_c_args += ['-DDLL_EXPORT'] endif -# ----------------------- lpcnet --------------------------------------------- -# Perhaps this should be moved into lpcnet itself -lpcnet_sources = sources['LPCNET_SOURCES'] - -lpcnet_includes = [opus_includes, include_directories('../dnn')] - -lpcnet_c_args = [] -if host_machine.system() == 'windows' - lpcnet_c_args += ['-DDLL_EXPORT'] -endif - -lpcnet_lib = static_library('silk-lpcnet', - lpcnet_sources, - c_args: lpcnet_c_args, - include_directories: lpcnet_includes, - dependencies: libm, - install: false) - -# ----------------------- lpcnet --------------------------------------------- - silk_lib = static_library('opus-silk', silk_sources, c_args: silk_c_args, include_directories: silk_includes, - link_whole: [silk_static_libs, lpcnet_lib], + link_whole: [silk_static_libs], dependencies: libm, install: false) |