diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-12-17 12:14:32 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-12-17 12:14:32 +0100 |
| commit | 936e09651424f111ac2ac64e2e60e2d13b082ebf (patch) | |
| tree | 99b7b7bef00ac011805f5a87ea9ddaf06466fed0 /gyp | |
| parent | 02e43c6d30553a676b912abe1391b82219290333 (diff) | |
| download | qtlocation-mapboxgl-936e09651424f111ac2ac64e2e60e2d13b082ebf.tar.gz | |
Make file request overridable by platform implementations
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-ios.gypi | 2 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 2 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 2 | ||||
| -rw-r--r-- | gyp/styles.gypi | 14 |
4 files changed, 17 insertions, 3 deletions
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index df6896e1e7..da05619a34 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -40,9 +40,11 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', + '../platform/default/file_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 fdea368ae2..51df45ecc7 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -34,6 +34,7 @@ '../platform/default/shader_cache_tmp.cpp', '../platform/default/log_stderr.cpp', '../platform/default/string_stdlib.cpp', + '../platform/default/file_request_libuv.cpp', '../platform/default/http_request_baton_curl.cpp', '../platform/default/image.cpp', '../platform/default/image_reader.cpp', @@ -42,6 +43,7 @@ ], 'include_dirs': [ '../include', + '../src', ], 'link_settings': { 'libraries': [ diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 4e8a131da5..cc6db2eb20 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -15,9 +15,11 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', + '../platform/default/file_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)' }], + } + }] + ], } ] } |