diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | deps/gtest/gtest.gyp | 4 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 6 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gyp | 2 | ||||
| -rw-r--r-- | platform/default/image.cpp | 3 | ||||
| -rw-r--r-- | test/test.gyp | 2 |
6 files changed, 14 insertions, 5 deletions
@@ -48,7 +48,7 @@ case ${MASON_PLATFORM} in *) GLFW_VERSION=a21f2377 SQLITE_VERSION=system - LIBPNG_VERSION=system + LIBPNG_VERSION=1.6.13 LIBCURL_VERSION=system LIBUV_VERSION=0.10.28 ZLIB_VERSION=system diff --git a/deps/gtest/gtest.gyp b/deps/gtest/gtest.gyp index c62b6be3f8..56d01bf988 100644 --- a/deps/gtest/gtest.gyp +++ b/deps/gtest/gtest.gyp @@ -12,6 +12,10 @@ 'sources': [ 'gtest-all.cc' ], + 'link_settings': { + 'xcode_settings': { 'OTHER_LDFLAGS': [ '-pthread' ] }, + 'ldflags': [ '-pthread' ], + }, 'direct_dependent_settings': { 'include_dirs': [ '.', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 2b166ea434..ca3e2afc54 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -30,6 +30,11 @@ 'include_dirs': [ '../include', ], + 'link_settings': { + 'libraries': [ + '<@(png_static_libs)', + ], + }, 'conditions': [ ['OS == "mac"', { 'xcode_settings': { @@ -37,7 +42,6 @@ 'OTHER_CFLAGS': [ '<@(cflags)' ], } }, { - 'ldflags': [ '<@(ldflags)' ], 'cflags_cc': [ '<@(cflags_cc)' ], 'cflags': [ '<@(cflags)' ], }] diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index 03a0c0aed7..57bd1171b2 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -38,7 +38,7 @@ 'OTHER_LDFLAGS': [ '<@(ldflags)' ], } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ], 'dependencies': [ diff --git a/platform/default/image.cpp b/platform/default/image.cpp index 5b1afec7aa..68d1786913 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -5,6 +5,7 @@ #include <cassert> #include <cstdlib> #include <stdexcept> +#include <cstring> namespace mbgl { @@ -73,7 +74,7 @@ void readCallback(png_structp png, png_bytep data, png_size_t length) { if (reader->pos + length > reader->length) { png_error(png, "Read Error"); } else { - memcpy(data, reader->data + reader->pos, length); + std::memcpy(data, reader->data + reader->pos, length); reader->pos += length; } } diff --git a/test/test.gyp b/test/test.gyp index 74f4139a96..9e56f4f2c0 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -8,7 +8,7 @@ '<@(uv_ldflags)', '<@(sqlite3_ldflags)', '<@(curl_ldflags)', - '<@(png_ldflags)' + '<@(png_ldflags)', ], }, 'targets': [ |