summaryrefslogtreecommitdiff
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Info.plist2
-rw-r--r--macosx/main.mm8
-rw-r--r--macosx/mbgl-app.gyp (renamed from macosx/llmr-app.gyp)2
3 files changed, 6 insertions, 6 deletions
diff --git a/macosx/Info.plist b/macosx/Info.plist
index 88b4c38764..366a5d8abc 100644
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleSignature</key>
- <string>LLMR</string>
+ <string>MBGL</string>
<key>CFBundleVersion</key>
<string>0.0.1</string>
<key>CSResourcesFileMapped</key>
diff --git a/macosx/main.mm b/macosx/main.mm
index e12103f35e..da78f089c5 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -5,20 +5,20 @@
#import <Foundation/Foundation.h>
int main() {
- llmr::Log::Set<llmr::NSLogBackend>();
+ mbgl::Log::Set<mbgl::NSLogBackend>();
GLFWView view;
- llmr::Map map(view);
+ mbgl::Map map(view);
// Load settings
- llmr::Settings_NSUserDefaults settings;
+ mbgl::Settings_NSUserDefaults settings;
map.setLonLatZoom(settings.longitude, settings.latitude, settings.zoom);
map.setAngle(settings.angle);
map.setDebug(settings.debug);
// Set access token if present
NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
- if ( ! accessToken) llmr::Log::Warning(llmr::Event::Setup, "No access token set. Mapbox vector tiles won't work.");
+ if ( ! accessToken) mbgl::Log::Warning(mbgl::Event::Setup, "No access token set. Mapbox vector tiles won't work.");
if (accessToken) map.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]);
// Load style
diff --git a/macosx/llmr-app.gyp b/macosx/mbgl-app.gyp
index 139cb744c5..3afb3bc1af 100644
--- a/macosx/llmr-app.gyp
+++ b/macosx/mbgl-app.gyp
@@ -40,7 +40,7 @@
'CLANG_ENABLE_OBJC_ARC': 'YES'
},
'dependencies': [
- '../llmr.gyp:llmr-x86'
+ '../mbgl.gyp:mbgl-x86'
]
}
]