diff --git a/Makefile b/Makefile index c6f4eb0b3..bac7777dc 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ V ?= 1 all: llmr llmr: config.gypi src llmr.gyp - $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-x86 + @if [ ! -f out ]; then echo 'please run ./configure first'; else $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-x86; fi; # build OS X app with pure make app: config.gypi src macosx/llmr-app.gyp diff --git a/README.md b/README.md index 9eb3bcf9e..ff6930992 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,14 @@ An OpenGL renderer for [Mapbox vector tiles](https://www.mapbox.com/blog/vector-tiles), -implemented in C++, targeting iOS & OS X. +implemented in C++11, targeting iOS & OS X. + +# Depends + + - Modern C++ compiler that supports `-std=c++11` + - libpng + - glfw3 + - Boost (headers only) + - Python (for build only) + - Node.js (for build only) # Build instructions @@ -34,7 +43,6 @@ Options: Path to png libs ``` - Then you can build the OS X app with make: make app @@ -102,12 +110,10 @@ Build `libllmr`: ./configure make -Note: build will not compile until https://github.com/mapbox/llmr-native/issues/26 is fixed. - # Style protobuf We're encoding the styling information as a protocol buffer, according to -proto/style.proto. The reason for doing so is that we don't have to ship with a +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 ``` diff --git a/llmr.gyp b/llmr.gyp index 059e06917..76174e2e6 100644 --- a/llmr.gyp +++ b/llmr.gyp @@ -5,18 +5,8 @@ ], 'targets': [ { - 'target_name': 'llmr-x86', - 'product_name': 'llmr-x86', - 'type': 'static_library', - 'sources': [ - '