diff options
Diffstat (limited to 'platform/linux')
-rw-r--r-- | platform/linux/README.md | 20 | ||||
-rw-r--r-- | platform/linux/config.cmake | 27 |
2 files changed, 32 insertions, 15 deletions
diff --git a/platform/linux/README.md b/platform/linux/README.md index 8b8ac9d089..a8a4d459ee 100644 --- a/platform/linux/README.md +++ b/platform/linux/README.md @@ -6,7 +6,7 @@ We are using Ubuntu for development. While the software should work on other dis This process gives you a Linux desktop app built on a Linux host system. -### Build +### Prerequisites Install GCC 4.9+ if you are running Ubuntu 14.04 or older. Alternatively, you can also use [Clang 3.5+](http://llvm.org/apt/). @@ -15,9 +15,6 @@ Install GCC 4.9+ if you are running Ubuntu 14.04 or older. Alternatively, you ca sudo apt-get install gcc-4.9 g++-4.9 export CXX=g++-4.9 -**Note**: We partially support C++14 because GCC 4.9 does not fully implement the -final draft of the C++14 standard. More information in [DEVELOPING.md](DEVELOPING.md). - Ensure you have git and other build essentials: sudo apt-get install curl git build-essential zlib1g-dev automake \ @@ -38,6 +35,21 @@ Install glfw3 dependencies: x11proto-xf86vidmode-dev libxxf86vm-dev \ libxcursor-dev libxinerama-dev +[Node.js](https://nodejs.org/) 4.2.1 or later is also required. + +[ccache](https://ccache.samba.org) is optional, but improves recompilation performance. + +## Build + +Clone the git repository: + + git clone https://github.com/mapbox/mapbox-gl-native.git + cd mapbox-gl-native + +Note that this repository uses Git submodules. They'll be automatically checked out when you first run a `make` command, +but are not updated automatically. We recommended that you run `git submodule update` after pulling down new commits to +this repository. + Set the environment variable `MAPBOX_ACCESS_TOKEN` to your [Mapbox access token](ACCESS_TOKEN.md): export MAPBOX_ACCESS_TOKEN=MYTOKEN diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index dd5f0af112..53683daef0 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -11,7 +11,22 @@ mason_use(benchmark VERSION 1.2.0) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) -include(cmake/loop-uv.cmake) +add_library(mbgl-loop-uv STATIC + platform/default/async_task.cpp + platform/default/run_loop.cpp + platform/default/timer.cpp +) + +target_include_directories(mbgl-loop-uv + PRIVATE include + PRIVATE src +) + +target_link_libraries(mbgl-loop-uv + PRIVATE mbgl-core +) + +target_add_mason_package(mbgl-loop-uv PUBLIC libuv) macro(mbgl_platform_core) target_add_mason_package(mbgl-core PUBLIC mesa) @@ -110,8 +125,6 @@ macro(mbgl_platform_glfw) PRIVATE mbgl-loop-uv ) - target_add_mason_package(mbgl-glfw PUBLIC libuv) - add_custom_command( TARGET mbgl-glfw POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy @@ -126,8 +139,6 @@ macro(mbgl_platform_render) PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) - - target_add_mason_package(mbgl-render PUBLIC libuv) endmacro() @@ -136,8 +147,6 @@ macro(mbgl_platform_offline) PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) - - target_add_mason_package(mbgl-offline PUBLIC libuv) endmacro() @@ -160,8 +169,6 @@ macro(mbgl_platform_test) PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) - - target_add_mason_package(mbgl-test PUBLIC libuv) endmacro() @@ -180,8 +187,6 @@ macro(mbgl_platform_benchmark) PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) - - target_add_mason_package(mbgl-benchmark PUBLIC libuv) endmacro() |