diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-12-03 13:07:49 -0500 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-12-03 13:07:49 -0500 |
| commit | e87a6d1871842ee8795892149bdc9ecb9687ada5 (patch) | |
| tree | 950af56ffa4b21fd12ff8c97f08ee2042fa80416 /gyp | |
| parent | 58833dd56a29d14afb7b40d8484328941d3d5020 (diff) | |
| parent | 90a7be907966e30514820dfdf31a03e0425347d6 (diff) | |
| download | qtlocation-mapboxgl-e87a6d1871842ee8795892149bdc9ecb9687ada5.tar.gz | |
Merge branch 'master' into android-mason
Conflicts:
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
platform/default/caching_http_file_source.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-headless.gypi | 20 | ||||
| -rw-r--r-- | gyp/mbgl-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 1 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gyp/mbgl-headless.gypi b/gyp/mbgl-headless.gypi index 08ac211814..da11c8781c 100644 --- a/gyp/mbgl-headless.gypi +++ b/gyp/mbgl-headless.gypi @@ -4,12 +4,32 @@ 'product_name': 'mbgl-headless', 'type': 'static_library', 'standalone_static_library': 1, + 'variables': { + 'cflags_cc': [ + '<@(uv_cflags)', + ], + 'cflags': [ + '<@(uv_cflags)', + ], + }, 'include_dirs': [ '../include', ], + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], + 'OTHER_CFLAGS': [ '<@(cflags)' ], + } + }, { + 'cflags_cc': [ '<@(cflags_cc)' ], + 'cflags': [ '<@(cflags)' ], + }] + ], 'sources': [ '../platform/default/headless_view.cpp', '../platform/default/headless_display.cpp', + '../platform/default/caching_http_file_source.cpp', ], }, ], diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index c2cb2eed5f..a2e6f65ba1 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -36,6 +36,7 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', + '../platform/default/caching_http_file_source.cpp', '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 5bfa8f757d..2f402075a7 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -35,6 +35,7 @@ '../platform/default/image_reader.cpp', '../platform/default/png_reader.cpp', '../platform/default/jpeg_reader.cpp', + '../platform/default/caching_http_file_source.cpp', '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 0ca00a81e9..d0eae56733 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -11,6 +11,7 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', + '../platform/default/caching_http_file_source.cpp', '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ |