summaryrefslogtreecommitdiff
path: root/gyp/platform-osx.gypi
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-02-11 12:21:49 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-02-12 14:53:52 -0800
commit13e2acbc754893efb945fe02d20824698415dcdb (patch)
treee8e4c966f03798fc6896a0fd3163e83921f84a38 /gyp/platform-osx.gypi
parentab677a7905b0f81850d6aa3dcdd2caebc0dbc851 (diff)
downloadqtlocation-mapboxgl-13e2acbc754893efb945fe02d20824698415dcdb.tar.gz
[ios, osx] Consolidate remaining files in platform/{ios,osx}
Diffstat (limited to 'gyp/platform-osx.gypi')
-rw-r--r--gyp/platform-osx.gypi48
1 files changed, 24 insertions, 24 deletions
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 970fd1b5f6..804a4cd9a6 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -23,26 +23,26 @@
'../platform/default/mbgl/storage/offline_download.cpp',
'../platform/default/sqlite3.hpp',
'../platform/default/sqlite3.cpp',
- '../platform/darwin/log_nslog.mm',
- '../platform/darwin/string_nsstring.mm',
- '../platform/darwin/application_root.mm',
- '../platform/darwin/image.mm',
- '../platform/darwin/nsthread.mm',
- '../platform/darwin/reachability.m',
- '../platform/darwin/NSException+MGLAdditions.h',
- '../platform/darwin/NSString+MGLAdditions.h',
- '../platform/darwin/NSString+MGLAdditions.m',
- '../platform/darwin/MGLTypes.m',
- '../platform/darwin/MGLStyle.mm',
- '../platform/darwin/MGLGeometry_Private.h',
- '../platform/darwin/MGLGeometry.mm',
- '../platform/darwin/MGLShape.m',
- '../platform/darwin/MGLMultiPoint_Private.h',
- '../platform/darwin/MGLMultiPoint.mm',
- '../platform/darwin/MGLPointAnnotation.m',
- '../platform/darwin/MGLPolyline.mm',
- '../platform/darwin/MGLPolygon.mm',
- '../platform/darwin/MGLMapCamera.mm',
+ '../platform/darwin/src/log_nslog.mm',
+ '../platform/darwin/src/string_nsstring.mm',
+ '../platform/darwin/src/application_root.mm',
+ '../platform/darwin/src/image.mm',
+ '../platform/darwin/src/nsthread.mm',
+ '../platform/darwin/src/reachability.m',
+ '../platform/darwin/src/NSException+MGLAdditions.h',
+ '../platform/darwin/src/NSString+MGLAdditions.h',
+ '../platform/darwin/src/NSString+MGLAdditions.m',
+ '../platform/darwin/src/MGLTypes.m',
+ '../platform/darwin/src/MGLStyle.mm',
+ '../platform/darwin/src/MGLGeometry_Private.h',
+ '../platform/darwin/src/MGLGeometry.mm',
+ '../platform/darwin/src/MGLShape.m',
+ '../platform/darwin/src/MGLMultiPoint_Private.h',
+ '../platform/darwin/src/MGLMultiPoint.mm',
+ '../platform/darwin/src/MGLPointAnnotation.m',
+ '../platform/darwin/src/MGLPolyline.mm',
+ '../platform/darwin/src/MGLPolygon.mm',
+ '../platform/darwin/src/MGLMapCamera.mm',
'../platform/osx/src/MGLAccountManager_Private.h',
'../platform/osx/src/MGLAccountManager.m',
'../platform/osx/src/MGLMapView_Private.h',
@@ -85,8 +85,8 @@
},
'include_dirs': [
- '../include/mbgl/osx',
- '../include/mbgl/darwin',
+ '../platform/osx/include',
+ '../platform/darwin/include',
'../include',
'../src',
'../platform/default',
@@ -107,8 +107,8 @@
'direct_dependent_settings': {
'include_dirs': [
- '../include/mbgl/osx',
- '../include/mbgl/darwin',
+ '../platform/osx/include',
+ '../platform/darwin/include',
'../include',
],
'mac_bundle_resources': [