diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-12-08 09:22:44 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-08 09:22:44 -0500 |
| commit | 35188834db182db43b407b58db167950fab05477 (patch) | |
| tree | 4ce63cc7f7f01f1e7cf7fb0f6994c4306ae4cad2 /render | |
| parent | e3542d879d50d6239ad4ca24b4d30520fef40a87 (diff) | |
| parent | 381a646d2fbcb1b488e1551438444ac267f39138 (diff) | |
Merge branch 'master' into feature/xwm-selection
Diffstat (limited to 'render')
| -rw-r--r-- | render/egl.c | 2 | ||||
| -rw-r--r-- | render/gles2/renderer.c | 2 | ||||
| -rw-r--r-- | render/meson.build | 17 |
3 files changed, 8 insertions, 13 deletions
diff --git a/render/egl.c b/render/egl.c index 08612125..22d58df2 100644 --- a/render/egl.c +++ b/render/egl.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <wlr/util/log.h> #include <wlr/render/egl.h> -#include "render/glapi.h" +#include "glapi.h" // Extension documentation // https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_base.txt. diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 646d69ec..89cc4ffb 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -12,7 +12,7 @@ #include <wlr/render/matrix.h> #include <wlr/util/log.h> #include "render/gles2.h" -#include "render/glapi.h" +#include "glapi.h" struct shaders shaders; diff --git a/render/meson.build b/render/meson.build index 749d1393..1eea9a83 100644 --- a/render/meson.build +++ b/render/meson.build @@ -1,14 +1,9 @@ glgen = find_program('../glgen.sh') -glapi_c = custom_target('glapi.c', +glapi = custom_target('glapi', input: 'glapi.txt', - output: '@BASENAME@.c', - command: [glgen, '@INPUT@', '@OUTPUT@'], -) -glapi_h = custom_target('glapi.h', - input: 'glapi.txt', - output: '@BASENAME@.h', - command: [glgen, '@INPUT@', '@OUTPUT@'], + output: ['@BASENAME@.c', '@BASENAME@.h'], + command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'], ) lib_wlr_render = static_library( @@ -24,13 +19,13 @@ lib_wlr_render = static_library( 'wlr_renderer.c', 'wlr_texture.c', ), - glapi_c, - glapi_h, + glapi[0], + glapi[1], include_directories: wlr_inc, dependencies: [glesv2, egl], ) wlr_render = declare_dependency( link_with: lib_wlr_render, - sources: glapi_h, + sources: glapi[1], ) |