diff options
| author | artemp <artem@mapnik.org> | 2014-11-21 11:17:18 +0100 |
|---|---|---|
| committer | artemp <artem@mapnik.org> | 2014-11-21 11:17:18 +0100 |
| commit | 1e9b6611cc9a7aff0dc62c02f8ea49b38e8bfd78 (patch) | |
| tree | ad85489bfbad56d7a55ec275c84c1c7aa2dc080f /gyp | |
| parent | f89c9753ddf9cf31b84e6fd8677291908e146083 (diff) | |
| parent | 545292b6f9d461d439972a204ff747f4902dd4d1 (diff) | |
| download | qtlocation-mapboxgl-1e9b6611cc9a7aff0dc62c02f8ea49b38e8bfd78.tar.gz | |
Merge branch 'master' into image-readers
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 | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index df65d0457e..7b8cf6220e 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -22,6 +22,7 @@ 'conditions': [ ['OS == "linux"', { 'other_ldflags': [ + '<@(png_static_libs)', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', ] diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 46ff762742..022480350a 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -37,6 +37,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'OTHER_CFLAGS': [ '<@(cflags)' ], + 'SKIP_INSTALL': 'YES' }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index 5566ca3a32..dd1c9c0c20 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -12,6 +12,7 @@ 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'CLANG_ENABLE_OBJC_ARC': 'YES', 'CODE_SIGN_IDENTITY': 'iPhone Developer', + 'SKIP_INSTALL': 'YES' }, 'configurations': { 'Release': { |