tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,631 Commits 3 Branches 22 Tags
d975d94de237a05ff8b9ddce55a85b5a66481f5e
Commit Graph

163 Commits

Author SHA1 Message Date
Mike Morris
c18089b6d7 syntax fixes 2015-01-21 14:35:59 -05:00
Mike Morris
bee9ada450 clear sqlite cache 2015-01-21 14:29:41 -05:00
Mike Morris
161e187c6f only run clear_xcode_cache on OS X 2015-01-21 14:08:52 -05:00
Leith Bade
b7cc6bfaa6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/shader/shader.cpp
 2015-01-15 11:39:50 +11:00
Mike Morris
4533dcaf34 fix hard tabs in Makefile so clear_xcode_cache task actually runs, remove cache.db in Application Support if it exists 2015-01-13 12:49:41 -05:00
Leith Bade
edd8be54e5 Handle JOBS not being set 2014-12-31 08:06:41 +13:00
Leith Bade
98ea7366f3 Use two cores for gradle 2014-12-26 19:53:36 +13:00
Leith Bade
4f84082660 Use two cores 2014-12-26 19:45:40 +13:00
Leith Bade
df19683b6a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	Makefile
	platform/default/headless_view.cpp
	src/mbgl/map/map.cpp
 2014-12-21 15:02:47 +13:00
Konstantin Käfer
41d9e7730f add xcode project for render cli util 2014-12-11 18:31:32 +01:00
Konstantin Käfer
a81e822ef0 add cli tool for rendering a map to an image 2014-12-11 17:58:36 +01:00
Leith Bade
08d11b23a8 Use testmunk in travis 2014-11-22 16:58:39 +11:00
Leith Bade
2853d79780 Revert "Travis needs submodules too" 
This reverts commit d1389cc7ec.
 2014-11-15 11:36:15 +11:00
Leith Bade
d1389cc7ec Travis needs submodules too 2014-11-14 18:35:00 +11:00
Justin R. Miller
30bea1dde4 Revert "Ensure error when the styles submodule is not loaded" 
This reverts commit 14714a1088.
 2014-11-13 18:15:34 -08:00
Justin R. Miller
dce0f0b6d9 Revert "Fix Makefile" 
This reverts commit 990be6743f.
 2014-11-13 18:15:29 -08:00
Leith Bade
990be6743f Fix Makefile 2014-11-14 08:07:56 +11:00
Leith Bade
14714a1088 Ensure error when the styles submodule is not loaded 2014-11-13 18:50:47 +11:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into 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
 2014-11-09 00:35:52 +11:00
Leith Bade
5b6c7aa870 Stop file not found error in Makefile 
Update JNI methods
Tiny up Java
 2014-11-08 16:23:43 +11:00
Leith Bade
c0bcd1e260 Add cache path variable from Java 
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
 2014-11-08 12:49:46 +11:00
Leith Bade
4a5f61e7a1 Make sure to install mason before env 2014-11-07 23:47:17 +11:00
Leith Bade
398e5f933a Fix tabs 2014-11-06 20:39:00 +11:00
Leith Bade
6415518094 Fix spaces 2014-11-06 19:02:26 +11:00
Leith Bade
12f58f0324 Add LINK to avoid flock 2014-11-06 08:11:05 +11:00
Leith Bade
18d5501279 Add java to build 2014-11-06 00:51:08 +11:00
Leith Bade
9476b7a66f Add JNI code to build system 2014-11-05 22:53:48 +11:00
Konstantin Käfer
2f86a1735e fix boost includes and allow any platform builds for xcode test project 2014-11-05 12:13:24 +01:00
Leith Bade
574c0f5fa0 Fix file not found errors 2014-11-04 22:36:04 +11:00
Dane Springmeyer
86944f3b46 quote android env variables 2014-11-02 20:34:35 -05:00
Dane Springmeyer
cdcc30fa4a fix another path to mason 2014-11-01 22:57:14 -04:00
Dane Springmeyer
d7b0a34bdd mason-based android port 2014-11-01 22:41:40 -04:00
Dane Springmeyer
ae3ef12142 Revert "remove distclean (now that we've ported to mason and re-installs are fast)" 
This reverts commit f8f38b1003.
 2014-10-30 16:39:50 -04:00
Dane Springmeyer
f8f38b1003 remove distclean (now that we've ported to mason and re-installs are fast) 2014-10-30 14:11:41 -04:00
Konstantin Käfer
5413cb065f restructure Makefile to avoid concurrent makefile generation 2014-10-30 11:47:36 -04:00
Dane Springmeyer
d8a93dbb95 use stable cross-generator direction for referencing standalone lib + other minor fixups 2014-10-29 18:13:25 -04:00
Dane Springmeyer
7dc7387073 fix typo in target name 2014-10-29 12:19:11 -04:00
Konstantin Käfer
293b291b80 rename mbgl to mbgl-core 2014-10-29 11:59:24 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
Konstantin Käfer
84700fce90 allow installing the library 2014-10-27 10:12:30 -04:00
Konstantin Käfer
d299e58088 Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring 
Conflicts:
	Makefile
	ios/mapbox-gl-cocoa
 2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a restructure gyp files 2014-10-24 16:40:08 +02:00
Konstantin Käfer
b0ddbef81d make config.gypi files dependend on the configure script 
[skip ci]
 2014-10-24 11:43:57 +02:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
251fafe2bf don't check for node in the current bash. we are using our own anyway 2014-10-22 15:05:33 +02:00
Konstantin Käfer
8df906e2bc use correct configuration file 2014-10-22 12:40:30 +02:00
Konstantin Käfer
ab42c0cf93 cleanup makefile 
[skip ci]
 2014-10-21 12:49:19 +02:00
Konstantin Käfer
9103d84ace ios build system fixes 
[skip ci]
 2014-10-21 11:41:30 +02:00
Konstantin Käfer
5a87fb337d first attempt at using mason to install packages 
[skip ci]
 2014-10-20 17:55:49 +02:00
Konstantin Käfer
8a84cdb617 pass libuv, libcurl and boost headers down to dependents 2014-09-24 16:14:09 +02:00