From 071f92079082aa0676772946d8d40184dcc3d40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Mon, 27 Oct 2014 12:34:10 -0700
Subject: [PATCH 1/3] mark as standalone static libraries so they get placed
 into the correct directory on non-osx targets

---
 gyp/mbgl-ios.gypi   | 1 +
 gyp/mbgl-linux.gypi | 1 +
 gyp/mbgl-osx.gypi   | 1 +
 gyp/mbgl.gypi       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index dbad60086..4398f04eb 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -28,6 +28,7 @@
     { 'target_name': 'mbgl-ios',
       'product_name': 'mbgl-ios',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index 39a175556..6d8631e8d 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl-linux',
       'product_name': 'mbgl-linux',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'include_dirs': [
         '../include'
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index ba117e5a5..80af5b97a 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl-osx',
       'product_name': 'mbgl-osx',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl.gypi b/gyp/mbgl.gypi
index f268fd625..0d914f46f 100644
--- a/gyp/mbgl.gypi
+++ b/gyp/mbgl.gypi
@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl',
       'product_name': 'mbgl',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'dependencies': [
           'shaders',

From f716acb0621e1f4ae04dee4fd648666d469fb176 Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Mon, 27 Oct 2014 15:43:54 -0400
Subject: [PATCH 2/3] standalone flag for mbgl-headless

---
 gyp/mbgl-headless.gypi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gyp/mbgl-headless.gypi b/gyp/mbgl-headless.gypi
index 5ffc251d2..e71fb7efb 100644
--- a/gyp/mbgl-headless.gypi
+++ b/gyp/mbgl-headless.gypi
@@ -3,6 +3,7 @@
     { 'target_name': 'mbgl-headless',
       'product_name': 'mbgl-headless',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'include_dirs': [
         '../include',
       ],

From e816d301bb2c25a4471c4614abc5fc6671b91f56 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Mon, 27 Oct 2014 17:02:20 -0400
Subject: [PATCH 3/3] refs #509: tickets good, inline TODO bad

---
 include/mbgl/map/transform.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp
index 5404f333c..4801ff109 100644
--- a/include/mbgl/map/transform.hpp
+++ b/include/mbgl/map/transform.hpp
@@ -91,7 +91,6 @@ private:
     TransformState final;
 
     // Limit the amount of zooming possible on the map.
-    // TODO: make these modifiable from outside.
     const double min_scale = std::pow(2, 0);
     const double max_scale = std::pow(2, 18);