summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-03-11 11:55:00 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-03-11 11:55:00 +0100
commit4de8674f208e05de78d7b44a550bb6c6f3cada07 (patch)
tree3aa54c0a6f8c1ea83df45ad8b56050e94519a12d /README.md
parent8a6634660a854b9a19395e40503bbfbac64a3cf3 (diff)
parent0fa33dc0253a543b626527e3981792396de337f2 (diff)
downloadqtlocation-mapboxgl-4de8674f208e05de78d7b44a550bb6c6f3cada07.tar.gz
Merge branch 'variant'
Diffstat (limited to 'README.md')
-rw-r--r--README.md15
1 files changed, 3 insertions, 12 deletions
diff --git a/README.md b/README.md
index ff69309922..575cbbe9ba 100644
--- a/README.md
+++ b/README.md
@@ -14,16 +14,16 @@ implemented in C++11, targeting iOS & OS X.
## OS X
-Install boost, libpng, and [glfw3](http://www.glfw.org/docs/latest/):
+Install libpng and [glfw3](http://www.glfw.org/docs/latest/):
```
-brew install boost libpng
+brew install libpng
brew install homebrew/versions/glfw3
```
Then configure the project:
- ./configure --boost=`brew --prefix` --glfw3=`brew --prefix` --png=`brew --prefix`
+ ./configure --glfw3=`brew --prefix` --png=`brew --prefix`
See all the options by calling `./configure --help`
@@ -34,7 +34,6 @@ Usage: configure [options]
Options:
-h, --help show this help message and exit
--debug Also build debug build
- --boost=BOOST_ROOT Path to boost (defaults to /usr/local)
--glfw3=GLFW3 Path to gflw3 (defaults to using pkg-config)
--png=PNG Path to png (defaults to using pkg-config)
--png-includes=PNG_INCLUDES
@@ -53,10 +52,6 @@ Or generate a dual iOS/OS X-compatible Xcode project for `libllmr` to include as
## iOS
-Install boost:
-
- brew install boost
-
Because `libpng` isn't included in the iOS SDK, you will need to build a cross-architecture version yourself. Run `./ios/setup_libpng.sh`, which is derived from Mapnik's cross-architecture build scripts. This will also run `./configure`.
Then you can build the iOS app with make:
@@ -79,10 +74,6 @@ Install a `-std=c++11` capable compiler
sudo apt-get update
sudo apt-get install gcc-4.8 g++-4.8
-Install boost (we only need headers):
-
- sudo apt-get install libboost-dev
-
Install libpng-dev:
sudo apt-get install libpng-dev