summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-05-04 15:55:54 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-05-04 15:55:54 -0700
commitb952f7e64b3ee3c72f492ee7f5f24d3ab28e8683 (patch)
tree03f8e719d8659b854200f61c4731bcb59a3317bb /README.md
parentc2858dd45f735d99b1bc46043cff0b2a6b176c63 (diff)
parent5c7867f435f9d94109ce11fcbbd153b016e02fe0 (diff)
downloadqtlocation-mapboxgl-b952f7e64b3ee3c72f492ee7f5f24d3ab28e8683.tar.gz
Merge pull request #1412 from mapbox/1309-another-try
Ensure worker tasks are complete before destroying TileData
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 06072f00fa..9d9bf508e0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ implemented in C++11, currently targeting iOS, OS X, Android, and Ubuntu Linux.
# Depends
- - Modern C++ compiler that supports `-std=c++11` (On OS X clang++, on Linux g++-4.8 or g++-4.9)
+ - Modern C++ compiler that supports `-std=c++14` (On OS X clang++, on Linux g++-4.9)
- [Boost headers](http://boost.org/)
- [`zlib`](http://www.zlib.net/)
- [`libpng`](http://www.libpng.org/pub/png/libpng.html)
@@ -85,8 +85,8 @@ Install GCC 4.8+ if you are running Ubuntu 13.10 or older. Alternatively, you ca
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
sudo apt-get update
- sudo apt-get install gcc-4.8 g++-4.8
- export CXX=g++-4.8
+ sudo apt-get install gcc-4.9 g++-4.9
+ export CXX=g++-4.9
Ensure you have git and other build essentials: