summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
Diffstat (limited to 'gyp')
-rw-r--r--gyp/core.gypi5
-rw-r--r--gyp/version.gypi2
2 files changed, 1 insertions, 6 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 51009be698..f9b361032e 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -31,14 +31,10 @@
'<@(libuv_cflags)',
'<@(opengl_cflags)',
'<@(boost_cflags)',
- '<@(geojsonvt_cflags)',
- '<@(variant_cflags)',
],
'cflags': [
'<@(libuv_cflags)',
'<@(opengl_cflags)',
- '<@(geojsonvt_cflags)',
- '<@(variant_cflags)',
'-fPIC'
],
'ldflags': [
@@ -47,7 +43,6 @@
],
'libraries': [
'<@(libuv_static_libs)',
- '<@(geojsonvt_static_libs)',
],
},
diff --git a/gyp/version.gypi b/gyp/version.gypi
index 4efdd079a8..1cc2eb351f 100644
--- a/gyp/version.gypi
+++ b/gyp/version.gypi
@@ -13,7 +13,7 @@
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp',
],
- 'action': ['<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)'],
+ 'action': ['<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)', '<!@(git describe --tags --always --abbrev=0)', '<!@(git rev-parse HEAD)'],
}
],
'direct_dependent_settings': {