summaryrefslogtreecommitdiff
path: root/gyp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-182-0/+2
|\ | | | | | | | | Conflicts: README.md
| * Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-11-171-0/+1
| |\
| * | "skip install" for lib Xcode targets for easier app archivingJustin R. Miller2014-11-112-0/+2
| | |
* | | Load CA bundle from APKLeith Bade2014-11-181-0/+1
| | | | | | | | | | | | Remove Assetbridge
* | | Create AssetRequestLeith Bade2014-11-171-0/+2
| | |
* | | Add libzipLeith Bade2014-11-171-0/+2
| | |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-141-0/+1
|\ \ \ | | |/ | |/|
| * | pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581Mike Morris2014-11-131-0/+1
| |/
* | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into ↵Leith Bade2014-11-092-2/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * don't error on unused parametersKonstantin Käfer2014-11-061-1/+11
| |
| * add -Werror to os x as wellKonstantin Käfer2014-11-061-1/+1
| |
| * fix boost includes and allow any platform builds for xcode test projectKonstantin Käfer2014-11-051-0/+1
| |
* | Start working on android log hookLeith Bade2014-11-071-1/+1
| |
* | Add JNI code to build systemLeith Bade2014-11-052-0/+73
| |
* | merge with masterDane Springmeyer2014-11-031-0/+3
|\ \ | |/
| * Merge branch 'master' into nunicodeartemp2014-11-0310-58/+29
| |\ | | | | | | | | | | | | | | | Conflicts: configure styles
| * | use nunicode for proper to_upper/to_lower string conversionsartemp2014-10-311-0/+3
| | |
* | | mason-based android portDane Springmeyer2014-11-011-0/+1
| |/ |/|
* | Remove unusedJohn Firebaugh2014-11-011-17/+0
| |
* | only the linux app needs 'copy-styles'Dane Springmeyer2014-10-311-11/+1
| | | | | | | | - works around make xproj error (gyp generator bug?) with nested paths that leads to 'assert group_ref.__class__ == PBXGroup'
* | Get mapbox-gl-styles via submodule (fixes #511)John Firebaugh2014-10-311-1/+1
| |
* | Merge pull request #527 from mapbox/platform-imageKonstantin Käfer2014-10-315-5/+24
|\ \ | | | | | | Use platform-specific routines for decoding/encoding images
| * \ Merge branch 'master' into platform-imageKonstantin Käfer2014-10-312-24/+2
| |\ \
| * | | use more modern libpng version instead of the system-provided one and fix ↵Konstantin Käfer2014-10-301-1/+5
| | | | | | | | | | | | | | | | compile errors
| * | | fix gyp projectKonstantin Käfer2014-10-301-2/+0
| | | |
| * | | use CoreImage for decoding/encoding images on osx/iosKonstantin Käfer2014-10-304-3/+19
| | | |
* | | | declare explicit MACOSX_DEPLOYMENT_TARGET - refs #529Dane Springmeyer2014-10-311-0/+1
| |/ / |/| |
* | | remove dependency on nodeKonstantin Käfer2014-10-312-24/+2
| |/ |/|
* | remove -lboost_regex from linker flags, followup to #521Mike Morris2014-10-301-1/+0
|/
* fix standalone_product_dir pathMike Morris2014-10-301-1/+1
|
* mbgl-config: also pass sqlite, curl, png, and boost ldflags alongDane Springmeyer2014-10-291-1/+18
|
* Add -fPIC to cflagsDane Springmeyer2014-10-291-1/+1
|
* start passing ldflagsDane Springmeyer2014-10-292-75/+1
|
* merge with mbgl-configDane Springmeyer2014-10-292-0/+91
|\
| * --includedirMike Morris2014-10-291-1/+0
| |
| * build simple, working mbgl-config script from gypMike Morris2014-10-281-12/+5
| |
| * add dummy mbgl-config generator scriptMike Morris2014-10-271-0/+24
| |
| * standalone flag for mbgl-headlessYoung Hahn2014-10-271-0/+1
| |
| * mark as standalone static libraries so they get placed into the correct ↵Konstantin Käfer2014-10-274-0/+4
| | | | | | | | directory on non-osx targets
* | use stable cross-generator direction for referencing standalone lib + other ↵Dane Springmeyer2014-10-295-20/+14
| | | | | | | | minor fixups
* | fix xproj targetDane Springmeyer2014-10-291-0/+4
| |
* | attempt to build against standalone libmgl.aDane Springmeyer2014-10-292-35/+7
| |
* | install libmbgl.aDane Springmeyer2014-10-291-0/+2
| |
* | create and install libmbgl.a with bundled libuvDane Springmeyer2014-10-292-0/+91
| |
* | mark static libs as standaloneKonstantin Käfer2014-10-294-0/+4
| |
* | rename mbgl to mbgl-coreKonstantin Käfer2014-10-292-4/+5
| |
* | pass on libraries in link_settingsKonstantin Käfer2014-10-294-18/+24
| |
* | also add cflagsKonstantin Käfer2014-10-281-0/+6
| |
* | gyp fixesKonstantin Käfer2014-10-285-75/+75
| |
* | add -fPIC for static librariesKonstantin Käfer2014-10-271-0/+13
|/
View Lorry Controller Status