Commit Graph

62 Commits

Author SHA1 Message Date
Konstantin Käfer
da981e7825 move config files to config/ folder 2015-02-04 18:07:32 +01:00
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Konstantin Käfer
69975c7094 make different abis for android 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
a67219ab8b allow overriding configuration variables 2015-02-04 10:49:07 +01:00
Dane Springmeyer
beac81f849 ensure pkg-config is found since mason depends on it for now 2015-01-28 21:22:39 -08:00
Leith Bade
61113bf343 Update android ABIs 2015-01-29 00:52:37 +13: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
139c0c6da6 build against mason sqlite 3.8.6 2015-01-13 14:31:50 -05:00
Leith Bade
87ef90b896 Use libnu 1.5.1 2014-12-11 07:24:20 +11:00
Leith Bade
6be8c840bb Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-03 23:03:14 +11:00
Konstantin Käfer
d3ab895153 switch to a newer version of GLFW
refs #679
2014-12-03 12:30:29 +01: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
2c05b23f6a update nunicode version to 1.5.1 2014-12-02 16:34:51 +01:00
Leith Bade
0886db76e5 Use new libnu version on Android 2014-11-30 12:26:56 +11:00
Leith Bade
e5317b5237 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-30 12:17:52 +11:00
artemp
90480ee58c add jpeg lib 2014-11-28 00:13:06 +11:00
artemp
9092cb4209 update nunicode version 2014-11-21 16:27:34 +01:00
Leith Bade
c092a686a7 Add libzip 2014-11-17 19:23:36 +11:00
artemp
13686cc182 add jpeg lib 2014-11-07 11:26:55 +00:00
Leith Bade
0cc43afab3 Add missing libs to android 2014-11-05 21:11:16 +11:00
Leith Bade
991c497e43 Use local boost 2014-11-04 23:13:58 +11:00
Dane Springmeyer
d74a98899f merge with master 2014-11-03 10:32:27 -05:00
artemp
4a5d4ea0aa Merge branch 'master' into nunicode
Conflicts:
	configure
	styles
2014-11-03 10:43:55 +00:00
Dane Springmeyer
d7b0a34bdd mason-based android port 2014-11-01 22:41:40 -04:00
Konstantin Käfer
03ae142d72 use a local version of mason instead of writing into ~/.mason
fixes #526
2014-10-31 17:33:10 -04:00
Konstantin Käfer
a50042349c Merge branch 'master' into platform-image 2014-10-31 16:33:45 -04:00
Konstantin Käfer
080c185ea1 remove dependency on node 2014-10-31 16:02:41 -04:00
artemp
ea2416c7cf use nunicode for proper to_upper/to_lower string conversions 2014-10-31 14:43:46 -04:00
Konstantin Käfer
592ed57d09 use more modern libpng version instead of the system-provided one and fix compile errors 2014-10-30 12:40:16 -07:00
Konstantin Käfer
242993b43a fix gyp project 2014-10-30 15:06:10 -04:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00
Dane Springmeyer
77b21569ec curl static libs fixes for osx 2014-10-29 19:40:40 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
Konstantin Käfer
9a89d4de6c install mason automatically if it isn't present, and always use the install in ~/.mason 2014-10-24 10:52:47 +02:00
Konstantin Käfer
2dbe9edb06 write to correct file and add to gitignore 2014-10-22 12:01:56 +02:00
Konstantin Käfer
3a39d69504 link boost when the boost variable is set 2014-10-22 10:45:50 +02:00
Konstantin Käfer
dddd1c275c add libraries and make configure script more robust
[skip ci]
2014-10-21 15:45:41 +02:00
Konstantin Käfer
e98b3e5d86 install nvm and node
[skip ci]
2014-10-21 13:04:22 +02:00
Konstantin Käfer
ab42c0cf93 cleanup makefile
[skip ci]
2014-10-21 12:49:19 +02:00
Konstantin Käfer
ef1792fe47 properly detect boost root
[skip ci]
2014-10-21 12:08:04 +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
34fe7dc627 add basic request caching with sqlite 2014-09-24 16:12:02 +02:00
John Firebaugh
a634605176 Kill config.mk (fixes #456) 2014-09-03 14:59:18 -07:00
Konstantin Käfer
52939ce2fa pass absolute path to npm executable 2014-08-12 13:29:26 +02:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
871bb9d02e make sure pkg-config includes all system folders 2014-04-17 09:52:15 -07:00
Konstantin Käfer
ebc9a0a0d7 add xcode project builds 2014-04-11 15:13:55 -04:00