From 02374b945d26b094ba7cd771841f967c7b83c956 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 22 Nov 2017 14:04:29 +1300 Subject: Change glapi.sh to generate both files --- render/meson.build | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'render') 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], ) -- cgit v1.2.3 From bc113c16aab5fed2a937ddb8b2b560eaef28620d Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 30 Nov 2017 10:32:55 +1300 Subject: Use correct include path for glapi.h --- backend/drm/renderer.c | 2 +- render/egl.c | 2 +- render/gles2/renderer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'render') diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index d53acaa8..87064914 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -14,7 +14,7 @@ #include #include #include "backend/drm/drm.h" -#include "render/glapi.h" +#include "glapi.h" bool wlr_drm_renderer_init(struct wlr_drm_backend *drm, struct wlr_drm_renderer *renderer) { 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 #include #include -#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 #include #include "render/gles2.h" -#include "render/glapi.h" +#include "glapi.h" struct shaders shaders; -- cgit v1.2.3