diff options
| author | Brad Leege <bleege@gmail.com> | 2015-05-04 17:04:46 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2015-05-04 17:04:46 -0500 |
| commit | 4ce4e979ff85f8fc135fccf675c6a5e8939cdd66 (patch) | |
| tree | dd49fd5b095445d9ef2ff28ec64157bacbbe2dd5 /gyp | |
| parent | 7f6cc6cc6d462952c02fbc50bd90f4f765a55809 (diff) | |
| parent | c2858dd45f735d99b1bc46043cff0b2a6b176c63 (diff) | |
| download | qtlocation-mapboxgl-4ce4e979ff85f8fc135fccf675c6a5e8939cdd66.tar.gz | |
Updating from master
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/ios.gyp | 5 | ||||
| -rw-r--r-- | gyp/linux.gyp | 7 | ||||
| -rw-r--r-- | gyp/osx.gyp | 8 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 6 | ||||
| -rw-r--r-- | gyp/platform-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 1 |
7 files changed, 29 insertions, 0 deletions
diff --git a/gyp/ios.gyp b/gyp/ios.gyp new file mode 100644 index 0000000000..989f34cb72 --- /dev/null +++ b/gyp/ios.gyp @@ -0,0 +1,5 @@ +{ + 'includes': [ + '../ios/app/mapboxgl-app.gypi', + ], +} diff --git a/gyp/linux.gyp b/gyp/linux.gyp new file mode 100644 index 0000000000..0f7126934f --- /dev/null +++ b/gyp/linux.gyp @@ -0,0 +1,7 @@ +{ + 'includes': [ + '../linux/mapboxgl-app.gypi', + '../test/test.gypi', + '../bin/render.gypi', + ], +} diff --git a/gyp/osx.gyp b/gyp/osx.gyp new file mode 100644 index 0000000000..64663540b2 --- /dev/null +++ b/gyp/osx.gyp @@ -0,0 +1,8 @@ +{ + 'includes': [ + '../macosx/mapboxgl-app.gypi', + '../linux/mapboxgl-app.gypi', + '../test/test.gypi', + '../bin/render.gypi', + ], +} diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index bfaac7d4f6..7701393bb9 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -12,6 +12,7 @@ 'sources': [ '../platform/android/log_android.cpp', '../platform/android/asset_root.cpp', + '../platform/default/thread.cpp', '../platform/default/string_stdlib.cpp', '../platform/default/image.cpp', '../platform/default/image_reader.cpp', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 305fd5284d..1f96f94702 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -15,6 +15,7 @@ '../platform/darwin/application_root.mm', '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', + '../platform/darwin/nsthread.mm', '../platform/darwin/reachability.m', '../include/mbgl/ios/MapboxGL.h', '../include/mbgl/ios/MGLMapboxEvents.h', @@ -22,6 +23,8 @@ '../include/mbgl/ios/MGLMapView.h', '../include/mbgl/ios/MGLMapView+IBAdditions.h', '../platform/ios/MGLMapView.mm', + '../platform/ios/MGLFileCache.h', + '../platform/ios/MGLFileCache.mm', '../include/mbgl/ios/MGLAccountManager.h', '../platform/ios/MGLAccountManager.m', '../include/mbgl/ios/MGLAnnotation.h', @@ -33,6 +36,9 @@ '../include/mbgl/ios/MGLMetricsLocationManager.h', '../platform/ios/MGLMetricsLocationManager.m', '../include/mbgl/ios/MGLTypes.h', + '../platform/ios/NSBundle+MGLAdditions.h', + '../platform/ios/NSBundle+MGLAdditions.m', + '../platform/ios/NSException+MGLAdditions.h', '../platform/ios/NSProcessInfo+MGLAdditions.h', '../platform/ios/NSProcessInfo+MGLAdditions.m', '../platform/ios/NSString+MGLAdditions.h', diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 30715f8289..394433870d 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -14,6 +14,7 @@ '../platform/default/string_stdlib.cpp', '../platform/default/application_root.cpp', '../platform/default/asset_root.cpp', + '../platform/default/thread.cpp', '../platform/default/image.cpp', '../platform/default/image_reader.cpp', '../platform/default/png_reader.cpp', diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 6d6c35b294..ae5194761c 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -15,6 +15,7 @@ '../platform/darwin/application_root.mm', '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', + '../platform/darwin/nsthread.mm', ], 'variables': { |