Commit Graph

7032 Commits

Author SHA1 Message Date
Dane Springmeyer
f8f38b1003 remove distclean (now that we've ported to mason and re-installs are fast) 2014-10-30 14:11:41 -04:00
Dane Springmeyer
05d708c1a3 double JOBS 2014-10-30 13:59:36 -04:00
Dane Springmeyer
c40a85587b attemp to fix #525 2014-10-30 13:37:10 -04:00
Dane Springmeyer
d107eb4efd Merge pull request #524 from mapbox/jobs
Jobs
2014-10-30 13:26:13 -04:00
Mike Morris
c73197f208 remove -lboost_regex from linker flags, followup to #521 2014-10-30 12:21:00 -04:00
Dane Springmeyer
71a6f570a2 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into jobs 2014-10-30 12:19:30 -04:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00
Konstantin Käfer
7a13db9a86 do not crash for missing images 2014-10-30 11:58:16 -04:00
Konstantin Käfer
414ccaaf93 use unique_ptr for automatic deallocation 2014-10-30 11:54:52 -04:00
Dane Springmeyer
b3e0f75e4a fix #522 2014-10-30 11:52:44 -04:00
Mike Morris
85265b6641 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-10-30 11:51:56 -04:00
Mike Morris
7bdef53490 fix standalone_product_dir path 2014-10-30 11:51:50 -04:00
Konstantin Käfer
995bbda1f7 use the correct makefile names for building the project 2014-10-30 11:47:36 -04:00
Konstantin Käfer
5413cb065f restructure Makefile to avoid concurrent makefile generation 2014-10-30 11:47:36 -04:00
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