diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-03 16:18:37 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 11:54:01 +0100 |
| commit | 73f7db9af2f76593856d64349a376412d292cd15 (patch) | |
| tree | db311e489246d41e6386f4c8bcc14da17e634c66 /gyp | |
| parent | f007c420ed4e2eadaedbbdd1c29912c6c8142fa1 (diff) | |
| download | qtlocation-mapboxgl-73f7db9af2f76593856d64349a376412d292cd15.tar.gz | |
cleanup makefiles
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/asset-fs.gypi | 2 | ||||
| -rw-r--r-- | gyp/asset-zip.gypi | 2 | ||||
| -rw-r--r-- | gyp/core.gypi | 2 | ||||
| -rw-r--r-- | gyp/http-curl.gypi | 2 | ||||
| -rw-r--r-- | gyp/install.gypi | 8 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 2 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 2 | ||||
| -rw-r--r-- | gyp/platform-linux.gypi | 2 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 2 |
9 files changed, 15 insertions, 9 deletions
diff --git a/gyp/asset-fs.gypi b/gyp/asset-fs.gypi index 9cd8593fbc..0606eaf7f8 100644 --- a/gyp/asset-fs.gypi +++ b/gyp/asset-fs.gypi @@ -17,7 +17,7 @@ 'variables': { 'cflags_cc': [ '<@(uv_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'ldflags': [ '<@(uv_ldflags)', diff --git a/gyp/asset-zip.gypi b/gyp/asset-zip.gypi index 87f7584772..25df2a3d8b 100644 --- a/gyp/asset-zip.gypi +++ b/gyp/asset-zip.gypi @@ -23,7 +23,7 @@ 'cflags_cc': [ '<@(uv_cflags)', '<@(zip_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'ldflags': [ '<@(uv_ldflags)', diff --git a/gyp/core.gypi b/gyp/core.gypi index 0adcaa766f..9a3b07d0bb 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -29,7 +29,7 @@ 'variables': { 'cflags_cc': [ '<@(uv_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'cflags': [ '<@(uv_cflags)', diff --git a/gyp/http-curl.gypi b/gyp/http-curl.gypi index 5dcd71a59b..87edff2492 100644 --- a/gyp/http-curl.gypi +++ b/gyp/http-curl.gypi @@ -18,7 +18,7 @@ 'cflags_cc': [ '<@(uv_cflags)', '<@(curl_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'ldflags': [ '<@(uv_ldflags)', diff --git a/gyp/install.gypi b/gyp/install.gypi index 90d64e9403..4ed32eea14 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -17,11 +17,17 @@ 'copies': [ { 'files': [ '<(PRODUCT_DIR)/libmbgl.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' }, ], 'actions': [ + { + 'action_name': 'Copy header files', + 'inputs': [ '../include/mbgl/mbgl.hpp' ], + 'outputs': [ '../include/mbgl/mbgl.hpp' ], + 'action': [ 'cp', '-r', 'include', '<(install_prefix)/' ] + }, + { 'action_name': 'mbgl-config', 'inputs': [ '../utils/mbgl-config/mbgl-config.template.sh', diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index ac86f50e65..cbd855e9c2 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -24,7 +24,7 @@ '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(nu_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'ldflags': [ '<@(png_ldflags)', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 2bbe1272d2..bb1b450728 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -20,7 +20,7 @@ 'variables': { 'cflags_cc': [ '<@(uv_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'libraries': [ '<@(uv_static_libs)', diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 2915606ac5..30715f8289 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -26,7 +26,7 @@ '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(nu_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'ldflags': [ '<@(png_ldflags)', diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 1fdf9de2c7..e3fe7b0d53 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -20,7 +20,7 @@ 'variables': { 'cflags_cc': [ '<@(uv_cflags)', - '-I<(boost_root)/include', + '<@(boost_cflags)', ], 'libraries': [ '<@(uv_static_libs)', |