summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 0836bbc65c..748105102a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ endif
ifeq ($(shell uname -s), Linux)
HOST = linux
JOBS ?= $(shell grep --count processor /proc/cpuinfo)
+BUILD_ROOT = $(shell pwd)
endif
JOBS ?= 1
@@ -92,6 +93,9 @@ osx: Makefile/project
run-osx: osx
"build/osx/$(BUILDTYPE)/Mapbox GL.app/Contents/MacOS/Mapbox GL"
+run-valgrind-osx: osx
+ (valgrind --leak-check=full --suppressions=scripts/valgrind.sup build/osx/$(BUILDTYPE)/Mapbox\ GL.app/Contents/MacOS/Mapbox\ GL)
+
.PHONY: xosx-proj xosx run-xosx
xosx-proj: Xcode/project
open ./build/osx/gyp/osx.xcodeproj
@@ -130,11 +134,11 @@ isim: XCPRETTY := $(shell ./scripts/xcpretty.sh)
isim: Xcode/ios
xcodebuild -sdk iphonesimulator ARCHS="x86_64 i386" -project ./build/ios/gyp/ios.xcodeproj -configuration Debug -target iosapp -jobs $(JOBS) $(XCPRETTY)
-ipackage: clean Xcode/ios
- ./scripts/ios/package.sh
+ipackage: Xcode/ios
+ JOBS=$(JOBS) ./scripts/ios/package.sh
-ipackage-sim: clean Xcode/ios
- ./scripts/ios/package.sh sim
+ipackage-sim: Xcode/ios
+ JOBS=$(JOBS) ./scripts/ios/package.sh sim
itest: ipackage-sim KIF
./scripts/ios/test.sh
@@ -152,6 +156,9 @@ linux: Makefile/project
run-linux: linux
(cd build/$(HOST)/$(BUILDTYPE) && ./mapbox-gl)
+run-valgrind-linux: linux
+ (cd build/$(HOST)/$(BUILDTYPE) && valgrind --leak-check=full --suppressions=$(BUILD_ROOT)/scripts/valgrind.sup ./mapbox-gl)
+
.PHONY: xlinux run-xlinux
xlinux: XCPRETTY := $(shell ./scripts/xcpretty.sh)
xlinux: Xcode/project
@@ -196,9 +203,10 @@ android-project: android-lib
render: Makefile/project
$(MAKE) -C build/$(HOST) BUILDTYPE=$(BUILDTYPE) mbgl-render
-.PHONY: xrender run-xrender
+.PHONY: xrender
+xrender: XCPRETTY := $(shell ./scripts/xcpretty.sh)
xrender: Xcode/project
- xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target mbgl-render -jobs $(JOBS)
+ xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target mbgl-render -jobs $(JOBS) $(XCPRETTY)
##### Maintenace operations ####################################################