diff options
| author | Leith Bade <leith@mapbox.com> | 2014-11-28 01:37:35 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-11-28 01:51:21 +1100 |
| commit | 8ae2cd3985e959e622f90d30a017032f9a5ca37c (patch) | |
| tree | eb9ea52a6a9005259c6124991e8dd7d0f7d97e5e /gyp | |
| parent | 014ebd2f133c883eec652b7ea598acc71924a217 (diff) | |
| parent | 79017060947c1a11f4124ab837bd171b748806de (diff) | |
| download | qtlocation-mapboxgl-8ae2cd3985e959e622f90d30a017032f9a5ca37c.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
README.md
configure
gyp/mbgl-linux.gypi
include/mbgl/map/map.hpp
include/mbgl/platform/default/image_reader.hpp
include/mbgl/platform/default/jpeg_reader.hpp
include/mbgl/platform/default/png_reader.hpp
include/mbgl/util/uv_detail.hpp
ios/mapbox-gl-cocoa
platform/default/image.cpp
platform/default/image_reader.cpp
platform/default/jpeg_reader.cpp
platform/default/png_reader.cpp
src/map/map.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index 7b8cf6220e..d46900dfff 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -23,6 +23,7 @@ ['OS == "linux"', { 'other_ldflags': [ '<@(png_static_libs)', + '<@(jpeg_static_libs)', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', ] diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 28d8fc33a9..aee928685a 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -8,7 +8,7 @@ 'variables': { 'cflags_cc': [ '<@(png_cflags)', - '<@(jpeg_cflags)', + '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', |