diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-18 12:39:36 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-18 12:39:36 +1100 |
| commit | 40f859e482e5282d0fbf257a9feaa9d70953a4fd (patch) | |
| tree | 0fb920677d0ba92cedc64a4df9e1da045e891e75 /include/mbgl/platform | |
| parent | 6f56e88ee599160b336cce222384979a2b517343 (diff) | |
| parent | a8dec01230a00f9e701fc6403110c4f5017ba905 (diff) | |
| download | qtlocation-mapboxgl-40f859e482e5282d0fbf257a9feaa9d70953a4fd.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
gyp/mbgl-ios.gypi
gyp/mbgl-osx.gypi
platform/default/asset_request_libuv.cpp
src/mbgl/storage/caching_http_file_source.cpp
src/mbgl/storage/file_request.cpp
src/mbgl/storage/file_request.hpp
src/mbgl/storage/file_request_baton.hpp
Diffstat (limited to 'include/mbgl/platform')
| -rw-r--r-- | include/mbgl/platform/platform.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index 9edcc23ccd..02c612c833 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -23,6 +23,8 @@ std::string defaultCacheDatabase(); // Returns the path to the default shader cache on this system. std::string defaultShaderCache(); +std::string applicationRoot(); + // Shows an alpha image with the specified dimensions in a named window. void show_debug_image(std::string name, const char *data, size_t width, size_t height); |