Merge branch 'v0.23.x'
This commit is contained in:
@@ -21,8 +21,8 @@ project(
|
|||||||
'gtest:default_library=static',
|
'gtest:default_library=static',
|
||||||
'id3tag:default_library=static',
|
'id3tag:default_library=static',
|
||||||
'lame:default_library=static',
|
'lame:default_library=static',
|
||||||
'libmpdclient:default_library=static',
|
|
||||||
'libmicrohttpd:default_library=static',
|
'libmicrohttpd:default_library=static',
|
||||||
|
'libmpdclient:default_library=static',
|
||||||
'libnpupnp:default_library=static',
|
'libnpupnp:default_library=static',
|
||||||
'liburing:default_library=static',
|
'liburing:default_library=static',
|
||||||
'ogg:default_library=static',
|
'ogg:default_library=static',
|
||||||
|
@@ -24,6 +24,7 @@ curl = static_library(
|
|||||||
'Form.cxx',
|
'Form.cxx',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
|
event_dep,
|
||||||
log_dep,
|
log_dep,
|
||||||
curl_dep,
|
curl_dep,
|
||||||
],
|
],
|
||||||
|
@@ -22,6 +22,7 @@ nfs = static_library(
|
|||||||
'Blocking.cxx',
|
'Blocking.cxx',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
|
event_dep,
|
||||||
nfs_dep,
|
nfs_dep,
|
||||||
log_dep,
|
log_dep,
|
||||||
],
|
],
|
||||||
@@ -30,6 +31,7 @@ nfs = static_library(
|
|||||||
nfs_dep = declare_dependency(
|
nfs_dep = declare_dependency(
|
||||||
link_with: nfs,
|
link_with: nfs,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
|
event_dep,
|
||||||
nfs_dep,
|
nfs_dep,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
6
subprojects/.gitignore
vendored
6
subprojects/.gitignore
vendored
@@ -10,9 +10,9 @@
|
|||||||
/libmicrohttpd*
|
/libmicrohttpd*
|
||||||
/libmpdclient/
|
/libmpdclient/
|
||||||
/libnpupnp-*/
|
/libnpupnp-*/
|
||||||
/openssl-*/
|
|
||||||
/opus-*/
|
|
||||||
/sqlite-*/
|
|
||||||
/libogg-*/
|
/libogg-*/
|
||||||
/libvorbis-*/
|
/libvorbis-*/
|
||||||
/liburing-*/
|
/liburing-*/
|
||||||
|
/openssl-*/
|
||||||
|
/opus-*/
|
||||||
|
/sqlite-*/
|
||||||
|
Reference in New Issue
Block a user