diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-07 00:29:20 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-07 00:29:20 +1100 |
| commit | b534520d6c60d45555e8a704ebeaec70800f0eaa (patch) | |
| tree | 9da36f6adafadfae47f2e7660e8e8fff36e371d8 /gyp | |
| parent | f2776c0854067e31391bff129bcfe9e7fbd72cf1 (diff) | |
| parent | 004d12ea0b89d5fe369ab5631e20cc7e2caef429 (diff) | |
| download | qtlocation-mapboxgl-b534520d6c60d45555e8a704ebeaec70800f0eaa.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
include/mbgl/platform/gl.hpp
src/mbgl/platform/gl.cpp
src/mbgl/shader/shader.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index c2cb2eed5f..a79737b0cd 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -32,6 +32,7 @@ 'hard_dependency': 1, 'sources': [ '../platform/ios/cache_database_library.mm', + '../platform/ios/shader_cache_library.mm', '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 5bfa8f757d..c42a49d9d1 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -28,6 +28,7 @@ }, 'sources': [ '../platform/default/cache_database_tmp.cpp', + '../platform/default/shader_cache_tmp.cpp', '../platform/default/log_stderr.cpp', '../platform/default/string_stdlib.cpp', '../platform/default/http_request_baton_curl.cpp', diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 0ca00a81e9..542f6cb9e3 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -7,6 +7,7 @@ 'hard_dependency': 1, 'sources': [ '../platform/osx/cache_database_application_support.mm', + '../platform/osx/shader_cache_application_support.mm', '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', |