summaryrefslogtreecommitdiff
path: root/mbgl.gyp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-01-26 18:24:36 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-02-04 10:49:08 +0100
commit3d51e116a84ee168975bcee8377e9156f77e2731 (patch)
tree5a9799423e496c8c77f3e2edd6ae334dbf823da4 /mbgl.gyp
parent46553ff00c15414f4087ba9195fed7eba340fc13 (diff)
downloadqtlocation-mapboxgl-3d51e116a84ee168975bcee8377e9156f77e2731.tar.gz
use fake linker for merging the standalone static library
Diffstat (limited to 'mbgl.gyp')
-rw-r--r--mbgl.gyp10
1 files changed, 5 insertions, 5 deletions
diff --git a/mbgl.gyp b/mbgl.gyp
index 2f65caa442..8ad17e87d4 100644
--- a/mbgl.gyp
+++ b/mbgl.gyp
@@ -7,26 +7,26 @@
'./gyp/certificates.gypi',
'./gyp/mbgl-core.gypi',
'./gyp/mbgl-headless.gypi',
- './gyp/mbgl-storage-curl.gypi',
- './gyp/install.gypi',
+ './gyp/mbgl-standalone.gypi',
],
'conditions': [
['platform == "osx"', {
'includes': [
'./gyp/mbgl-osx.gypi',
- './gyp/mbgl-storage-cocoa.gypi'
+ './gyp/mbgl-storage-cocoa.gypi',
],
}],
['platform == "ios"', {
'includes': [
'./gyp/mbgl-ios.gypi',
- './gyp/mbgl-storage-cocoa.gypi'
+ './gyp/mbgl-storage-cocoa.gypi',
],
}],
['platform == "linux"', {
'includes': [
- './gyp/mbgl-linux.gypi'
+ './gyp/mbgl-linux.gypi',
+ './gyp/mbgl-storage-curl.gypi',
],
}],
['platform == "android"', {