diff --git a/.gitignore b/.gitignore index 7681f948..1c8f2988 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ /.cache /.vscode /result +/subprojects/* +!/subprojects/*.wrap config.h mango mango.o diff --git a/meson.build b/meson.build index 94861590..4321e167 100644 --- a/meson.build +++ b/meson.build @@ -29,12 +29,12 @@ libm = cc.find_library('m') xcb = dependency('xcb', required : get_option('xwayland')) xlibs = dependency('xcb-icccm', required : get_option('xwayland')) wayland_server_dep = dependency('wayland-server',version: '>=1.23.1') -wlroots_dep = dependency('wlroots-0.19',version: '>=0.19.0') +wlroots_dep = dependency('wlroots-0.19', version: '>=0.19.0', fallback: 'wlroots') xkbcommon_dep = dependency('xkbcommon') libinput_dep = dependency('libinput',version: '>=1.27.1') libwayland_client_dep = dependency('wayland-client') pcre2_dep = dependency('libpcre2-8') -libscenefx_dep = dependency('scenefx-0.4',version: '>=0.4.1') +libscenefx_dep = dependency('scenefx-0.4',version: '>=0.4.1', fallback: 'libscenefx') pixman_dep = dependency('pixman-1') cjson_dep = dependency('libcjson') diff --git a/subprojects/libscenefx.wrap b/subprojects/libscenefx.wrap new file mode 100644 index 00000000..d7c446a2 --- /dev/null +++ b/subprojects/libscenefx.wrap @@ -0,0 +1,6 @@ +[wrap-git] +url = https://github.com/wlrfx/scenefx.git +revision = 0.4.1 + +[provide] +dependency_names = scenefx-0.4 diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap new file mode 100644 index 00000000..8030d571 --- /dev/null +++ b/subprojects/wlroots.wrap @@ -0,0 +1,6 @@ +[wrap-git] +url = https://gitlab.freedesktop.org/wlroots/wlroots.git +revision = 0.19.3 + +[provide] +dependency_names = wlroots-0.19