Commit Graph

58 Commits

Author SHA1 Message Date
Leith Bade
b3a0a205df Fix jpeg android gyp 2014-11-28 00:15:05 +11:00
artemp
fcebd44571 simplify image_readers creation implementation
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
2014-11-28 00:15:04 +11:00
artemp
70627bd958 move image_reader to mbgl-linux 2014-11-28 00:14:15 +11:00
artemp
ae2d4e740e add image_reader abstraction layer to hanfle multiple image formats
(work-in-progress)
2014-11-28 00:14:11 +11:00
Leith Bade
f89d27cf99 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	README.md
2014-11-18 19:32:20 +11:00
Justin R. Miller
947a16e985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-11-17 11:54:06 -08:00
Leith Bade
80be6c4eb0 Load CA bundle from APK
Remove Assetbridge
2014-11-18 00:33:59 +11:00
Leith Bade
aee724d6cf Create AssetRequest 2014-11-17 20:00:44 +11:00
Leith Bade
c092a686a7 Add libzip 2014-11-17 19:23:36 +11:00
Leith Bade
a7d582a3e0 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-14 08:05:13 +11:00
Mike Morris
e0b4107595 pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581 2014-11-13 11:47:06 -08:00
Justin R. Miller
bad4c96603 "skip install" for lib Xcode targets for easier app archiving 2014-11-11 14:59:01 -08:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Konstantin Käfer
fb7f23884b don't error on unused parameters 2014-11-06 17:21:55 +01:00
Leith Bade
56e26749d4 Start working on android log hook 2014-11-07 01:39:44 +11:00
Konstantin Käfer
618a4a5785 add -Werror to os x as well 2014-11-06 14:18:52 +01:00
Leith Bade
9476b7a66f Add JNI code to build system 2014-11-05 22:53:48 +11:00
Konstantin Käfer
2f86a1735e fix boost includes and allow any platform builds for xcode test project 2014-11-05 12:13:24 +01: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