Commit Graph

16768 Commits

Author SHA1 Message Date
Dane Springmeyer
64f383e3f6 customize concurrent JOBS per compiler/platform 2014-10-30 11:37:10 -04:00
Konstantin Käfer
e38b02ff58 Merge pull request #521 from mapbox/no-boost-regex
Remove libboost_regex usage
2014-10-30 11:35:01 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
Dane Springmeyer
152545d33a fix xtest target - closes #520 - longer term fix at #519 2014-10-30 11:24:28 -04:00
artemp
aaa8927169 remove unused and unimplemented method 2014-10-30 11:04:10 -04:00
artemp
fd2d8f48cb pass Tile::ID by const ref 2014-10-30 10:43:58 -04:00
Dane Springmeyer
acb65f8f67 travis: can travis cope with 4 mesa build jobs? 2014-10-30 00:43:08 -04:00
Dane Springmeyer
8c515b9699 travis: can travis cope with 2 mesa build jobs? 2014-10-30 00:34:13 -04:00
Dane Springmeyer
93ce8cd8d5 Merge pull request #517 from mapbox/mesa-tarball
Mesa
2014-10-30 00:28:41 -04:00
Dane Springmeyer
be299fba49 try mesa without concurrent jobs 2014-10-30 00:09:08 -04:00
Dane Springmeyer
543d4568d5 more build concurrency 2014-10-29 23:58:22 -04:00
Dane Springmeyer
cb7c57dae6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into mesa-tarball 2014-10-29 23:52:51 -04:00
Dane Springmeyer
da9718d507 mbgl-config: also pass sqlite, curl, png, and boost ldflags along 2014-10-29 22:58:42 -04:00
Dane Springmeyer
44402a670d Add -fPIC to cflags 2014-10-29 22:43:40 -04:00
Dane Springmeyer
db561db7ca Merge pull request #516 from mapbox/standalone
[Work in Progress] Standalone libmgl.a
2014-10-29 22:24:48 -04:00
Dane Springmeyer
22f67bb8ab start passing ldflags 2014-10-29 22:16:44 -04:00
Dane Springmeyer
761f753cbd merge with mbgl-config 2014-10-29 21:40:02 -04:00
Mike Morris
88361f02fa Merge branch 'master' into mbgl-config 2014-10-29 21:38:34 -04:00
Dane Springmeyer
9dbcf18d14 update to standalone mapbox-gl-cocoa branch 2014-10-29 21:38:25 -04:00
Dane Springmeyer
77b21569ec curl static libs fixes for osx 2014-10-29 19:40:40 -04:00
Dane Springmeyer
b32748b42f better fix for handling mbgl-linux symbols 2014-10-29 19:37:42 -04:00
Dane Springmeyer
ad6d73e6b0 fix linux app linking to curl symbols 2014-10-29 19:09:13 -04:00
artemp
665497672e access member variables directly inside class methods 2014-10-29 18:13:25 -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
artemp
9ff0d00912 store uv::loop as unique_ptr 2014-10-29 18:12:11 -04:00
Dane Springmeyer
4cfb4b130f fix xproj target 2014-10-29 17:22:36 -04:00
Dane Springmeyer
a8b5f56049 fix macosx app linking 2014-10-29 16:45:31 -04:00
Dane Springmeyer
cefa3462f8 linux test build fixes 2014-10-29 16:34:53 -04:00
Dane Springmeyer
1069e3b4e9 fix tests 2014-10-29 16:29:48 -04:00
Dane Springmeyer
0f56f860f7 still link boost on linux 2014-10-29 16:21:25 -04:00
Dane Springmeyer
36cd65e1ab patch gyp to allow common 'libraries' config for both osx and linux 2014-10-29 16:17:52 -04:00
Dane Springmeyer
76e746d255 linux app depends on mbgl-linux 2014-10-29 15:31:57 -04:00
Dane Springmeyer
c11dc0fa33 attempt to build against standalone libmgl.a 2014-10-29 15:27:41 -04:00
Mike Morris
078f7afa6e --includedir 2014-10-29 15:15:36 -04:00
Dane Springmeyer
1396060196 install libmbgl.a 2014-10-29 15:01:51 -04:00
Dane Springmeyer
92474b5f51 create and install libmbgl.a with bundled libuv 2014-10-29 14:54:13 -04:00
artemp
6622a07ad8 simplify - remove before/afterParse and create Parser on stack in worker thread 2014-10-29 14:37:13 -04:00
artemp
2607a755af store spriteAtlas by value + make TileParser noncopyable 2014-10-29 14:09:06 -04:00
artemp
92f99cbc16 remove commented out assert 2014-10-29 13:55:17 -04:00
artemp
3b5b15a4e4 store glyphAtlas by value in Map object, pass by ref
change hasData signiture to expect ```StyleLayer const&```
2014-10-29 13:44:26 -04:00
Dane Springmeyer
7dc7387073 fix typo in target name 2014-10-29 12:19:11 -04:00
Konstantin Käfer
4cf24fe959 mark static libs as standalone 2014-10-29 12:00:01 -04:00
Konstantin Käfer
293b291b80 rename mbgl to mbgl-core 2014-10-29 11:59:24 -04:00
artemp
3723481319 c++ - use const qualifier 2014-10-29 11:57:39 -04:00
Konstantin Käfer
1d82ae14a4 pass on libraries in link_settings 2014-10-29 11:32:54 -04:00
John Firebaugh
7caac537b8 Fix variable shadowing 2014-10-29 10:12:41 -04:00
John Firebaugh
8ae0dcb5a4 Replace uv::rwlock with std::recursive_mutex
Fixes #491
2014-10-29 09:58:56 -04:00
John Firebaugh
da8aa391d0 Render map with a copy of TransformState 2014-10-29 09:58:56 -04:00
John Firebaugh
4f7bc80664 Hold internal reference to Sprite in SpriteAtlas 2014-10-29 09:58:03 -04:00
Konstantin Käfer
3a5b5e68e9 also add cflags 2014-10-28 13:45:26 -07:00