diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-16 18:30:19 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-16 18:30:19 -0800 |
| commit | fe0baffe0dfbf369f422e175c0fcf3dda9055118 (patch) | |
| tree | d404bd67ec2b338f37e4de958c74c44c841a77b5 /gyp | |
| parent | 8d3c2b3d303adaf2c9caa91356183d9b40cdfeab (diff) | |
| download | qtlocation-mapboxgl-fe0baffe0dfbf369f422e175c0fcf3dda9055118.tar.gz | |
update uv_zip and add tests
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/asset-fs.gypi | 17 | ||||
| -rw-r--r-- | gyp/asset-zip.gypi | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/gyp/asset-fs.gypi b/gyp/asset-fs.gypi index 0606eaf7f8..f8ec0e3558 100644 --- a/gyp/asset-fs.gypi +++ b/gyp/asset-fs.gypi @@ -25,6 +25,9 @@ 'libraries': [ '<@(uv_static_libs)', ], + 'defines': [ + '-DMBGL_ASSET_FS' + ], }, 'conditions': [ @@ -37,6 +40,20 @@ }], ], + 'direct_dependent_settings': { + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CFLAGS': [ '<@(defines)' ], + 'OTHER_CPLUSPLUSFLAGS': [ '<@(defines)' ], + } + }, { + 'cflags': [ '<@(defines)' ], + 'cflags_cc': [ '<@(defines)' ], + }] + ], + }, + 'link_settings': { 'conditions': [ ['OS == "mac"', { diff --git a/gyp/asset-zip.gypi b/gyp/asset-zip.gypi index 25df2a3d8b..5c57aa18b5 100644 --- a/gyp/asset-zip.gypi +++ b/gyp/asset-zip.gypi @@ -33,6 +33,9 @@ '<@(uv_static_libs)', '<@(zip_static_libs)', ], + 'defines': [ + '-DMBGL_ASSET_ZIP' + ], }, 'conditions': [ @@ -47,6 +50,20 @@ }], ], + 'direct_dependent_settings': { + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CFLAGS': [ '<@(defines)' ], + 'OTHER_CPLUSPLUSFLAGS': [ '<@(defines)' ], + } + }, { + 'cflags': [ '<@(defines)' ], + 'cflags_cc': [ '<@(defines)' ], + }] + ], + }, + 'link_settings': { 'conditions': [ ['OS == "mac"', { |