diff options
| author | Leith Bade <leith@mapbox.com> | 2015-01-15 11:39:50 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-01-15 11:39:50 +1100 |
| commit | b7cc6bfaa686cfed1f0ac441693c5c070242343d (patch) | |
| tree | f97b38dcdfbe67d6159c257d81c85380ea2a0347 /gyp/mbgl-core.gypi | |
| parent | ddbfcada2776a86f8efb6cabba85f6c3a6633d38 (diff) | |
| parent | c6ca57045fb373d4fd76d1ec228bd35a518d06e8 (diff) | |
| download | qtlocation-mapboxgl-b7cc6bfaa686cfed1f0ac441693c5c070242343d.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/mbgl/shader/shader.cpp
Diffstat (limited to 'gyp/mbgl-core.gypi')
| -rw-r--r-- | gyp/mbgl-core.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index ea279f2dad..aa30c5b4dd 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -85,6 +85,7 @@ '<(standalone_lib)', '<@(uv_static_libs)', '<@(curl_static_libs)', + '<@(sqlite3_static_libs)', '<(core_lib)' ], } |