From a217e8aeb7dac92992e5d980058ce31bc07bc826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 19 Sep 2018 09:55:12 +0200 Subject: [core] add --cache option to GLFW binary to specify the cache database --- cmake/glfw.cmake | 2 ++ platform/glfw/main.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index c59ca013d0..eacc72d338 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -39,11 +39,13 @@ xcode_create_scheme( TARGET mbgl-glfw OPTIONAL_ARGS "--style=file.json" + "--cache=/tmp/mbgl-cache.db" "--lon=0" "--lat=0" "--zoom=1" "--bearing=0" "--pitch=0" "--fullscreen" + "--offline" "--benchmark" ) diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index 8915f1d7f1..1bb2e13614 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -43,6 +43,7 @@ int main(int argc, char *argv[]) { args::Flag offlineFlag(argumentParser, "offline", "Toggle offline", {'o', "offline"}); args::ValueFlag styleValue(argumentParser, "URL", "Map stylesheet", {'s', "style"}); + args::ValueFlag cacheDBValue(argumentParser, "file", "Cache database file name", {'c', "cache"}); args::ValueFlag lonValue(argumentParser, "degrees", "Longitude", {'x', "lon"}); args::ValueFlag latValue(argumentParser, "degrees", "Latitude", {'y', "lat"}); args::ValueFlag zoomValue(argumentParser, "number", "Zoom level", {'z', "zoom"}); @@ -76,6 +77,7 @@ int main(int argc, char *argv[]) { const bool fullscreen = fullscreenFlag ? args::get(fullscreenFlag) : false; const bool benchmark = benchmarkFlag ? args::get(benchmarkFlag) : false; std::string style = styleValue ? args::get(styleValue) : ""; + const std::string cacheDB = cacheDBValue ? args::get(cacheDBValue) : "/tmp/mbgl-cache.db"; // sigint handling struct sigaction sigIntHandler; @@ -91,7 +93,7 @@ int main(int argc, char *argv[]) { GLFWView backend(fullscreen, benchmark); view = &backend; - mbgl::DefaultFileSource fileSource("/tmp/mbgl-cache.db", "."); + mbgl::DefaultFileSource fileSource(cacheDB, "."); if (!settings.online) { fileSource.setOnlineStatus(false); mbgl::Log::Warning(mbgl::Event::Setup, "Application is offline. Press `O` to toggle online status."); -- cgit v1.2.1