Commit Graph

42 Commits

Author SHA1 Message Date
Leith Bade
56e26749d4 Start working on android log hook 2014-11-07 01:39:44 +11:00
Leith Bade
9476b7a66f Add JNI code to build system 2014-11-05 22:53:48 +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
John Firebaugh
551ff954a5 Remove unused 2014-11-01 11:53:04 -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
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
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
Mike Morris
c73197f208 remove -lboost_regex from linker flags, followup to #521 2014-10-30 12:21:00 -04:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00
Mike Morris
7bdef53490 fix standalone_product_dir path 2014-10-30 11:51:50 -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
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
Dane Springmeyer
d8a93dbb95 use stable cross-generator direction for referencing standalone lib + other minor fixups 2014-10-29 18:13:25 -04:00
Dane Springmeyer
4cfb4b130f fix xproj target 2014-10-29 17:22:36 -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
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
Konstantin Käfer
1d82ae14a4 pass on libraries in link_settings 2014-10-29 11:32:54 -04:00
Konstantin Käfer
3a5b5e68e9 also add cflags 2014-10-28 13:45:26 -07:00
Mike Morris
652c616048 build simple, working mbgl-config script from gyp 2014-10-28 13:42:23 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
Mike Morris
124cc01bf1 add dummy mbgl-config generator script 2014-10-27 19:26:17 -04:00
Konstantin Käfer
602b9da992 add -fPIC for static libraries 2014-10-27 16:47:47 -04:00
Young Hahn
f716acb062 standalone flag for mbgl-headless 2014-10-27 15:43:54 -04:00
Konstantin Käfer
071f920790 mark as standalone static libraries so they get placed into the correct directory on non-osx targets 2014-10-27 12:34:10 -07:00
Konstantin Käfer
0883d98e96 build all architectures in Release mode 2014-10-27 10:56:59 -04:00
Konstantin Käfer
84700fce90 allow installing the library 2014-10-27 10:12:30 -04:00
Konstantin Käfer
0e928b5204 make tests work 2014-10-24 17:44:51 +02:00
Konstantin Käfer
cd9a89257a restructure gyp files 2014-10-24 16:40:08 +02:00