Merge pull request #1456 from mapbox/1456-copy-styles

Fix sprite bundling for non-bundle-apps on OS X

gyp/styles.gypi

@@ -14,21 +14,22 @@
       ],
     },
     {
-      'target_name': 'bundle_styles',
+      'target_name': 'bundle_styles', # use this only for targets that create an App bundle
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
-      'conditions': [
-        ['platform_lib == "osx" or platform_lib == "ios"', {
-          'direct_dependent_settings': {
-            'mac_bundle_resources': [ '../styles/styles' ],
-          }
-        }, {
-          'direct_dependent_settings': {
-            'copies': [{ 'files': [ '../styles/styles' ], 'destination': '<(PRODUCT_DIR)' }],
-          }
-        }]
-      ],
-    }
+      'direct_dependent_settings': {
+        'mac_bundle_resources': [ '../styles/styles' ],
+      }
+    },
+    {
+      'target_name': 'copy_styles', # use this only for targets that don't create an App bundle
+      'type': 'none',
+      'hard_dependency': 1,
+      'dependencies': [ 'touch_styles' ],
+      'direct_dependent_settings': {
+        'copies': [{ 'files': [ '../styles/styles' ], 'destination': '<(PRODUCT_DIR)' }],
+      }
+    },
   ]
 }

linux/mapboxgl-app.gypi

@@ -13,7 +13,7 @@
         '../mbgl.gyp:http-<(http_lib)',
         '../mbgl.gyp:asset-<(asset_lib)',
         '../mbgl.gyp:cache-<(cache_lib)',
-        '../mbgl.gyp:bundle_styles',
+        '../mbgl.gyp:copy_styles',
         '../mbgl.gyp:copy_certificate_bundle',
       ],