diff options
| author | Leith Bade <leith@mapbox.com> | 2015-01-15 11:39:50 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-01-15 11:39:50 +1100 |
| commit | b7cc6bfaa686cfed1f0ac441693c5c070242343d (patch) | |
| tree | f97b38dcdfbe67d6159c257d81c85380ea2a0347 /gyp | |
| parent | ddbfcada2776a86f8efb6cabba85f6c3a6633d38 (diff) | |
| parent | c6ca57045fb373d4fd76d1ec228bd35a518d06e8 (diff) | |
| download | qtlocation-mapboxgl-b7cc6bfaa686cfed1f0ac441693c5c070242343d.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/mbgl/shader/shader.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 12 | ||||
| -rw-r--r-- | gyp/mbgl-core.gypi | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index 5338bfed1b..1c5066a9c0 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -17,7 +17,6 @@ { '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': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' }, ], 'variables': { 'conditions': [ @@ -47,6 +46,7 @@ './utils/mbgl-config/build.sh', '<(install_prefix)', '<(platform)', + '<@(sqlite3_static_libs)', '<@(sqlite3_ldflags)', '<@(curl_ldflags)', '<@(png_ldflags)', @@ -55,6 +55,16 @@ } ] }, + { 'target_name': 'copy_version', + 'type': 'none', + 'hard_dependency': 1, + 'dependencies': [ + 'install', + ], + 'copies': [ + { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' }, + ], + } ] }], ], diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index ea279f2dad..aa30c5b4dd 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -85,6 +85,7 @@ '<(standalone_lib)', '<@(uv_static_libs)', '<@(curl_static_libs)', + '<@(sqlite3_static_libs)', '<(core_lib)' ], } |