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

193 Commits

Author SHA1 Message Date
Mike Morris
f1609ef329 include sqlite3_static_libs in linker flags 2015-01-13 14:31:50 -05:00
Mike Morris
fa0d20194e break out version.hpp copy task into a separate gyp target to eliminate a possible race condition in parallel builds 2015-01-13 14:15:48 -05:00
Leith Bade
1dd3ad8e64 Fix build 2014-12-18 20:35:55 +11:00
Leith Bade
40f859e482 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
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
 2014-12-18 12:39:36 +11:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files 
refs #579
 2014-12-17 14:59:05 +01:00
Konstantin Käfer
936e096514 Make file request overridable by platform implementations 
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
 2014-12-17 12:14:32 +01:00
Leith Bade
6bb1a5a146 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
 2014-12-10 19:22:25 +11:00
Leith Bade
2db8134d20 Add Android user-agent info 2014-12-10 19:14:05 +11:00
Leith Bade
69cd7268d7 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/http_request_baton_curl.cpp
 2014-12-10 19:13:21 +11:00
Konstantin Käfer
753b6eedd6 also install the version header 2014-12-09 14:35:27 +01:00
Konstantin Käfer
917c0168ab don't include the source file in every library 2014-12-09 14:14:11 +01:00
Konstantin Käfer
318ef5d443 Merge pull request #705 from mapbox/user-agent-os 
Include operating system and actual version number in User Agent string
 2014-12-08 23:18:09 +01:00
Mike Morris
c61537af8f nu_static_libs 2014-12-08 12:24:57 -08:00
Konstantin Käfer
5a3d0b0d3a don't print more information when a tag actually is available 2014-12-08 16:59:02 +01:00
Konstantin Käfer
0a84deef91 make sure it also works when there are no git tags 2014-12-08 16:47:24 +01:00
Konstantin Käfer
e11c073e51 report version number in user agent string 
refs #628
 2014-12-08 16:21:15 +01:00
Leith Bade
d623c264f7 Fix missing shader cache path 2014-12-08 20:20:16 +11:00
Leith Bade
b534520d6c Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/platform/gl.hpp
	src/mbgl/platform/gl.cpp
	src/mbgl/shader/shader.cpp
 2014-12-07 00:29:20 +11:00
Leith Bade
6df4e4a52c Load program binary extension on Linux 2014-12-06 14:21:08 +11:00
Leith Bade
93ab4036e9 Fix commit 2014-12-06 00:50:23 +11:00
Leith Bade
de9eb00276 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
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
 2014-12-05 23:16:49 +11:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
Leith Bade
c348c141c5 Fix missing symbol 2014-12-05 00:04:08 +11:00
Mike Morris
e87a6d1871 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
 2014-12-03 13:07:49 -05:00
Mike Morris
dac76a0f92 break out FileSource as an abstract class 
add CachingHTTPFileSource implementation
 2014-12-03 12:25:11 -05:00
Leith Bade
8762d5a9b6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp
 2014-12-03 19:56:20 +11:00
artemp
9e819a4cbe untabify 2014-12-02 16:38:04 +01:00
Leith Bade
2b86522412 Share asset_request between platforms 2014-12-02 19:41:50 +11:00
Leith Bade
8ae2cd3985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp
 2014-11-28 01:51:21 +11:00
Leith Bade
b3a0a205df Fix jpeg android gyp 2014-11-28 00:15:05 +11:00
artemp
fcebd44571 simplify image_readers creation implementation 
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
 2014-11-28 00:15:04 +11:00
artemp
70627bd958 move image_reader to mbgl-linux 2014-11-28 00:14:15 +11:00
artemp
ae2d4e740e add image_reader abstraction layer to hanfle multiple image formats 
(work-in-progress)
 2014-11-28 00:14:11 +11:00
Mike Morris
370297763c add jpeg_static_libs to linux install ldflags 2014-11-26 10:00:48 -08:00
artemp
1e9b6611cc Merge branch 'master' into image-readers 2014-11-21 11:17:18 +01:00
artemp
759a5e65cf simplify image_readers creation implementation 
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
 2014-11-19 13:06:47 +01:00
Leith Bade
f89d27cf99 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	README.md
 2014-11-18 19:32:20 +11:00
Justin R. Miller
947a16e985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-11-17 11:54:06 -08:00
Leith Bade
80be6c4eb0 Load CA bundle from APK 
Remove Assetbridge
 2014-11-18 00:33:59 +11:00
Leith Bade
aee724d6cf Create AssetRequest 2014-11-17 20:00:44 +11:00
Leith Bade
c092a686a7 Add libzip 2014-11-17 19:23:36 +11:00
Leith Bade
a7d582a3e0 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-14 08:05:13 +11:00
Mike Morris
e0b4107595 pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581 2014-11-13 11:47:06 -08:00
Justin R. Miller
bad4c96603 "skip install" for lib Xcode targets for easier app archiving 2014-11-11 14:59:01 -08: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
artemp
dfeab9f921 move image_reader to mbgl-linux 2014-11-07 15:31:18 +00:00
artemp
52a7629b35 Merge branch 'master' into image-readers 2014-11-07 11:50:33 +00:00
artemp
f42d39dc6e add image_reader abstraction layer to hanfle multiple image formats 
(work-in-progress)
 2014-11-07 11:49:31 +00:00
Konstantin Käfer
fb7f23884b don't error on unused parameters 2014-11-06 17:21:55 +01:00
Leith Bade
56e26749d4 Start working on android log hook 2014-11-07 01:39:44 +11:00