diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-16 18:53:56 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-16 18:53:56 -0700 |
commit | 4ea281c750c5afcc68f2832bb42d98a1cbce6735 (patch) | |
tree | 60bc7d3ccba2c54859e2e023997cc027cc67aea7 /linux | |
parent | c1a64dc5fa73b54cc5de77629781dfc74302a1e7 (diff) | |
download | qtlocation-mapboxgl-4ea281c750c5afcc68f2832bb42d98a1cbce6735.tar.gz |
rename llmr => mbgl
Diffstat (limited to 'linux')
-rw-r--r-- | linux/main.cpp | 12 | ||||
-rw-r--r-- | linux/mbgl-app.gyp (renamed from linux/llmr-app.gyp) | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/linux/main.cpp b/linux/main.cpp index 11a21880f1..e603be55e4 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -1,5 +1,5 @@ -#include <llmr/llmr.hpp> -#include <llmr/platform/platform.hpp> +#include <mbgl/mbgl.hpp> +#include <mbgl/platform/platform.hpp> #include <signal.h> #include <getopt.h> @@ -23,7 +23,7 @@ void quit_handler(int) { } int main(int argc, char *argv[]) { - llmr::Log::Set<llmr::StderrLogBackend>(); + mbgl::Log::Set<mbgl::StderrLogBackend>(); int fullscreen_flag = 0; @@ -55,10 +55,10 @@ int main(int argc, char *argv[]) { stylejson << stylefile.rdbuf(); view = new GLFWView(); - llmr::Map map(*view); + mbgl::Map map(*view); // Load settings - llmr::Settings_JSON settings; + mbgl::Settings_JSON settings; map.setLonLatZoom(settings.longitude, settings.latitude, settings.zoom); map.setAngle(settings.angle); map.setDebug(settings.debug); @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) { // Set access token if present const char *token = getenv("MAPBOX_ACCESS_TOKEN"); if (token == nullptr) { - llmr::Log::Warning(llmr::Event::Setup, "no access token set. mapbox.com tiles won't work."); + mbgl::Log::Warning(mbgl::Event::Setup, "no access token set. mapbox.com tiles won't work."); } else { map.setAccessToken(std::string(token)); } diff --git a/linux/llmr-app.gyp b/linux/mbgl-app.gyp index e53a122240..60d33e5936 100644 --- a/linux/llmr-app.gyp +++ b/linux/mbgl-app.gyp @@ -52,9 +52,9 @@ }], ], 'dependencies': [ - '../llmr.gyp:llmr-x86', - '../llmr.gyp:copy_default_stylesheet', - '../llmr.gyp:copy_certificate_bundle', + '../mbgl.gyp:mbgl-x86', + '../mbgl.gyp:copy_default_stylesheet', + '../mbgl.gyp:copy_certificate_bundle', ], }, ], |