diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-01-23 17:15:37 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 10:49:07 +0100 |
| commit | 873012005448d2bced2a1ca60580e8ca1c89cae6 (patch) | |
| tree | a5ecabe3fe109e72da2e661c30d54ab43c18f29d | |
| parent | 272fa8935ed1e97a7c8a5e6cbd44bb47ac7dc00b (diff) | |
| download | qtlocation-mapboxgl-873012005448d2bced2a1ca60580e8ca1c89cae6.tar.gz | |
move variables to their own file
| -rw-r--r-- | gyp/common.gypi | 31 | ||||
| -rw-r--r-- | gyp/variables.gypi | 32 |
2 files changed, 35 insertions, 28 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 3a2024415f..67a8dcd9d7 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -1,36 +1,11 @@ { + 'includes': [ + './variables.gypi', + ], 'variables': { 'install_prefix%': '', 'standalone_product_dir':'<!@(pwd)/build', - 'core_library%': 'mbgl-core', - 'headless_library%': 'mbgl-headless', }, - 'conditions': [ - ['platform == "osx"', { - 'variables': { - 'platform_library%': 'mbgl-osx', - 'storage_library%': 'mbgl-storage-cocoa', - }, - }], - ['platform == "ios"', { - 'variables': { - 'platform_library%': 'mbgl-ios', - 'storage_library%': 'mbgl-storage-cocoa', - }, - }], - ['platform == "linux"', { - 'variables': { - 'platform_library%': 'mbgl-linux', - 'storage_library%': 'mbgl-storage-curl', - }, - }], - ['platform == "android"', { - 'variables': { - 'platform_library%': 'mbgl-android', - 'storage_library%': 'mbgl-storage-curl', - }, - }], - ], 'target_defaults': { 'default_configuration': 'Release', 'conditions': [ diff --git a/gyp/variables.gypi b/gyp/variables.gypi new file mode 100644 index 0000000000..fd76adfb7a --- /dev/null +++ b/gyp/variables.gypi @@ -0,0 +1,32 @@ +{ + 'variables': { + 'core_library%': 'mbgl-core', + 'headless_library%': 'mbgl-headless', + }, + 'conditions': [ + ['platform == "osx"', { + 'variables': { + 'platform_library%': 'mbgl-osx', + 'storage_library%': 'mbgl-storage-cocoa', + }, + }], + ['platform == "ios"', { + 'variables': { + 'platform_library%': 'mbgl-ios', + 'storage_library%': 'mbgl-storage-cocoa', + }, + }], + ['platform == "linux"', { + 'variables': { + 'platform_library%': 'mbgl-linux', + 'storage_library%': 'mbgl-storage-curl', + }, + }], + ['platform == "android"', { + 'variables': { + 'platform_library%': 'mbgl-android', + 'storage_library%': 'mbgl-storage-curl', + }, + }], + ], +}
\ No newline at end of file |