summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-04-09 16:00:34 -0400
committerKonstantin Käfer <mail@kkaefer.com>2014-04-09 16:00:34 -0400
commit6b9d614833fe2e3d4677dfeb69d998e72b6acace (patch)
treecb0c3d5e0085fb8022496965a81d2182a03b1866 /Makefile
parent662562d9fe7197bb85c89e9d000d215a5f5117d1 (diff)
downloadqtlocation-mapboxgl-6b9d614833fe2e3d4677dfeb69d998e72b6acace.tar.gz
fix plain library make target
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5e492a2a2d..b42499dced 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ all: llmr
deps: glsl-optimizer
llmr: deps config.gypi src llmr.gyp
- @if [ ! -f out ]; then echo 'please run ./configure first'; else $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-x86; fi;
+ deps/run_gyp llmr.gyp -Goutput_dir=./out/ --depth=. --generator-output=./out -f make
+ make -j8 -C out BUILDTYPE=Release V=$(V) llmr-x86
gtest: deps config.gypi src llmr.gyp
deps/run_gyp llmr.gyp -Goutput_dir=./out/ --depth=. --generator-output=./build/gtest -f make