diff options
| author | Erik Reider <[email protected]> | 2024-05-08 11:32:13 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-08 11:32:13 +0200 |
| commit | 1cdb05e9d0256f6b8942a7436b539ad87fbcf366 (patch) | |
| tree | 96a5ce17c44b4963f3b72e9cc6e8a0d1955638b5 /render | |
| parent | 0abffbe6def159d72f8f00302d6c8f9f8250f580 (diff) | |
meson.build spring cleaning (#49)
* Cleaned meson options
* Only look for wlroots subproject if dep isn't found
* Renamed wlr variables to scenefx ones
Diffstat (limited to 'render')
| -rw-r--r-- | render/fx_renderer/gles2/shaders/meson.build | 2 | ||||
| -rw-r--r-- | render/fx_renderer/meson.build | 13 | ||||
| -rw-r--r-- | render/meson.build | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/render/fx_renderer/gles2/shaders/meson.build b/render/fx_renderer/gles2/shaders/meson.build index fb83e0c..427fcaf 100644 --- a/render/fx_renderer/gles2/shaders/meson.build +++ b/render/fx_renderer/gles2/shaders/meson.build @@ -16,7 +16,7 @@ shaders = [ foreach name : shaders output = name.underscorify() + '_src.h' var = name.underscorify() + '_src' - wlr_files += custom_target( + scenefx_files += custom_target( output, command: [embed, var], input: name, 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 diff --git a/render/meson.build b/render/meson.build index 56579ee..c5dd423 100644 --- a/render/meson.build +++ b/render/meson.build @@ -1,4 +1,4 @@ -wlr_files += files( +scenefx_files += files( 'pixel_format.c', 'egl.c', ) |