From b2b3d1017afcc615c408df32ff63e61cccf54403 Mon Sep 17 00:00:00 2001 From: Robin Broda Date: Thu, 4 Apr 2019 00:54:10 +0200 Subject: [PATCH 1/2] Fix shaderdir passed to glava --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index abe8c33..e2645e3 100644 --- a/meson.build +++ b/meson.build @@ -82,7 +82,7 @@ endif add_project_arguments( '-DGLAVA_VERSION="'+glava_version+'"', - '-DSHADER_INSTALL_PATH="'+get_option('shaderdir')+'"', + '-DSHADER_INSTALL_PATH="'+shaderdir+'"', language: 'c' ) From b6edf9700a5edaff4520c9b887891f0bf935d3d7 Mon Sep 17 00:00:00 2001 From: Robin Broda Date: Thu, 4 Apr 2019 00:56:08 +0200 Subject: [PATCH 2/2] Optimize compatibility makefile --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0f2650..0a330d6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,11 @@ .PHONY: all install clean -all: +all: ninja + +build: meson build + +ninja: build ninja -C build install: