summaryrefslogtreecommitdiff
path: root/platform/linux/README.md
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-03 15:16:49 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-07 18:01:02 -0700
commitf964e40e7e9220d08751d8607af61ac5a7c0794c (patch)
treed34ca5407188fe3d71396faa8a8acceb52d9bd4b /platform/linux/README.md
parentf5d66f362272db034a311d2077dbdb2937c9bbdf (diff)
downloadqtlocation-mapboxgl-f964e40e7e9220d08751d8607af61ac5a7c0794c.tar.gz
[build] Refactor and simplify build system
* Main gyp files are now standardized as platform/<platform>/platform.gyp. * Each platform gyp file defines appropriate loop_lib and headless_lib variables. * Each platform gyp file includes mbgl.gypi, which defines base targets which may be useful to all platforms. * CI targets are consistent across platforms: `make $(PLATFORM) && make test-$(PLATFORM)`. * Renamed the "linux" test app to "glfw". It's now built in OS X CI. * Android build flakiness is fixed. * iOS CI builds the bench and iosapp targets. * Mesa version is now in one place. * CI scripts use bash "strict mode" and correct error handling. * All build output goes to the build directory. * Removed vestigial iOS/OS X/Android Travis scripts.
Diffstat (limited to 'platform/linux/README.md')
-rw-r--r--platform/linux/README.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/linux/README.md b/platform/linux/README.md
index 55f3e71dba..910edcb9a6 100644
--- a/platform/linux/README.md
+++ b/platform/linux/README.md
@@ -33,14 +33,13 @@ Set the environment variable `MAPBOX_ACCESS_TOKEN` to your [Mapbox access token]
export MAPBOX_ACCESS_TOKEN=MYTOKEN
-Then, you can then proceed to build the library:
+Then, you can then proceed to build the test application:
- git submodule update --init
- make linux
+ make glfw-app
Set an access token as described below, and then run:
- make run-linux
+ make run-glfw-app
### Test