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

115 Commits

Author SHA1 Message Date
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Mike Morris
f987166ee8 don't drop -L flags 2015-02-04 10:49:09 +01:00
Konstantin Käfer
69975c7094 make different abis for android 2015-02-04 10:49:09 +01:00
Konstantin Käfer
50d78fde85 fix install script 2015-02-04 10:49:09 +01:00
Mike Morris
4b3689d18e fix install.gypi deps 2015-02-04 10:49:09 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
3d51e116a8 use fake linker for merging the standalone static library 2015-02-04 10:49:08 +01:00
Konstantin Käfer
46553ff00c rework linux gyp files 2015-02-04 10:49:08 +01:00
Konstantin Käfer
704b3719f5 use standard DEBUG macro rather than NDEBUG 2015-02-04 10:49:07 +01:00
Konstantin Käfer
8730120054 move variables to their own file 2015-02-04 10:49:07 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Konstantin Käfer
fbe30e04c4 move ios-specific configuration to common.gypi 2015-02-04 10:49:07 +01:00
Konstantin Käfer
9a549094e0 make ios compile 2015-02-04 10:49:06 +01:00
Konstantin Käfer
4cbe665f7d add symbols to Release builds for easier debugging 2015-02-04 10:49:06 +01:00
Konstantin Käfer
8a1fce547e rearrange tests and add storage tests 2015-02-04 10:49:05 +01:00
Konstantin Käfer
31a0d18ca1 remove circular shared_ptr and a few other memory leaks 2015-02-04 10:49:05 +01:00
Konstantin Käfer
b9bf66e67e rewrite storage layer to be independent of the Map's event loop 2015-02-04 10:46:37 +01:00
Leith Bade
33f611cdf8 Fix -W flags for boost 
Fixes #801
 2015-02-03 11:38:43 -08:00
Dane Springmeyer
33b4922220 Adapt to c104c2f972 and 49fd477740 2015-02-02 15:18:01 -08:00
Leith Bade
aaedd9c83b Remove program binary caching 2015-01-27 12:38:40 +11: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
1b2f38d330 pass sqlite3_static_libs in install.gypi 2015-01-13 14:31:50 -05:00
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