diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-03-24 18:43:24 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-03-24 18:43:24 -0700 |
| commit | 10a30daed66ac1795ee9a0097e8aeb2e735e8968 (patch) | |
| tree | 3c1a050fce8b282cab9eb771d0aa58c2e101387d /Makefile | |
| parent | 3490622dd25cda45ec4d6804de397417e4e8f672 (diff) | |
| download | qtlocation-mapboxgl-10a30daed66ac1795ee9a0097e8aeb2e735e8968.tar.gz | |
refs #894, fixes #1074: callout views for iOS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -25,10 +25,13 @@ config/%.gypi: configure styles/styles: git submodule update --init styles +SMCalloutView: + git submodule update --init platform/ios/vendor/SMCalloutView + #### Library builds ############################################################ .PRECIOUS: Makefile/mbgl -Makefile/mbgl: config/$(HOST).gypi styles/styles +Makefile/mbgl: config/$(HOST).gypi styles/styles SMCalloutView deps/run_gyp mbgl.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make mbgl: Makefile/mbgl @@ -41,13 +44,13 @@ install: Makefile/mbgl LINK=`pwd`/gyp/link.py $(MAKE) -C build/$(HOST) BUILDTYPE=$(BUILDTYPE) install .PRECIOUS: Xcode/mbgl -Xcode/mbgl: config/$(HOST).gypi styles/styles +Xcode/mbgl: config/$(HOST).gypi styles/styles SMCalloutView deps/run_gyp mbgl.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f xcode ##### Test builds ############################################################## .PRECIOUS: Makefile/test -Makefile/test: test/test.gyp config/$(HOST).gypi styles/styles +Makefile/test: test/test.gyp config/$(HOST).gypi styles/styles SMCalloutView deps/run_gyp test/test.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make test: Makefile/test @@ -58,7 +61,7 @@ test-%: test .PRECIOUS: Xcode/test -Xcode/test: test/test.gyp config/osx.gypi styles/styles +Xcode/test: test/test.gyp config/osx.gypi styles/styles SMCalloutView deps/run_gyp test/test.gyp $(CONFIG_osx) $(LIBS_osx) --generator-output=./build/osx -f xcode .PHONY: lproj lbuild run-xlinux @@ -108,7 +111,7 @@ xproj: xosx-proj #### iOS application builds #################################################### .PRECIOUS: Xcode/ios -Xcode/ios: ios/app/mapboxgl-app.gyp config/ios.gypi styles/styles +Xcode/ios: ios/app/mapboxgl-app.gyp config/ios.gypi styles/styles SMCalloutView deps/run_gyp ios/app/mapboxgl-app.gyp $(CONFIG_ios) $(LIBS_ios) --generator-output=./build/ios -f xcode .PHONY: ios-proj ios run-ios |