diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-18 12:39:36 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-18 12:39:36 +1100 |
| commit | 40f859e482e5282d0fbf257a9feaa9d70953a4fd (patch) | |
| tree | 0fb920677d0ba92cedc64a4df9e1da045e891e75 /gyp | |
| parent | 6f56e88ee599160b336cce222384979a2b517343 (diff) | |
| parent | a8dec01230a00f9e701fc6403110c4f5017ba905 (diff) | |
| download | qtlocation-mapboxgl-40f859e482e5282d0fbf257a9feaa9d70953a4fd.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
gyp/mbgl-ios.gypi
gyp/mbgl-osx.gypi
platform/default/asset_request_libuv.cpp
src/mbgl/storage/caching_http_file_source.cpp
src/mbgl/storage/file_request.cpp
src/mbgl/storage/file_request.hpp
src/mbgl/storage/file_request_baton.hpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-ios.gypi | 4 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 3 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 4 | ||||
| -rw-r--r-- | gyp/styles.gypi | 14 |
4 files changed, 20 insertions, 5 deletions
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index e3d7fbbc7a..bd96486d69 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -39,11 +39,13 @@ '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', + '../platform/darwin/application_root.mm', '../platform/darwin/image.mm', - '../platform/default/asset_request_baton_noop.cpp', + '../platform/default/asset_request_libuv.cpp', ], 'include_dirs': [ '../include', + '../src', ], 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ], diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index c39d165a30..9501950d9b 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -34,7 +34,9 @@ '../platform/default/shader_cache_tmp.cpp', '../platform/default/log_stderr.cpp', '../platform/default/string_stdlib.cpp', + '../platform/default/asset_request_libuv.cpp', '../platform/default/http_request_baton_curl.cpp', + '../platform/default/application_root.cpp', '../platform/default/image.cpp', '../platform/default/image_reader.cpp', '../platform/default/png_reader.cpp', @@ -43,6 +45,7 @@ ], 'include_dirs': [ '../include', + '../src', ], 'link_settings': { 'libraries': [ diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 193341abc5..0cc29f6e73 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -14,11 +14,13 @@ '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', + '../platform/darwin/application_root.mm', '../platform/darwin/image.mm', - '../platform/default/asset_request_baton_noop.cpp', + '../platform/default/asset_request_libuv.cpp', ], 'include_dirs': [ '../include', + '../src', ], 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ], diff --git a/gyp/styles.gypi b/gyp/styles.gypi index 02cdea6e04..e1cd344fe1 100644 --- a/gyp/styles.gypi +++ b/gyp/styles.gypi @@ -18,9 +18,17 @@ 'type': 'none', 'hard_dependency': 1, 'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149 - 'direct_dependent_settings': { - 'mac_bundle_resources': [ '../styles/styles' ], - } + 'conditions': [ + ['OS == "mac"', { + 'direct_dependent_settings': { + 'mac_bundle_resources': [ '../styles/styles' ], + } + }, { + 'direct_dependent_settings': { + 'copies': [{ 'files': [ '../styles/styles' ], 'destination': '<(PRODUCT_DIR)' }], + } + }] + ], } ] } |