Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Opus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiph.Org
Opus
Commits
39f68ce3
Verified
Commit
39f68ce3
authored
1 year ago
by
Tim-Philipp Müller
Committed by
Jean-Marc Valin
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
meson: fix build for lpcnet additions
parent
82b945ea
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-1
2 additions, 1 deletion
.gitlab-ci.yml
meson.build
+7
-2
7 additions, 2 deletions
meson.build
silk/meson.build
+21
-1
21 additions, 1 deletion
silk/meson.build
src/meson.build
+1
-1
1 addition, 1 deletion
src/meson.build
with
31 additions
and
5 deletions
.gitlab-ci.yml
+
2
−
1
View file @
39f68ce3
...
...
@@ -95,8 +95,9 @@ cmake:
apt-get install -y ninja-build doxygen meson git
-
!reference
[
.snippets
,
git_prep
]
script
:
-
./autogen.sh
-
mkdir builddir
-
meson setup -Dtests=enabled -Ddocs=enabled -Dbuildtype=release builddir
${MESON_EXTRA_ARGS}
-
meson setup -Dtests=enabled -Ddocs=enabled -Dbuildtype=release builddir
-
meson compile -C builddir
-
meson test -C builddir
#- meson dist --no-tests -C builddir
...
...
This diff is collapsed.
Click to expand it.
meson.build
+
7
−
2
View file @
39f68ce3
...
...
@@ -14,7 +14,7 @@ host_cpu_family = host_machine.cpu_family()
top_srcdir
=
meson
.
current_source_dir
()
top_builddir
=
meson
.
current_build_dir
()
opus_includes
=
include_directories
(
'.'
,
'include'
,
'celt'
,
'silk'
)
opus_includes
=
include_directories
(
'.'
,
'include'
,
'celt'
,
'silk'
,
'lpcnet/include'
)
opus_public_includes
=
include_directories
(
'include'
)
add_project_arguments
(
'-DOPUS_BUILD'
,
language
:
'c'
)
...
...
@@ -563,7 +563,12 @@ else
endif
# extract source file lists from .mk files
mk_files
=
[
'silk_sources.mk'
,
'opus_headers.mk'
,
'opus_sources.mk'
,
'silk_headers.mk'
,
'celt_sources.mk'
,
'celt_headers.mk'
]
mk_files
=
[
'opus_headers.mk'
,
'opus_sources.mk'
,
'silk_headers.mk'
,
'silk_sources.mk'
,
'celt_sources.mk'
,
'celt_headers.mk'
,
'lpcnet_headers.mk'
,
'lpcnet_sources.mk'
,
]
lines
=
run_command
(
'meson/read-sources-list.py'
,
mk_files
,
check
:
true
).
stdout
().
strip
().
split
(
'
\n
'
)
sources
=
{}
foreach
l
:
lines
...
...
This diff is collapsed.
Click to expand it.
silk/meson.build
+
21
−
1
View file @
39f68ce3
...
...
@@ -54,10 +54,30 @@ 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
(
'../lpcnet/include'
)]
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
,
link_whole
:
[
silk_static_libs
,
lpcnet_lib
],
dependencies
:
libm
,
install
:
false
)
This diff is collapsed.
Click to expand it.
src/meson.build
+
1
−
1
View file @
39f68ce3
...
...
@@ -17,7 +17,7 @@ opus_lib = library('opus',
darwin_versions
:
macosversion
,
c_args
:
opus_lib_c_args
,
include_directories
:
opus_includes
,
link_w
ith
:
[
celt_lib
,
silk_lib
],
link_w
hole
:
[
celt_lib
,
silk_lib
],
dependencies
:
libm
,
install
:
true
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment