diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2025-01-22 20:56:04 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2025-01-23 10:29:46 -0500 |
| commit | 2daa31c0629f2eb4af84d6f4fed8ac89813de056 (patch) | |
| tree | e90fdfa620a6a34361087edfe197a016e4828737 /src/liana | |
| parent | 5073f74aefb91616fb8e1df087747105e46e265d (diff) | |
| download | camu-2daa31c0629f2eb4af84d6f4fed8ac89813de056.tar.gz camu-2daa31c0629f2eb4af84d6f4fed8ac89813de056.tar.bz2 camu-2daa31c0629f2eb4af84d6f4fed8ac89813de056.zip | |
Big build update
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/liana')
| -rw-r--r-- | src/liana/handlers.c | 6 | ||||
| -rw-r--r-- | src/liana/meson.build | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/liana/handlers.c b/src/liana/handlers.c index 38e5bfa..69737ee 100644 --- a/src/liana/handlers.c +++ b/src/liana/handlers.c @@ -4,7 +4,7 @@ #ifdef CACHE_HAVE_CDIO #include "handlers/cdio.h" #endif -#ifdef LIANA_HAVE_DVD +#ifdef CACHE_HAVE_LIBDVD #include "handlers/dvd.h" #endif @@ -29,9 +29,9 @@ struct lia_handler_entry liana_handlers[] = { #endif }, #endif -#ifdef LIANA_HAVE_DVD +#ifdef CACHE_HAVE_LIBDVD { - .name = al_str_c("dvd"), + .name = al_str_c("libdvd"), #ifdef LIANA_SERVER .create_server_handler = lia_dvd_server_create, #endif diff --git a/src/liana/meson.build b/src/liana/meson.build index beb6f68..34abc66 100644 --- a/src/liana/meson.build +++ b/src/liana/meson.build @@ -10,7 +10,8 @@ liana_client_src = [ 'handlers/codec_client.c', 'handlers.c' ] -liana_deps = [codecs] +liana_server_deps = [cache, codecs_server] +liana_client_deps = [codecs_client] liana_args = [] if cache_have_cdio @@ -18,17 +19,12 @@ if cache_have_cdio liana_client_src += ['handlers/cdio_client.c'] endif -libdvdcss = dependency('libdvdcss') -libdvdread = dependency('dvdread') -libdvdnav = dependency('dvdnav') -if libdvdcss.found() and libdvdread.found() and libdvdnav.found() +if cache_have_libdvd liana_server_src += ['handlers/dvd_server.c'] liana_client_src += ['handlers/dvd_client.c'] - liana_deps += [libdvdcss, libdvdread, libdvdnav] - liana_args += ['-DLIANA_HAVE_DVD'] endif liana_server = declare_dependency(sources: liana_server_src, - dependencies: liana_deps, compile_args: [liana_args, '-DLIANA_SERVER']) + dependencies: liana_server_deps, compile_args: [liana_args, '-DLIANA_SERVER']) liana_client = declare_dependency(sources: liana_client_src, - dependencies: liana_deps, compile_args: [liana_args, '-DLIANA_CLIENT']) + dependencies: liana_client_deps, compile_args: [liana_args, '-DLIANA_CLIENT']) |