died twice
This commit is contained in:
parent
616aefc1c4
commit
e85e606ba9
4 changed files with 2 additions and 26 deletions
10
meson.build
10
meson.build
|
@ -1,6 +1,6 @@
|
||||||
project(
|
project(
|
||||||
'audrey',
|
'audrey',
|
||||||
['c', 'vala'],
|
'c',
|
||||||
version: '0.1.0', # AUDREY_VERSION
|
version: '0.1.0', # AUDREY_VERSION
|
||||||
meson_version: '>= 1.0.0',
|
meson_version: '>= 1.0.0',
|
||||||
default_options: ['warning_level=0', 'werror=false'],
|
default_options: ['warning_level=0', 'werror=false'],
|
||||||
|
@ -10,7 +10,6 @@ i18n = import('i18n')
|
||||||
gnome = import('gnome')
|
gnome = import('gnome')
|
||||||
fs = import('fs')
|
fs = import('fs')
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
valac = meson.get_compiler('vala')
|
|
||||||
|
|
||||||
srcdir = meson.project_source_root() / 'src'
|
srcdir = meson.project_source_root() / 'src'
|
||||||
|
|
||||||
|
@ -53,17 +52,12 @@ endif
|
||||||
cargo = find_program('cargo')
|
cargo = find_program('cargo')
|
||||||
cargo_env = environment()
|
cargo_env = environment()
|
||||||
cargo_env.set('MESON_BUILD_ROOT', meson.project_build_root())
|
cargo_env.set('MESON_BUILD_ROOT', meson.project_build_root())
|
||||||
cargo_env.append(
|
|
||||||
'RUSTFLAGS',
|
|
||||||
'-L ' + fs.parent(audrey_c.full_path()),
|
|
||||||
separator: ' ',
|
|
||||||
)
|
|
||||||
|
|
||||||
custom_target(
|
custom_target(
|
||||||
'cargo-build',
|
'cargo-build',
|
||||||
build_by_default: true,
|
build_by_default: true,
|
||||||
build_always_stale: true,
|
build_always_stale: true,
|
||||||
depends: [audrey_c, blueprints],
|
depends: blueprints,
|
||||||
input: config_rs,
|
input: config_rs,
|
||||||
console: true,
|
console: true,
|
||||||
# means nothing (always stale and uncopied), we can't cp since env: drops the /bin/sh wrapper
|
# means nothing (always stale and uncopied), we can't cp since env: drops the /bin/sh wrapper
|
||||||
|
|
|
@ -28,9 +28,6 @@ use gtk::{gio, glib};
|
||||||
|
|
||||||
pub mod mpv;
|
pub mod mpv;
|
||||||
|
|
||||||
#[link(name = "audrey")]
|
|
||||||
extern "C" {}
|
|
||||||
|
|
||||||
fn main() -> glib::ExitCode {
|
fn main() -> glib::ExitCode {
|
||||||
gio::resources_register_include!("audrey.gresource").expect("could not register resources");
|
gio::resources_register_include!("audrey.gresource").expect("could not register resources");
|
||||||
|
|
||||||
|
|
|
@ -1,20 +1,5 @@
|
||||||
audrey_sources = [
|
|
||||||
'playbin.vala',
|
|
||||||
]
|
|
||||||
|
|
||||||
config_rs = configure_file(
|
config_rs = configure_file(
|
||||||
output: 'meson_config.rs',
|
output: 'meson_config.rs',
|
||||||
input: 'meson_config.rs.in',
|
input: 'meson_config.rs.in',
|
||||||
configuration: config_h,
|
configuration: config_h,
|
||||||
)
|
)
|
||||||
|
|
||||||
audrey_deps = [
|
|
||||||
dependency('gtk4', version: '>= 4.16'),
|
|
||||||
]
|
|
||||||
|
|
||||||
audrey_c = static_library(
|
|
||||||
'audrey',
|
|
||||||
audrey_sources,
|
|
||||||
dependencies: audrey_deps,
|
|
||||||
install: true,
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in a new issue