diff --git a/include/meson.build b/include/meson.build index 165166c33..2881b97c1 100644 --- a/include/meson.build +++ b/include/meson.build @@ -29,6 +29,29 @@ install_subdir('wlr', exclude_files: exclude_files, ) +internal_render_headers = [ + 'render/pixman.h', + 'render/pixel_format.h', +] +if features.get('gles2-renderer') + internal_render_headers += [ + 'render/egl.h', + 'render/gles2.h', + ] +endif +if features.get('vulkan-renderer') + internal_render_headers += 'render/vulkan.h' +endif + +install_headers(internal_render_headers, + subdir: versioned_name, + preserve_path: true, +) + +install_headers('util/rect_union.h', + subdir: versioned_name / 'util', +) + foreach name, have : internal_features internal_config.set10('HAVE_' + name.underscorify().to_upper(), have) endforeach diff --git a/tinywl/Makefile b/tinywl/Makefile index 0f1c4cb13..c8f38d999 100644 --- a/tinywl/Makefile +++ b/tinywl/Makefile @@ -1,8 +1,9 @@ PKG_CONFIG?=pkg-config PKGS="wlroots-0.21" wayland-server xkbcommon +CFLAGS_PIXMAN!=$(PKG_CONFIG) --cflags pixman-1 CFLAGS_PKG_CONFIG!=$(PKG_CONFIG) --cflags $(PKGS) -CFLAGS+=$(CFLAGS_PKG_CONFIG) +CFLAGS+=$(CFLAGS_PIXMAN) $(CFLAGS_PKG_CONFIG) LIBS!=$(PKG_CONFIG) --libs $(PKGS) all: tinywl