refactor makefile

2 files changed, 28 insertions, 10 deletions

diff --git a/platform/darwin/asset_root.mm b/platform/darwin/asset_root.mm
new file mode 100644
index 0000000000..375975a84b
--- /dev/null
+++ b/platform/darwin/asset_root.mm
@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+
+#include <mbgl/platform/platform.hpp>
+
+namespace mbgl {
+namespace platform {
+
+// Returns the path to the root folder of the application.
+const std::string &assetRoot() {
+    static const std::string root = []() -> std::string {
+        NSString *path = [[[NSBundle mainBundle] resourceURL] path];
+        return {[path cStringUsingEncoding : NSUTF8StringEncoding],
+                [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding]};
+    }();
+    return root;
+}
+}
+}
diff --git a/platform/darwin/http_request_cocoa.mm b/platform/darwin/http_request_nsurl.mm
index efcc910488..83c010f8b8 100644
--- a/platform/darwin/http_request_cocoa.mm
+++ b/platform/darwin/http_request_nsurl.mm
@@ -43,7 +43,7 @@ enum class ResponseStatus : uint8_t {
 
 // -------------------------------------------------------------------------------------------------
 
-class HTTPCocoaContext;
+class HTTPNSURLContext;
 
 class HTTPRequestImpl {
 public:
@@ -62,7 +62,7 @@ public:
     static void restart(uv_timer_t *timer, int);
 
 private:
-    HTTPCocoaContext *context = nullptr;
+    HTTPNSURLContext *context = nullptr;
     HTTPRequest *request = nullptr;
     NSURLSessionDataTask *task = nullptr;
     std::unique_ptr<Response> response;
@@ -78,19 +78,19 @@ private:
 
 // -------------------------------------------------------------------------------------------------
 
-class HTTPCocoaContext : public HTTPContext<HTTPCocoaContext> {
+class HTTPNSURLContext : public HTTPContext<HTTPNSURLContext> {
 public:
-    HTTPCocoaContext(uv_loop_t *loop);
-    ~HTTPCocoaContext();
+    HTTPNSURLContext(uv_loop_t *loop);
+    ~HTTPNSURLContext();
 
     NSURLSession *session = nil;
     NSString *userAgent = nil;
 };
 
-template<> pthread_key_t HTTPContext<HTTPCocoaContext>::key{};
-template<> pthread_once_t HTTPContext<HTTPCocoaContext>::once = PTHREAD_ONCE_INIT;
+template<> pthread_key_t ThreadContext<HTTPNSURLContext>::key{};
+template<> pthread_once_t ThreadContext<HTTPNSURLContext>::once = PTHREAD_ONCE_INIT;
 
-HTTPCocoaContext::HTTPCocoaContext(uv_loop_t *loop_) : HTTPContext(loop_) {
+HTTPNSURLContext::HTTPNSURLContext(uv_loop_t *loop_) : HTTPContext(loop_) {
     @autoreleasepool {
         NSURLSessionConfiguration *sessionConfig =
                 [NSURLSessionConfiguration defaultSessionConfiguration];
@@ -107,7 +107,7 @@ HTTPCocoaContext::HTTPCocoaContext(uv_loop_t *loop_) : HTTPContext(loop_) {
     }
 }
 
-HTTPCocoaContext::~HTTPCocoaContext() {
+HTTPNSURLContext::~HTTPNSURLContext() {
     [session release];
     session = nullptr;
 
@@ -119,7 +119,7 @@ HTTPCocoaContext::~HTTPCocoaContext() {
 
 HTTPRequestImpl::HTTPRequestImpl(HTTPRequest *request_, uv_loop_t *loop,
                                  std::unique_ptr<Response> existingResponse_)
-    : context(HTTPCocoaContext::Get(loop)),
+    : context(HTTPNSURLContext::Get(loop)),
       request(request_),
       existingResponse(std::move(existingResponse_)),
       async(new uv_async_t) {