diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-06-15 18:30:39 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-06-15 18:30:39 -0700 |
| commit | bd0bf294bf1e350b184e54a824430c911dd66b9b (patch) | |
| tree | d7c643cf197a8263fb1880ce73d034da253efe4c /Makefile | |
| parent | e75e538ddbb1dad0baad02576df86f6b8eb1510f (diff) | |
| download | qtlocation-mapboxgl-bd0bf294bf1e350b184e54a824430c911dd66b9b.tar.gz | |
squash of #1655: shape annotations support for core & iOS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -39,6 +39,9 @@ else SMCalloutView: endif +geojsonvt: + git submodule update --init src/mbgl/util/geojsonvt + KIF: git submodule update --init test/ios/KIF @@ -46,11 +49,11 @@ KIF: #### Build files ############################################################### .PRECIOUS: Makefile/project -Makefile/project: config/$(HOST).gypi styles/styles SMCalloutView +Makefile/project: config/$(HOST).gypi styles/styles SMCalloutView geojsonvt deps/run_gyp gyp/$(HOST).gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make .PRECIOUS: Xcode/project -Xcode/project: config/$(HOST).gypi styles/styles SMCalloutView +Xcode/project: config/$(HOST).gypi styles/styles SMCalloutView geojsonvt deps/run_gyp gyp/$(HOST).gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f xcode @@ -115,7 +118,7 @@ xproj: xosx-proj #### iOS application builds #################################################### .PRECIOUS: Xcode/ios -Xcode/ios: gyp/ios.gyp config/ios.gypi styles/styles SMCalloutView +Xcode/ios: gyp/ios.gyp config/ios.gypi styles/styles SMCalloutView geojsonvt deps/run_gyp gyp/ios.gyp $(CONFIG_ios) $(LIBS_ios) --generator-output=./build/ios -f xcode .PHONY: ios-proj ios isim ipackage @@ -172,7 +175,7 @@ run-xlinux: xlinux .PRECIOUS: Makefile/android-% Makefile/android-%: CMD = deps/run_gyp android/mapboxgl-app.gyp $(CONFIG_android-$*) $(LIBS_android) --generator-output=./build/android-$* -f make-android -Makefile/android-%: config/android-%.gypi styles/styles +Makefile/android-%: config/android-%.gypi styles/styles geojsonvt @echo $(CMD) @$(ENV_android-$*) $(CMD) |