Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add ca bundle loading back to CURL | Konstantin Käfer | 2015-02-17 | 1 | -10/+18 |
| | |||||
* | update uv_zip and add tests | Konstantin Käfer | 2015-02-16 | 2 | -0/+34 |
| | |||||
* | Add assetRoot for Android | Leith Bade | 2015-02-10 | 1 | -0/+1 |
| | |||||
* | chmod +x python builds scripts, run directly instead of with python gyp var | Mike Morris | 2015-02-10 | 2 | -2/+2 |
| | |||||
* | move iOS code from gl-cocoa to this project | Justin R. Miller | 2015-02-09 | 3 | -43/+63 |
| | |||||
* | cleanup makefiles | Konstantin Käfer | 2015-02-04 | 9 | -9/+15 |
| | |||||
* | don't drop -L flags | Mike Morris | 2015-02-04 | 1 | -0/+2 |
| | |||||
* | make different abis for android | Konstantin Käfer | 2015-02-04 | 1 | -34/+39 |
| | |||||
* | fix install script | Konstantin Käfer | 2015-02-04 | 3 | -70/+43 |
| | |||||
* | fix install.gypi deps | Mike Morris | 2015-02-04 | 1 | -6/+6 |
| | |||||
* | refactor makefile | Konstantin Käfer | 2015-02-04 | 20 | -179/+346 |
| | |||||
* | use fake linker for merging the standalone static library | Konstantin Käfer | 2015-02-04 | 4 | -53/+58 |
| | |||||
* | rework linux gyp files | Konstantin Käfer | 2015-02-04 | 4 | -26/+14 |
| | |||||
* | use standard DEBUG macro rather than NDEBUG | Konstantin Käfer | 2015-02-04 | 1 | -2/+15 |
| | |||||
* | move variables to their own file | Konstantin Käfer | 2015-02-04 | 2 | -28/+35 |
| | |||||
* | make storage lib separate so we can build without storage libs | Konstantin Käfer | 2015-02-04 | 10 | -111/+295 |
| | |||||
* | move ios-specific configuration to common.gypi | Konstantin Käfer | 2015-02-04 | 2 | -26/+22 |
| | |||||
* | make ios compile | Konstantin Käfer | 2015-02-04 | 3 | -5/+2 |
| | |||||
* | add symbols to Release builds for easier debugging | Konstantin Käfer | 2015-02-04 | 1 | -2/+2 |
| | |||||
* | rearrange tests and add storage tests | Konstantin Käfer | 2015-02-04 | 3 | -4/+4 |
| | |||||
* | remove circular shared_ptr and a few other memory leaks | Konstantin Käfer | 2015-02-04 | 1 | -1/+1 |
| | |||||
* | rewrite storage layer to be independent of the Map's event loop | Konstantin Käfer | 2015-02-04 | 2 | -3/+9 |
| | |||||
* | Fix -W flags for boost | Leith Bade | 2015-02-03 | 1 | -6/+1 |
| | | | Fixes #801 | ||||
* | Adapt to ↵ | Dane Springmeyer | 2015-02-02 | 2 | -0/+4 |
| | | | | https://github.com/mapbox/mason/commit/c104c2f9721b793535e4ec658afe2582e57be164 and https://github.com/mapbox/mason/commit/49fd47774032bf0f80efaad0143db3634385d2bf | ||||
* | Remove program binary caching | Leith Bade | 2015-01-27 | 4 | -4/+0 |
| | |||||
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-15 | 2 | -1/+12 |
|\ | | | | | | | | | Conflicts: src/mbgl/shader/shader.cpp | ||||
| * | pass sqlite3_static_libs in install.gypi | Mike Morris | 2015-01-13 | 1 | -0/+1 |
| | | |||||
| * | include sqlite3_static_libs in linker flags | Mike Morris | 2015-01-13 | 1 | -0/+1 |
| | | |||||
| * | break out version.hpp copy task into a separate gyp target to eliminate a ↵ | Mike Morris | 2015-01-13 | 1 | -1/+10 |
| | | | | | | | | possible race condition in parallel builds | ||||
* | | Fix build | Leith Bade | 2014-12-18 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-18 | 4 | -5/+20 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | change file:// to asset:// to indicate that they aren't arbitrary files | Konstantin Käfer | 2014-12-17 | 3 | -3/+6 |
| | | | | | | | | refs #579 | ||||
| * | Make file request overridable by platform implementations | Konstantin Käfer | 2014-12-17 | 4 | -3/+17 |
| | | | | | | | | refs #579: Android can now rename AssetRequest to FileRequest and implement it differently | ||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-10 | 2 | -4/+3 |
|\ \ | |/ | | | | | | | | | | | Conflicts: include/mbgl/platform/default/headless_view.hpp platform/default/glfw_view.cpp platform/default/headless_view.cpp | ||||
| * | also install the version header | Konstantin Käfer | 2014-12-09 | 1 | -1/+2 |
| | | |||||
| * | don't include the source file in every library | Konstantin Käfer | 2014-12-09 | 1 | -3/+1 |
| | | |||||
* | | Add Android user-agent info | Leith Bade | 2014-12-10 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-10 | 6 | -0/+42 |
|\ \ | |/ | | | | | | | Conflicts: platform/default/http_request_baton_curl.cpp | ||||
| * | Merge pull request #705 from mapbox/user-agent-os | Konstantin Käfer | 2014-12-08 | 5 | -0/+41 |
| |\ | | | | | | | Include operating system and actual version number in User Agent string | ||||
| | * | don't print more information when a tag actually is available | Konstantin Käfer | 2014-12-08 | 1 | -1/+1 |
| | | | |||||
| | * | make sure it also works when there are no git tags | Konstantin Käfer | 2014-12-08 | 1 | -1/+1 |
| | | | |||||
| | * | report version number in user agent string | Konstantin Käfer | 2014-12-08 | 5 | -0/+41 |
| | | | | | | | | | | | | refs #628 | ||||
| * | | nu_static_libs | Mike Morris | 2014-12-08 | 1 | -0/+1 |
| |/ | |||||
* | | Fix missing shader cache path | Leith Bade | 2014-12-08 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-07 | 3 | -0/+3 |
|\ \ | |/ | | | | | | | | | | | Conflicts: include/mbgl/platform/gl.hpp src/mbgl/platform/gl.cpp src/mbgl/shader/shader.cpp | ||||
| * | Load program binary extension on Linux | Leith Bade | 2014-12-06 | 3 | -0/+3 |
| | | |||||
* | | Fix commit | Leith Bade | 2014-12-06 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-05 | 5 | -5/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore gyp/mbgl-ios.gypi gyp/mbgl-linux.gypi gyp/mbgl-osx.gypi include/mbgl/map/map.hpp src/mbgl/map/map.cpp src/mbgl/storage/caching_http_file_source.cpp | ||||
| * | make most headers private | Konstantin Käfer | 2014-12-04 | 5 | -5/+1 |
| | | |||||
* | | Fix missing symbol | Leith Bade | 2014-12-05 | 1 | -0/+1 |
| | |