summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-05-12 15:15:05 +0200
committerKonstantin Käfer <mail@kkaefer.com>2015-05-12 15:15:05 +0200
commitf31b3d2ce5fa75be3eabe49a57e34d9c7f1b598b (patch)
tree0426b4f631cb58bd5acd4439339b3f1becf145f0
parentbb33493710629b1f78ac7ac23a89b656fb6a8a8c (diff)
downloadqtlocation-mapboxgl-f31b3d2ce5fa75be3eabe49a57e34d9c7f1b598b.tar.gz
build render binary
-rw-r--r--Makefile5
-rwxr-xr-xscripts/linux/run.sh3
-rwxr-xr-xscripts/osx/run.sh3
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9b7db2f4a5..7b796043c0 100644
--- a/Makefile
+++ b/Makefile
@@ -203,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 ####################################################
diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh
index c4731b97ec..0412459a18 100755
--- a/scripts/linux/run.sh
+++ b/scripts/linux/run.sh
@@ -43,6 +43,9 @@ git submodule update --init styles
mapbox_time "compile_program" \
make linux -j${JOBS} BUILDTYPE=${BUILDTYPE}
+mapbox_time "compile_render_binary" \
+make render -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
mapbox_time "compile_tests" \
make test -j${JOBS} BUILDTYPE=${BUILDTYPE}
diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh
index b84ed04c21..f386318c8b 100755
--- a/scripts/osx/run.sh
+++ b/scripts/osx/run.sh
@@ -23,5 +23,8 @@ git submodule update --init styles
mapbox_time "compile_program" \
make xosx -j${JOBS} BUILDTYPE=${BUILDTYPE}
+mapbox_time "compile_render_binary" \
+make xrender -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
mapbox_time "compile_tests" \
make xtest -j${JOBS} BUILDTYPE=${BUILDTYPE}