From 678a5ca91e7e763efc5140102ea9d537b05308e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Mon, 30 Nov 2015 18:47:30 +0100
Subject: [build] add ninja + compilation database support

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 48fdef164d..1baddf711a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,10 @@ default: ; @printf "You must specify a valid target\n"
 #### OS X targets ##############################################################
 
 ifeq ($(BUILD),osx)
-.PHONY: osx xosx run-osx run-xosx
+.PHONY: osx xosx nosx run-osx run-xosx
 osx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Makefile/osxapp
 xosx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Xcode/osxapp
+nosx: ; $(RUN) HOST=osx HOST_VERSION=x86_64 Ninja/osxapp
 run-osx: osx ; @"build/osx-x86_64/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL"
 run-xosx: xosx ; @"gyp/build/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL"
 
@@ -61,10 +62,14 @@ endif
 
 .PHONY: linux run-linux run-valgrind-linux
 linux: ; $(RUN) Makefile/linuxapp
+nlinux: ; $(RUN) Ninja/linuxapp
 run-linux: linux ; (cd build/linux-x86_64/$(BUILDTYPE) && ./mapbox-gl)
 run-valgrind-linux: linux
 	(cd build/linux-x86_64/$(BUILDTYPE) && valgrind --leak-check=full --suppressions=../../../scripts/valgrind.sup ./mapbox-gl)
 
+# Generates a compilation database with ninja for use in clang tooling
+compdb: ; $(RUN) Ninja/compdb
+
 .PHONY: android android-lib
 # Builds a particular android architecture.
 android-lib-%: ; $(RUN) HOST=android HOST_VERSION=$* Makefile/androidapp
-- 
cgit v1.2.1