diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-27 18:08:44 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-27 18:08:44 -0400 |
| commit | 47f50bd6c2ca440ff834dcbe2cf2082e780d163e (patch) | |
| tree | 27aae45e78c00c7bc61f7455350a671eda9fd598 /gyp | |
| parent | d13a10f8ff0706368a13ffb1ecdf659a3c369518 (diff) | |
| parent | a9470feb2380c63c66cfbf44782d9a390018e5e1 (diff) | |
| download | qtlocation-mapboxgl-47f50bd6c2ca440ff834dcbe2cf2082e780d163e.tar.gz | |
Merge branch 'master' into mbgl-config
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-headless.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl.gypi | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/gyp/mbgl-headless.gypi b/gyp/mbgl-headless.gypi index 5ffc251d22..e71fb7efb9 100644 --- a/gyp/mbgl-headless.gypi +++ b/gyp/mbgl-headless.gypi @@ -3,6 +3,7 @@ { 'target_name': 'mbgl-headless', 'product_name': 'mbgl-headless', 'type': 'static_library', + 'standalone_static_library': 1, 'include_dirs': [ '../include', ], diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index dbad60086c..4398f04ebc 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -28,6 +28,7 @@ { 'target_name': 'mbgl-ios', 'product_name': 'mbgl-ios', 'type': 'static_library', + 'standalone_static_library': 1, 'hard_dependency': 1, 'include_dirs': [ '../include', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 39a1755569..6d8631e8dc 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -3,6 +3,7 @@ { 'target_name': 'mbgl-linux', 'product_name': 'mbgl-linux', 'type': 'static_library', + 'standalone_static_library': 1, 'hard_dependency': 1, 'include_dirs': [ '../include' diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index ba117e5a59..80af5b97a3 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -3,6 +3,7 @@ { 'target_name': 'mbgl-osx', 'product_name': 'mbgl-osx', 'type': 'static_library', + 'standalone_static_library': 1, 'hard_dependency': 1, 'include_dirs': [ '../include', diff --git a/gyp/mbgl.gypi b/gyp/mbgl.gypi index f268fd6255..0d914f46f4 100644 --- a/gyp/mbgl.gypi +++ b/gyp/mbgl.gypi @@ -3,6 +3,7 @@ { 'target_name': 'mbgl', 'product_name': 'mbgl', 'type': 'static_library', + 'standalone_static_library': 1, 'hard_dependency': 1, 'dependencies': [ 'shaders', |