tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason

Browse Source 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp
This commit is contained in:
Leith Bade
2014-12-04 08:13:49 +11:00
parent 2b06d905f6 55f2b42826
commit de5a0f5854
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/mbgl-ios.gypi
View File

@@ -36,8 +36,8 @@
'../platform/darwin/string_nsstring.mm',
'../platform/darwin/http_request_baton_cocoa.mm',
'../platform/darwin/image.mm',
'../platform/default/asset_request_baton_noop.cpp',
'../platform/default/caching_http_file_source.cpp',
'../platform/default/asset_request_baton_noop.cpp',
],
'include_dirs': [
'../include',

2
gyp/mbgl-linux.gypi
View File

@@ -35,8 +35,8 @@
'../platform/default/image_reader.cpp',
'../platform/default/png_reader.cpp',
'../platform/default/jpeg_reader.cpp',
'../platform/default/asset_request_baton_noop.cpp',
'../platform/default/caching_http_file_source.cpp',
'../platform/default/asset_request_baton_noop.cpp',
],
'include_dirs': [
'../include',

2
gyp/mbgl-osx.gypi
View File

@@ -11,8 +11,8 @@
'../platform/darwin/string_nsstring.mm',
'../platform/darwin/http_request_baton_cocoa.mm',
'../platform/darwin/image.mm',
'../platform/default/asset_request_baton_noop.cpp',
'../platform/default/caching_http_file_source.cpp',
'../platform/default/asset_request_baton_noop.cpp',
],
'include_dirs': [
'../include',

2
ios/mapbox-gl-cocoa

Submodule ios/mapbox-gl-cocoa updated: baad2aa920...af6a9c9fd2

2
platform/default/caching_http_file_source.cpp
View File

@@ -30,7 +30,7 @@ CachingHTTPFileSource::CachingHTTPFileSource(const std::string &path_)
CachingHTTPFileSource::~CachingHTTPFileSource() {
if (hasLoop()) {
// FIXME temp fix for #608 crash
//assert(thread_id == uv_thread_self());
// assert(thread_id == uv_thread_self());
uv_messenger_stop(queue, [](uv_messenger_t *msgr) {
delete msgr;
});