diff --git a/README.md b/README.md index 022377e99..3c8fb2fd3 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Install GCC 4.8+ if you are running Ubuntu 13.10 or older. Alternatively, you ca Ensure you have git and other build essentials: - sudo apt-get install git build-essential zlib1g-dev automake \ + sudo apt-get install curl git build-essential zlib1g-dev automake \ libtool xutils-dev make cmake pkg-config python-pip \ libcurl4-openssl-dev libpng-dev libsqlite3-dev @@ -93,16 +93,15 @@ Once you're done installing the build dependencies, you can get started by runni ./configure -which downloads all other dependencies that we need to build manually with [Mason](https://github.com/mapbox/mason). There's a good chance that there already are binary files and that you don't need to compile anything. - -Then, you can then proceed to build the library like: - - make mbgl - -Or proceed to building the debug application with: +Then, you can then proceed to build the library: + git submodule update --init make linux +Set an access token as described below, and then run: + + make run-linux + # Troubleshooting diff --git a/gyp/install.gypi b/gyp/install.gypi index 7b8cf6220..d46900dff 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -23,6 +23,7 @@ ['OS == "linux"', { 'other_ldflags': [ '<@(png_static_libs)', + '<@(jpeg_static_libs)', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', ] diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 46ff76274..022480350 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -37,6 +37,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'OTHER_CFLAGS': [ '<@(cflags)' ], + 'SKIP_INSTALL': 'YES' }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index 5566ca3a3..dd1c9c0c2 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -12,6 +12,7 @@ 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'CLANG_ENABLE_OBJC_ARC': 'YES', 'CODE_SIGN_IDENTITY': 'iPhone Developer', + 'SKIP_INSTALL': 'YES' }, 'configurations': { 'Release': { diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index a66a80ebf..aee928685 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -8,6 +8,7 @@ 'variables': { 'cflags_cc': [ '<@(png_cflags)', + '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', @@ -32,6 +33,8 @@ '../platform/default/http_request_baton_curl.cpp', '../platform/default/image.cpp', '../platform/default/image_reader.cpp', + '../platform/default/png_reader.cpp', + '../platform/default/jpeg_reader.cpp', ], 'include_dirs': [ '../include', diff --git a/include/mbgl/geometry/glyph_atlas.hpp b/include/mbgl/geometry/glyph_atlas.hpp index 639c6cc51..7b3c223fe 100644 --- a/include/mbgl/geometry/glyph_atlas.hpp +++ b/include/mbgl/geometry/glyph_atlas.hpp @@ -28,8 +28,6 @@ private: const SDFGlyph& glyph); public: GlyphAtlas(uint16_t width, uint16_t height); - ~GlyphAtlas(); - Rect addGlyph(uint64_t tile_id, const std::string& face_name, const SDFGlyph& glyph); @@ -46,7 +44,7 @@ private: std::mutex mtx; BinPack bin; std::map> index; - char *const data = nullptr; + std::unique_ptr data; std::atomic dirty; uint32_t texture = 0; }; diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 43402fe2e..5fe2ea07e 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -71,7 +71,6 @@ public: void resize(uint16_t width, uint16_t height, float ratio, uint16_t fb_width, uint16_t fb_height); // Styling - const std::set> getActiveSources() const; void setAppliedClasses(const std::vector &classes); void toggleClass(const std::string &name); const std::vector &getAppliedClasses() const; @@ -115,7 +114,6 @@ public: void resetNorth(); void startRotating(); void stopRotating(); - bool canRotate(); // Debug void setDebug(bool value); @@ -125,29 +123,17 @@ public: // Call this when the network reachability changed. void setReachability(bool status); -public: inline const TransformState &getState() const { return state; } - inline util::ptr getFileSource() const { return fileSource; } - inline util::ptr