diff options
| author | Antonio Zugaldia <antonio@silicalabs.com> | 2015-09-15 17:58:36 -0400 |
|---|---|---|
| committer | Antonio Zugaldia <antonio@silicalabs.com> | 2015-09-15 17:58:36 -0400 |
| commit | 7e30025abb5dac44372ae71f2d5d409e82d3227f (patch) | |
| tree | 92261392474b4b2fa7f7b5e88452b6ee1fa1a524 /test | |
| parent | 187cc36eb55edb73730fa13a76655f5cf9f8efe5 (diff) | |
| download | qtlocation-mapboxgl-7e30025abb5dac44372ae71f2d5d409e82d3227f.tar.gz | |
Merge remote-tracking branch 'mapbox/master' into 2317-espresso
Conflicts:
src/mbgl/util/geojsonvt
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/test.gypi b/test/test.gypi index a35b00133b..c53263bd5c 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -95,6 +95,7 @@ 'libraries': [ '<@(libuv_static_libs)', '<@(sqlite_static_libs)', + '<@(geojsonvt_static_libs)', ], 'variables': { 'cflags_cc': [ @@ -102,6 +103,8 @@ '<@(opengl_cflags)', '<@(boost_cflags)', '<@(sqlite_cflags)', + '<@(geojsonvt_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(libuv_ldflags)', |