summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2015-02-02 15:18:01 -0800
committerDane Springmeyer <dane@mapbox.com>2015-02-02 15:18:01 -0800
commit33b4922220d19a5049072b59cbad01358099b1cf (patch)
tree4549f0bc09d8f245806f0a394152ec4ac71143f5 /gyp
parent21208f84df2008d04d25b442dc97b02e8d45fe90 (diff)
downloadqtlocation-mapboxgl-33b4922220d19a5049072b59cbad01358099b1cf.tar.gz
Adapt to https://github.com/mapbox/mason/commit/c104c2f9721b793535e4ec658afe2582e57be164 and https://github.com/mapbox/mason/commit/49fd47774032bf0f80efaad0143db3634385d2bf
Diffstat (limited to 'gyp')
-rw-r--r--gyp/mbgl-android.gypi2
-rw-r--r--gyp/mbgl-linux.gypi2
2 files changed, 4 insertions, 0 deletions
diff --git a/gyp/mbgl-android.gypi b/gyp/mbgl-android.gypi
index 0edc0ef433..85115910cd 100644
--- a/gyp/mbgl-android.gypi
+++ b/gyp/mbgl-android.gypi
@@ -50,6 +50,8 @@
'link_settings': {
'libraries': [
'<@(png_static_libs)',
+ '<@(jpeg_static_libs)',
+ '<@(nu_static_libs)'
],
},
'conditions': [
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index 2bcc03ffa6..c515e68bed 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -48,6 +48,8 @@
'link_settings': {
'libraries': [
'<@(png_static_libs)',
+ '<@(jpeg_static_libs)',
+ '<@(nu_static_libs)'
],
},
'conditions': [