summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
...
| * syntax fixesMike Morris2015-01-211-3/+3
| |
| * clear sqlite cacheMike Morris2015-01-211-5/+15
| |
| * only run clear_xcode_cache on OS XMike Morris2015-01-211-0/+2
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-151-9/+14
|\ \ | |/ | | | | | | Conflicts: src/mbgl/shader/shader.cpp
| * fix hard tabs in Makefile so clear_xcode_cache task actually runs, remove ↵Mike Morris2015-01-131-9/+14
| | | | | | | | cache.db in Application Support if it exists
* | Handle JOBS not being setLeith Bade2014-12-311-0/+1
| |
* | Use two cores for gradleLeith Bade2014-12-261-1/+1
| |
* | Use two coresLeith Bade2014-12-261-1/+1
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-211-0/+15
|\ \ | |/ | | | | | | | | | | Conflicts: Makefile platform/default/headless_view.cpp src/mbgl/map/map.cpp
| * add xcode project for render cli utilKonstantin Käfer2014-12-111-1/+8
| |
| * add cli tool for rendering a map to an imageKonstantin Käfer2014-12-111-0/+8
| |
* | Use testmunk in travisLeith Bade2014-11-221-0/+1
| |
* | Revert "Travis needs submodules too"Leith Bade2014-11-151-1/+0
| | | | | | | | This reverts commit d1389cc7ec5a687021be3bed13a14d46886b8c74.
* | Travis needs submodules tooLeith Bade2014-11-141-0/+1
| |
* | Revert "Ensure error when the styles submodule is not loaded"Justin R. Miller2014-11-131-1/+0
| | | | | | | | This reverts commit 14714a1088583ef7f28f6b80e54be7f3031549bc.
* | Revert "Fix Makefile"Justin R. Miller2014-11-131-1/+1
| | | | | | | | This reverts commit 990be6743f07411e6bc89f010f9dc64587b44e97.
* | Fix MakefileLeith Bade2014-11-141-1/+1
| |
* | Ensure error when the styles submodule is not loadedLeith Bade2014-11-131-0/+1
| |
* | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into ↵Leith Bade2014-11-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | android-mason Conflicts: gyp/common.gypi include/mbgl/geometry/vao.hpp include/mbgl/platform/event.hpp include/mbgl/platform/gl.hpp platform/default/http_request_baton_curl.cpp src/storage/response.cpp
| * fix boost includes and allow any platform builds for xcode test projectKonstantin Käfer2014-11-051-1/+1
| |
* | Stop file not found error in MakefileLeith Bade2014-11-081-0/+1
| | | | | | | | | | Update JNI methods Tiny up Java
* | Add cache path variable from JavaLeith Bade2014-11-081-1/+4
| | | | | | | | | | | | | | Use cache path for db location Add Assetbridge to extract asset files to cache path Fix SSL by using extracted ca bundle Use file:// style URL using extracted styles
* | Make sure to install mason before envLeith Bade2014-11-071-0/+1
| |
* | Fix tabsLeith Bade2014-11-061-6/+6
| |
* | Fix spacesLeith Bade2014-11-061-1/+1
| |
* | Add LINK to avoid flockLeith Bade2014-11-061-0/+1
| |
* | Add java to buildLeith Bade2014-11-061-1/+7
| |
* | Add JNI code to build systemLeith Bade2014-11-051-2/+2
| |
* | Fix file not found errorsLeith Bade2014-11-041-9/+9
| |
* | quote android env variablesDane Springmeyer2014-11-021-9/+9
| |
* | fix another path to masonDane Springmeyer2014-11-011-9/+9
| |
* | mason-based android portDane Springmeyer2014-11-011-1/+16
|/
* Revert "remove distclean (now that we've ported to mason and re-installs are ↵Dane Springmeyer2014-10-301-0/+3
| | | | | | fast)" This reverts commit f8f38b100322aaf814d6a60a6d69776b446c1230.
* remove distclean (now that we've ported to mason and re-installs are fast)Dane Springmeyer2014-10-301-3/+0
|
* restructure Makefile to avoid concurrent makefile generationKonstantin Käfer2014-10-301-35/+50
|
* use stable cross-generator direction for referencing standalone lib + other ↵Dane Springmeyer2014-10-291-0/+1
| | | | minor fixups
* fix typo in target nameDane Springmeyer2014-10-291-1/+1
|
* rename mbgl to mbgl-coreKonstantin Käfer2014-10-291-8/+4
|
* gyp fixesKonstantin Käfer2014-10-281-0/+12
|
* allow installing the libraryKonstantin Käfer2014-10-271-2/+7
|
* Merge remote-tracking branch 'origin/headless-display' into gyp-restructuringKonstantin Käfer2014-10-241-1/+1
|\ | | | | | | | | | | Conflicts: Makefile ios/mapbox-gl-cocoa
| * fix variable shadowingKonstantin Käfer2014-10-221-1/+1
| |
* | restructure gyp filesKonstantin Käfer2014-10-241-9/+15
| |
* | make config.gypi files dependend on the configure scriptKonstantin Käfer2014-10-241-2/+2
|/ | | | [skip ci]
* don't check for node in the current bash. we are using our own anywayKonstantin Käfer2014-10-221-10/+7
|
* use correct configuration fileKonstantin Käfer2014-10-221-8/+8
|
* cleanup makefileKonstantin Käfer2014-10-211-13/+9
| | | | [skip ci]
* ios build system fixesKonstantin Käfer2014-10-211-5/+2
| | | | [skip ci]
* first attempt at using mason to install packagesKonstantin Käfer2014-10-201-0/+1
| | | | [skip ci]
* pass libuv, libcurl and boost headers down to dependentsKonstantin Käfer2014-09-241-1/+1
|
View Lorry Controller Status