diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-12-17 12:14:32 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-12-17 12:14:32 +0100 |
| commit | 936e09651424f111ac2ac64e2e60e2d13b082ebf (patch) | |
| tree | 99b7b7bef00ac011805f5a87ea9ddaf06466fed0 /linux | |
| parent | 02e43c6d30553a676b912abe1391b82219290333 (diff) | |
| download | qtlocation-mapboxgl-936e09651424f111ac2ac64e2e60e2d13b082ebf.tar.gz | |
Make file request overridable by platform implementations
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/main.cpp | 2 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/main.cpp b/linux/main.cpp index 42a98d0198..c5b2569ba3 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { // Load style if (style.empty()) - style = std::string("file://") + uv::cwd() + std::string("/../../styles/styles/bright-v6.json"); + style = std::string("file://") + uv::cwd() + std::string("/styles/bright-v6.json"); map.setStyleURL(style); diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index fbeabd74ea..4127b5c278 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -48,6 +48,7 @@ 'dependencies': [ '../mapboxgl.gyp:mbgl-standalone', '../mapboxgl.gyp:mbgl-linux', + '../mapboxgl.gyp:bundle_styles', '../mapboxgl.gyp:copy_certificate_bundle', ], 'copies': [{ |