Commit Graph

2070 Commits

Author SHA1 Message Date
artemp
01f70f5db0 increase buf to hold trailing '\0' + better names 2014-11-03 12:29:18 +00:00
artemp
4a5d4ea0aa Merge branch 'master' into nunicode
Conflicts:
	configure
	styles
2014-11-03 10:43:55 +00:00
John Firebaugh
551ff954a5 Remove unused 2014-11-01 11:53:04 -04:00
Konstantin Käfer
ce1e151831 Merge branch 'local-mason'
Conflicts:
	.gitmodules
	styles
2014-10-31 18:03:23 -04:00
Konstantin Käfer
ec42892f5c add to $PATH instead of using aliases 2014-10-31 17:38:34 -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
Dane Springmeyer
b2032103f2 linux app: fix path to styles 2014-10-31 17:14:30 -04:00
Dane Springmeyer
28bfdbb9e4 no need for touch workaround since linux app is built with make not xcode 2014-10-31 17:14:30 -04:00
Dane Springmeyer
80040304b4 only the linux app needs 'copy-styles'
- works around make xproj error (gyp generator bug?) with nested paths that leads to 'assert group_ref.__class__ == PBXGroup'
2014-10-31 17:14:30 -04:00
John Firebaugh
d675828fe1 Get mapbox-gl-styles via submodule (fixes #511) 2014-10-31 17:14:30 -04:00
Konstantin Käfer
16bd75c6cc Merge pull request #527 from mapbox/platform-image
Use platform-specific routines for decoding/encoding images
2014-10-31 17:06:32 -04:00
Konstantin Käfer
d0f71242da bump cocoa bindings 2014-10-31 16:51:36 -04:00
Dane Springmeyer
bc7effdd86 declare explicit MACOSX_DEPLOYMENT_TARGET - refs #529 2014-10-31 16:37:53 -04:00
Konstantin Käfer
a50042349c Merge branch 'master' into platform-image 2014-10-31 16:33:45 -04:00
Konstantin Käfer
ffc42cac02 Merge pull request #531 from mapbox/remove-node
Remove dependency on node.js
2014-10-31 16:23:43 -04:00
Konstantin Käfer
08515b41c0 call correct image compare script 2014-10-31 16:11:36 -04:00
Konstantin Käfer
080c185ea1 remove dependency on node 2014-10-31 16:02:41 -04:00
artemp
318d08706f add <cstring> for std::memset 2014-10-31 15:01:50 -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
38d17532c6 use binary mesa on travis to speed up build times 2014-10-31 12:35:36 -04:00
Konstantin Käfer
86230821e4 use test suite as submodule instead of using npm 2014-10-31 12:02:39 -04:00
Konstantin Käfer
15cf30652c rename to .hpp to avoid compiling twice 2014-10-30 18:00:52 -04:00
Konstantin Käfer
80366bc615 allow providing a callback to uv_messenger_stop to prevent mismatched new/free 2014-10-30 17:47:34 -04:00
artemp
1955600904 use boost::unicode_iterator on all platform (experimental) 2014-10-30 17:43:55 -04:00
Konstantin Käfer
203acaad9e simplify debug font lookup 2014-10-30 17:36:28 -04:00
Konstantin Käfer
8712beff80 don't use std::map for checking color constants 2014-10-30 16:43:36 -04:00
Dane Springmeyer
ae3ef12142 Revert "remove distclean (now that we've ported to mason and re-installs are fast)"
This reverts commit f8f38b1003.
2014-10-30 16:39:50 -04:00
Dane Springmeyer
24a57c17e7 Revert "remove distclean mention in the readme"
This reverts commit 38e144aeb7.
2014-10-30 16:39:44 -04:00
Dane Springmeyer
46739eb776 remove directories from ignores 2014-10-30 16:06:37 -04:00
Konstantin Käfer
8dda6482fa fix image y reversal 2014-10-30 15:56:17 -04:00
Konstantin Käfer
2ebe167add use -lpthread instead of -pthread 2014-10-30 15:56:08 -04:00
Konstantin Käfer
930d063259 Merge branch 'master' into platform-image
Conflicts:
	gyp/install.gypi
2014-10-30 15:44:09 -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
3d6a87ab1b bump cocoa 2014-10-30 15:10:24 -04:00
Konstantin Käfer
b6dea0d8de also allow underscores in token names 2014-10-30 15:06:18 -04:00
Konstantin Käfer
242993b43a fix gyp project 2014-10-30 15:06:10 -04:00
artemp
307488adf8 aeroway_fill - ensure we fill polygons only 2014-10-30 14:59:41 -04:00
Dane Springmeyer
38e144aeb7 remove distclean mention in the readme 2014-10-30 14:12:51 -04:00
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