diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 22:58:42 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 22:58:42 -0400 |
| commit | da9718d5078ad50a23ba549417e002cf3b025235 (patch) | |
| tree | df13da61d04ecebf34c534c01a7844355bda9e95 /gyp | |
| parent | 44402a670db3b731bb9069f7af13b056038a435b (diff) | |
| download | qtlocation-mapboxgl-da9718d5078ad50a23ba549417e002cf3b025235.tar.gz | |
mbgl-config: also pass sqlite, curl, png, and boost ldflags along
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index c25490c456..fc0411587b 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -18,6 +18,20 @@ { 'files': [ '<(PRODUCT_DIR)/libmbgl-<(platform).a' ], 'destination': '<(install_prefix)/lib' }, { 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' } ], + 'variables': { + 'conditions': [ + ['OS == "linux"', { + 'other_ldflags': [ + '-L<(boost_root)/lib', + '-lboost_regex', + '<@(glfw3_static_libs)', + '<@(glfw3_ldflags)', + ] + }, { + 'other_ldflags': [ ] + }] + ], + }, 'actions': [ { 'action_name': 'mbgl-config', 'inputs': [ @@ -31,7 +45,10 @@ './utils/mbgl-config/build.sh', '<(install_prefix)', '<(platform)', - '<@(png_ldflags)' + '<@(sqlite3_ldflags)', + '<@(curl_ldflags)', + '<@(png_ldflags)', + '<@(other_ldflags)' ] } ] |