summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-03-14 10:52:42 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-03-14 10:52:42 +0100
commit7a34534aca085055e82f933c0386db1627c2cb7a (patch)
treed1aeb7b2d0c96b8850116daba486f85097216538 /README.md
parent86e6e6bed8435f625d395d37fd2e10281c78edf5 (diff)
downloadqtlocation-mapboxgl-7a34534aca085055e82f933c0386db1627c2cb7a.tar.gz
remove reference to style pbf
Diffstat (limited to 'README.md')
-rw-r--r--README.md28
1 files changed, 9 insertions, 19 deletions
diff --git a/README.md b/README.md
index 575cbbe9ba..8860696e53 100644
--- a/README.md
+++ b/README.md
@@ -52,15 +52,15 @@ Or generate a dual iOS/OS X-compatible Xcode project for `libllmr` to include as
## iOS
-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`.
+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:
+Then you can build the iOS app with make:
make iapp
-Consider `sudo npm install -g ios-sim` for auto-launching the simulator, but it can be tricky and it's better to run on an ARM-based device anyway. To do this, open `./ios/llmr-app.xcodeproj` in Xcode, then build and run on the simulator or a device yourself.
+Consider `sudo npm install -g ios-sim` for auto-launching the simulator, but it can be tricky and it's better to run on an ARM-based device anyway. To do this, open `./ios/llmr-app.xcodeproj` in Xcode, then build and run on the simulator or a device yourself.
-Target devices: iPhone 4 and above (4S, 5, 5c, 5s) and iPad 2 and above (3, 4, mini and/or retina).
+Target devices: iPhone 4 and above (4S, 5, 5c, 5s) and iPad 2 and above (3, 4, mini and/or retina).
## Ubuntu
@@ -101,26 +101,16 @@ Build `libllmr`:
./configure
make
-# Style protobuf
+# Style
-We're encoding the styling information as a protocol buffer, according to
-proto/style.proto. The reason for doing so is to avoid needing to ship with a
-JSON/yaml parser. To test the conversion script, run
+We're currently embedding the stylesheet JSON in the binary. To create the C++
+file and the associated header, run
```
-bin/convert-style.js && cat resources/style.pbf | protoc --decode=style proto/style.proto
+bin/build-style.js
```
-You should see a nicely formatted hierarchical output of the converted style.
-
-
-To update the included default style, use
-
-```
-bin/convert-style.js && bin/build-style.js
-```
-
-This is automatically taken care of as a build phase if you are using the Xcode projects.
+This is automatically taken care of as a build phase if you are using the Xcode projects.
# Usage