diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-10 19:13:21 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-10 19:13:21 +1100 |
| commit | 69cd7268d783a5e449de38ab40dfe5a28fa76f64 (patch) | |
| tree | a4951f03d039c2775317678d66afb0e61eb2f1ea /gyp | |
| parent | c55cd7f473ca532193697882c48436d2f98885d2 (diff) | |
| parent | 318ef5d44314814f4dd7da2ba8c532b0119bdb35 (diff) | |
| download | qtlocation-mapboxgl-69cd7268d783a5e449de38ab40dfe5a28fa76f64.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
platform/default/http_request_baton_curl.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-core.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-ios.gypi | 3 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 3 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 3 | ||||
| -rw-r--r-- | gyp/version.gypi | 31 |
6 files changed, 42 insertions, 0 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index d46900dfff..56591d27d4 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -22,6 +22,7 @@ 'conditions': [ ['OS == "linux"', { 'other_ldflags': [ + '<@(nu_static_libs)', '<@(png_static_libs)', '<@(jpeg_static_libs)', '<@(glfw3_static_libs)', diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 279051968c..ea279f2dad 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -7,6 +7,7 @@ 'hard_dependency': 1, 'dependencies': [ 'shaders', + 'version', ], 'variables': { 'cflags_cc': [ diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index a79737b0cd..e3d7fbbc7a 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -30,6 +30,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'version', + ], 'sources': [ '../platform/ios/cache_database_library.mm', '../platform/ios/shader_cache_library.mm', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index c42a49d9d1..c39d165a30 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -5,6 +5,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'version', + ], 'variables': { 'cflags_cc': [ '<@(png_cflags)', diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 542f6cb9e3..193341abc5 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -5,6 +5,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'version', + ], 'sources': [ '../platform/osx/cache_database_application_support.mm', '../platform/osx/shader_cache_application_support.mm', diff --git a/gyp/version.gypi b/gyp/version.gypi new file mode 100644 index 0000000000..ca68f0eb57 --- /dev/null +++ b/gyp/version.gypi @@ -0,0 +1,31 @@ +{ + 'targets': [ + { + 'target_name': 'version', + 'type': 'none', + 'hard_dependency': 1, + 'actions': [ + { + 'action_name': 'Build Version File', + '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)'], + } + ], + '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', + ] + } + }, + ] +} |