diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-05 23:16:49 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-05 23:16:49 +1100 |
| commit | de9eb00276684a10f49a1c490f55266b80238155 (patch) | |
| tree | fc713b06541bb1af04e95c70f2e383bcb86a164a /gyp | |
| parent | c348c141c5c5754c962d9b7e94af83f097e30487 (diff) | |
| parent | ff640132de0fe855314a8fd86adae3a2fb33237b (diff) | |
| download | qtlocation-mapboxgl-de9eb00276684a10f49a1c490f55266b80238155.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
.gitignore
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
include/mbgl/map/map.hpp
src/mbgl/map/map.cpp
src/mbgl/storage/caching_http_file_source.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-core.gypi | 2 | ||||
| -rw-r--r-- | gyp/mbgl-headless.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 022480350a..279051968c 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -21,7 +21,6 @@ }, 'sources': [ '<!@(find src -name "*.cpp")', - '<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")', '<!@(find src -name "*.c")', '<!@(find src -name "*.h")', '<!@(find include -name "*.hpp")', @@ -31,6 +30,7 @@ ], 'include_dirs': [ '../include', + '../src', ], 'conditions': [ ['OS == "mac"', { diff --git a/gyp/mbgl-headless.gypi b/gyp/mbgl-headless.gypi index da11c8781c..a96ec24c9e 100644 --- a/gyp/mbgl-headless.gypi +++ b/gyp/mbgl-headless.gypi @@ -29,7 +29,6 @@ 'sources': [ '../platform/default/headless_view.cpp', '../platform/default/headless_display.cpp', - '../platform/default/caching_http_file_source.cpp', ], }, ], diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index a2e6f65ba1..c2cb2eed5f 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -36,7 +36,6 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', - '../platform/default/caching_http_file_source.cpp', '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 2f402075a7..5bfa8f757d 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -35,7 +35,6 @@ '../platform/default/image_reader.cpp', '../platform/default/png_reader.cpp', '../platform/default/jpeg_reader.cpp', - '../platform/default/caching_http_file_source.cpp', '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index d0eae56733..0ca00a81e9 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -11,7 +11,6 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', - '../platform/default/caching_http_file_source.cpp', '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ |