From 1cdb05e9d0256f6b8942a7436b539ad87fbcf366 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Wed, 8 May 2024 11:32:13 +0200 Subject: meson.build spring cleaning (#49) * Cleaned meson options * Only look for wlroots subproject if dep isn't found * Renamed wlr variables to scenefx ones --- render/fx_renderer/meson.build | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'render/fx_renderer/meson.build') diff --git a/render/fx_renderer/meson.build b/render/fx_renderer/meson.build index 041fca7..624640e 100644 --- a/render/fx_renderer/meson.build +++ b/render/fx_renderer/meson.build @@ -1,11 +1,12 @@ renderers = get_option('renderers') if 'auto' in renderers and get_option('auto_features').enabled() - renderers = ['gles2', 'vulkan'] + renderers = ['gles2'] elif 'auto' in renderers and get_option('auto_features').disabled() renderers = [] endif -wlr_files += files( +scenefx_files += files( + 'matrix.c', 'util.c', 'shaders.c', 'pixel_format.c', @@ -16,19 +17,13 @@ wlr_files += files( 'fx_renderer.c', ) -if not wlroots_is_sub - wlr_files += files([ - 'matrix.c', - ]) -endif - if 'gles2' in renderers or 'auto' in renderers egl = dependency('egl', required: 'gles2' in renderers) gbm = dependency('gbm', required: 'gles2' in renderers) glesv2 = dependency('glesv2', required: 'gles2' in renderers) if egl.found() and gbm.found() and glesv2.found() - wlr_deps += [egl, gbm, glesv2] + scenefx_deps += [egl, gbm, glesv2] endif subdir('gles2') endif -- cgit v1.2.3