diff options
Diffstat (limited to 'gyp/platform-ios.gypi')
-rw-r--r-- | gyp/platform-ios.gypi | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index f6d94b0e1c..dc52db7acd 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -16,29 +16,34 @@ '../platform/default/timer.cpp', '../platform/default/default_file_source.cpp', '../platform/default/online_file_source.cpp', - '../platform/default/sqlite_cache.cpp', + '../platform/default/mbgl/storage/offline.hpp', + '../platform/default/mbgl/storage/offline.cpp', + '../platform/default/mbgl/storage/offline_database.hpp', + '../platform/default/mbgl/storage/offline_database.cpp', + '../platform/default/mbgl/storage/offline_download.hpp', + '../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/ios/src/MGLMapboxEvents.h', '../platform/ios/src/MGLMapboxEvents.m', '../platform/ios/src/MGLMapView.mm', @@ -50,7 +55,7 @@ '../platform/ios/src/MGLUserLocationAnnotationView.m', '../platform/ios/src/MGLAnnotationImage_Private.h', '../platform/ios/src/MGLAnnotationImage.m', - '../include/mbgl/ios/MGLCalloutView.h', + '../platform/ios/include/MGLCalloutView.h', '../platform/ios/src/MGLCompactCalloutView.h', '../platform/ios/src/MGLCompactCalloutView.m', '../platform/ios/src/NSBundle+MGLAdditions.h', @@ -71,6 +76,8 @@ '<@(boost_cflags)', '<@(sqlite_cflags)', '<@(zlib_cflags)', + '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(sqlite_ldflags)', @@ -94,10 +101,11 @@ }, 'include_dirs': [ - '../include/mbgl/ios', - '../include/mbgl/darwin', + '../platform/ios/include', + '../platform/darwin/include', '../include', '../src', + '../platform/default', ], 'xcode_settings': { @@ -115,12 +123,13 @@ 'direct_dependent_settings': { 'include_dirs': [ - '../include/mbgl/ios', - '../include/mbgl/darwin', + '../platform/ios/include', + '../platform/darwin/include', '../include', ], 'mac_bundle_resources': [ '<!@(find ../platform/ios/resources -type f \! -name "README" \! -name \'.*\')', + '<!@(find ../platform/default/resources -type f \! -name "README" \! -name \'.der\')', ], }, }, |