Merge branch 'master' of https://github.com/wacossusca34/glava

2019-04-03 16:07:53 -07:00
parent eca50058a2 b6edf9700a
commit 6d68a1923f
2 changed files with 6 additions and 2 deletions
--- a/6
+++ b/6
@@ -1,7 +1,11 @@
 .PHONY: all install clean

-all:
+all: ninja
+
+build:
 	meson build
+
+ninja: build
 	ninja -C build

 install:
--- 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'
 )