summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-12-05 22:22:46 -0800
committerMinh Nguyễn <mxn@1ec5.org>2015-12-13 17:26:53 -0800
commit0fb2b855a4539803f42a4048257da606f66d9f4e (patch)
tree7be98f423e47a40aa6d011c5e52751d0896125e0 /gyp
parent3f2fae521cde0cc07796f65b33a227875466dc8d (diff)
downloadqtlocation-mapboxgl-0fb2b855a4539803f42a4048257da606f66d9f4e.tar.gz
[osx] Map camera
Shared MGLMapCamera between iOS and OS X. Unfortunately -camera and -setCamera: implementations need to be copy-pasted for now.
Diffstat (limited to 'gyp')
-rw-r--r--gyp/platform-ios.gypi4
-rw-r--r--gyp/platform-osx.gypi1
2 files changed, 3 insertions, 2 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index d7e85a9516..9ae44b2d45 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -43,11 +43,11 @@
'../platform/darwin/MGLPolyline.mm',
'../include/mbgl/darwin/MGLPolygon.h',
'../platform/darwin/MGLPolygon.mm',
+ '../include/mbgl/darwin/MGLMapCamera.h',
+ '../platform/darwin/MGLMapCamera.mm',
'../include/mbgl/ios/Mapbox.h',
'../platform/ios/MGLMapboxEvents.h',
'../platform/ios/MGLMapboxEvents.m',
- '../include/mbgl/ios/MGLMapCamera.h',
- '../platform/ios/MGLMapCamera.mm',
'../include/mbgl/ios/MGLMapView.h',
'../include/mbgl/ios/MGLMapView+IBAdditions.h',
'../platform/ios/MGLMapView.mm',
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 281a8a5738..6ad948c27f 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -33,6 +33,7 @@
'../platform/darwin/MGLPointAnnotation.m',
'../platform/darwin/MGLPolyline.mm',
'../platform/darwin/MGLPolygon.mm',
+ '../platform/darwin/MGLMapCamera.mm',
'../platform/osx/src/MGLAccountManager_Private.h',
'../platform/osx/src/MGLAccountManager.m',
'../platform/osx/src/MGLMapView_Private.h',