diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-05-07 10:51:29 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-05-07 10:51:29 +0200 |
| commit | c298ac9d3a8be07b32865a3270146e4a49c453a5 (patch) | |
| tree | abfaf6817aa3db3e3569e6492bc4f5703b92bacc | |
| parent | d3d125694d39faef4d123009beee3e6de09adede (diff) | |
| download | qtlocation-mapboxgl-c298ac9d3a8be07b32865a3270146e4a49c453a5.tar.gz | |
on OS X, styles for the linux test app weren't bundled correctly
| -rw-r--r-- | gyp/styles.gypi | 27 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gypi | 2 |
2 files changed, 15 insertions, 14 deletions
diff --git a/gyp/styles.gypi b/gyp/styles.gypi index 8b3032b58c..06121f2d4c 100644 --- a/gyp/styles.gypi +++ b/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)' }], + } + }, ] } diff --git a/linux/mapboxgl-app.gypi b/linux/mapboxgl-app.gypi index 433a061e43..ec3c5d5fec 100644 --- a/linux/mapboxgl-app.gypi +++ b/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', ], |