diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-10 19:22:25 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-10 19:22:25 +1100 |
| commit | 6bb1a5a146bcffde0f5f25587413c5fb076890b5 (patch) | |
| tree | b8141fb0de4d565ffbe92d53ebdb26bb8412f370 /gyp | |
| parent | c38bd5e40355493fb23b6efbe3a3063cfc9cbe3b (diff) | |
| parent | 392150dd4856e1e576a9fa91c52873936504e755 (diff) | |
| download | qtlocation-mapboxgl-6bb1a5a146bcffde0f5f25587413c5fb076890b5.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
include/mbgl/platform/default/headless_view.hpp
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 3 | ||||
| -rw-r--r-- | gyp/version.gypi | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index 56591d27d4..5338bfed1b 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -16,7 +16,8 @@ { 'files': [ '<(PRODUCT_DIR)/libmbgl-core.a' ], 'destination': '<(install_prefix)/lib' }, { 'files': [ '<(PRODUCT_DIR)/libmbgl-headless.a' ], 'destination': '<(install_prefix)/lib' }, { 'files': [ '<(PRODUCT_DIR)/libmbgl-<(platform).a' ], 'destination': '<(install_prefix)/lib' }, - { 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' } + { 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' }, + { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' }, ], 'variables': { 'conditions': [ diff --git a/gyp/version.gypi b/gyp/version.gypi index ca68f0eb57..341d9d3a2b 100644 --- a/gyp/version.gypi +++ b/gyp/version.gypi @@ -6,13 +6,12 @@ 'hard_dependency': 1, 'actions': [ { - 'action_name': 'Build Version File', + 'action_name': 'Build Version Header', 'inputs': [ '../scripts/build-version.py', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp', - '<(SHARED_INTERMEDIATE_DIR)/src/mbgl/util/mbgl_version.cpp', ], 'action': ['<@(python)', 'scripts/build-version.py', '<(SHARED_INTERMEDIATE_DIR)', '<!@(git describe --tags --always --abbrev=0)', '<!@(git rev-parse HEAD)'], } @@ -20,7 +19,6 @@ 'direct_dependent_settings': { 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp', - '<(SHARED_INTERMEDIATE_DIR)/src/mbgl/util/mbgl_version.cpp', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/include', |