Merge branch 'master' into nunicode

Conflicts:
	configure
	styles

10 files changed, 29 insertions, 58 deletions

diff --git a/gyp/common.gypi b/gyp/common.gypi
index 16025eb5ae..b21e8b50d7 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -8,6 +8,7 @@
     'conditions': [
       ['OS=="mac"', {
         'xcode_settings': {
+          'MACOSX_DEPLOYMENT_TARGET':'10.9',
           'CLANG_CXX_LIBRARY': 'libc++',
           'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
           'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
diff --git a/gyp/fixtures.gypi b/gyp/fixtures.gypi
deleted file mode 100644
index 199865a6f3..0000000000
--- a/gyp/fixtures.gypi
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  'targets': [
-    { 'target_name': 'copy_fixtures',
-      'type': 'none',
-      'hard_dependency': 1,
-      'dependencies': [
-        'bundle_styles'
-      ],
-      'copies': [
-        {
-          'files': [ '../styles' ],
-          'destination': '../test/fixtures/style_parser'
-        }
-      ]
-    },
-  ]
-}
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 562f443d16..df65d0457e 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -22,7 +22,6 @@
             'conditions': [
               ['OS == "linux"', {
                   'other_ldflags': [
-                      '-L<(boost_root)/lib',
                       '<@(glfw3_static_libs)',
                       '<@(glfw3_ldflags)',
                   ]
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi
index e49697388c..46ff762742 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/mbgl-core.gypi
@@ -10,7 +10,6 @@
       ],
       'variables': {
         'cflags_cc': [
-          '<@(png_cflags)',
           '<@(uv_cflags)',
           '<@(sqlite3_cflags)',
           '<@(zlib_cflags)',
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index 755b3cc483..5566ca3a32 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -34,6 +34,7 @@
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
+        '../platform/darwin/image.mm',
       ],
       'include_dirs': [
         '../include',
@@ -44,7 +45,13 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
-        ]
+        ],
+        'xcode_settings': {
+          'OTHER_LDFLAGS': [
+            '-framework ImageIO',
+            '-framework MobileCoreServices',
+          ],
+        },
       },
     },
   ],
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index 9f01ba3bb5..a22bd8f7c2 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -7,6 +7,7 @@
       'hard_dependency': 1,
       'variables': {
         'cflags_cc': [
+          '<@(png_cflags)',
           '<@(uv_cflags)',
           '<@(curl_cflags)',
           '<@(nu_cflags)',
@@ -16,6 +17,7 @@
           '<@(nu_cflags)',
         ],
         'ldflags': [
+          '<@(png_ldflags)',
           '<@(uv_ldflags)',
           '<@(curl_ldflags)',
           '<@(nu_ldflags)',
@@ -26,10 +28,16 @@
         '../platform/default/log_stderr.cpp',
         '../platform/default/string_stdlib.cpp',
         '../platform/default/http_request_baton_curl.cpp',
+        '../platform/default/image.cpp',
       ],
       'include_dirs': [
         '../include',
       ],
+      'link_settings': {
+        'libraries': [
+          '<@(png_static_libs)',
+        ],
+      },
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
@@ -37,7 +45,6 @@
             'OTHER_CFLAGS': [ '<@(cflags)' ],
           }
         }, {
-          'ldflags': [ '<@(ldflags)' ],
           'cflags_cc': [ '<@(cflags_cc)' ],
           'cflags': [ '<@(cflags)' ],
         }]
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index bee0325498..76c22f5ad6 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -10,6 +10,7 @@
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
+        '../platform/darwin/image.mm',
       ],
       'include_dirs': [
         '../include',
@@ -20,7 +21,13 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
-        ]
+        ],
+        'xcode_settings': {
+          'OTHER_LDFLAGS': [
+            '-framework ImageIO',
+            '-framework CoreServices',
+          ],
+        },
       },
     },
   ],
diff --git a/gyp/npm_install.gypi b/gyp/npm_install.gypi
deleted file mode 100644
index ddd3081ad5..0000000000
--- a/gyp/npm_install.gypi
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  'targets': [
-    { 'target_name': 'npm_install',
-      'type': 'none',
-      'hard_dependency': 1,
-      'actions': [
-        {
-          'action_name': 'npm install',
-          'inputs': [
-            '../bin/package.json',
-          ],
-          'outputs': [
-            '../bin/node_modules',
-          ],
-          'action': ['./scripts/npm_install.sh', '<@(npm)']
-        }
-      ],
-    },
-  ]
-}
diff --git a/gyp/shaders.gypi b/gyp/shaders.gypi
index 9435bd7d9c..edbcb61f23 100644
--- a/gyp/shaders.gypi
+++ b/gyp/shaders.gypi
@@ -4,13 +4,11 @@
       'target_name': 'shaders',
       'type': 'none',
       'hard_dependency': 1,
-      'dependencies': [
-        'npm_install'
-      ],
       'actions': [
         {
           'action_name': 'Build Shaders',
           'inputs': [
+            '../scripts/build-shaders.py',
             '<!@(find src -name "*.glsl")'
           ],
           'outputs': [
@@ -18,7 +16,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp',
           ],
-          'action': ['<@(node)', 'bin/build-shaders.js', '<(SHARED_INTERMEDIATE_DIR)'],
+          'action': ['<@(python)', 'scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
         }
       ],
       'direct_dependent_settings': {
diff --git a/gyp/styles.gypi b/gyp/styles.gypi
index 31bf530c5f..02cdea6e04 100644
--- a/gyp/styles.gypi
+++ b/gyp/styles.gypi
@@ -19,18 +19,8 @@
       'hard_dependency': 1,
       'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
       'direct_dependent_settings': {
-        'mac_bundle_resources': [ '../styles' ],
+        'mac_bundle_resources': [ '../styles/styles' ],
       }
-    },
-    {
-      'target_name': 'copy_styles',
-      'type': 'none',
-      'hard_dependency': 1,
-      'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
-      'copies': [{
-        'files': [ '../styles' ],
-        'destination': '<(PRODUCT_DIR)'
-      }],
-    },
+    }
   ]
 }