Skip to content

Commit

Permalink
Merge branch 'v0.23.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxKellermann committed Jan 28, 2025
2 parents fab03f8 + cf9a2eb commit a5da7fd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ project(
'gtest:default_library=static',
'id3tag:default_library=static',
'lame:default_library=static',
'libmpdclient:default_library=static',
'libmicrohttpd:default_library=static',
'libmpdclient:default_library=static',
'libnpupnp:default_library=static',
'liburing:default_library=static',
'ogg:default_library=static',
Expand Down
1 change: 1 addition & 0 deletions src/lib/curl/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ curl = static_library(
'Form.cxx',
include_directories: inc,
dependencies: [
event_dep,
log_dep,
curl_dep,
],
Expand Down
2 changes: 2 additions & 0 deletions src/lib/nfs/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ nfs = static_library(
'Blocking.cxx',
include_directories: inc,
dependencies: [
event_dep,
nfs_dep,
log_dep,
],
Expand All @@ -30,6 +31,7 @@ nfs = static_library(
nfs_dep = declare_dependency(
link_with: nfs,
dependencies: [
event_dep,
nfs_dep,
],
)
6 changes: 3 additions & 3 deletions subprojects/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
/libmicrohttpd*
/libmpdclient/
/libnpupnp-*/
/openssl-*/
/opus-*/
/sqlite-*/
/libogg-*/
/libvorbis-*/
/liburing-*/
/openssl-*/
/opus-*/
/sqlite-*/

0 comments on commit a5da7fd

Please sign in to comment.