diff options
| author | Brad Leege <bleege@gmail.com> | 2015-03-23 10:52:27 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2015-03-23 10:52:27 -0500 |
| commit | 044d1fc3c258ca435880d1adbcdbc34fc67c2d24 (patch) | |
| tree | b9ff72fa70779857959d864b8ac8e390e4431c9f /gyp | |
| parent | 33f4dfffd2d9ef20d803e495c47b1248b51bd12c (diff) | |
| parent | 9d30d4042c3311d02568adbb38dd13fb82faf75d (diff) | |
| download | qtlocation-mapboxgl-044d1fc3c258ca435880d1adbcdbc34fc67c2d24.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics
Conflicts:
gyp/platform-ios.gypi
platform/ios/MGLMapView.mm
styles
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/platform-ios.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 317b37b9b3..73f611a8e7 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -16,10 +16,12 @@ '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', '../platform/darwin/reachability.m', + '../include/mbgl/ios/MapboxGL.h', '../include/mbgl/ios/MGLMapboxEvents.h', '../platform/ios/MGLMapboxEvents.m', '../include/mbgl/ios/MGLMapView.h', '../platform/ios/MGLMapView.mm', + '../include/mbgl/ios/MGLAnnotation.h', '../include/mbgl/ios/MGLMetricsLocationManager.h', '../platform/ios/MGLMetricsLocationManager.m', '../include/mbgl/ios/MGLStyleFunctionValue.h', |