Commit Graph

20 Commits

Author SHA1 Message Date
Mike Morris
50d9e6d845 Merge branch 'master' into fuzz-pipe
Conflicts:
	bin/package.json
2014-07-17 17:12:44 -04:00
Konstantin Käfer
d44742f115 switch to published npm version 2014-07-17 13:27:33 -07:00
Mike Morris
4cb9972278 Merge branch 'master' into fuzz-pipe
Conflicts:
	bin/package.json
	src/style/style_parser.cpp
	test/fixtures/fixture_log.cpp
	test/test.gyp
2014-07-17 12:44:45 -04:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Mike Morris
ba4375dc51 Merge branch 'master' into fuzz-pipe 2014-07-09 13:15:14 -07:00
Mike Morris
172466301b fix gypfile 2014-07-09 13:03:56 -07:00
Konstantin Käfer
d0d68d08f4 fix automated headless testing on travis 2014-07-09 12:37:59 -07:00
Dane Springmeyer
7f592ac2e7 Address #151 at the same time 2014-05-23 17:14:19 -07:00
Konstantin Käfer
8c9f980271 correctly build shaders if the optimizer is not present 2014-04-11 16:23:06 -04:00
Konstantin Käfer
ebc9a0a0d7 add xcode project builds 2014-04-11 15:13:55 -04:00
Konstantin Käfer
0768600a70 clean up build system and reuse previously built libraries in other targets 2014-04-11 11:29:18 -07:00
Konstantin Käfer
ee2f17d2b4 fix build on travis 2014-04-11 08:50:43 -07:00
Konstantin Käfer
662562d9fe use mapnik-packaging to build all dependencies 2014-04-09 15:57:21 -04:00
Konstantin Käfer
4b6b5b3b22 fail hard if the shader optimizer is unavailable 2014-03-26 11:51:15 +01:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +01:00
Konstantin Käfer
82c79b7bda remove c99 features
fixes #26
2014-02-03 23:21:50 +01:00
Konstantin Käfer
50f99e414e define as extern 2014-01-21 15:44:56 +01:00
Konstantin Käfer
5aa22b9c32 move shaders to cpp file 2014-01-20 11:30:06 +01:00
Konstantin Käfer
528eaf475e emscripten support 2014-01-07 16:52:23 +01:00