diff options
author | Dane Springmeyer <dane@mapbox.com> | 2014-05-30 17:41:54 -0700 |
---|---|---|
committer | Dane Springmeyer <dane@mapbox.com> | 2014-05-30 17:41:54 -0700 |
commit | 18c081334686d29b2ab251b62ef8962643cd9206 (patch) | |
tree | 5715dd214677f534d3c4ac54735221bcfefa3379 | |
parent | f291d609f41fa85aac1809baa42a44824a1cc952 (diff) | |
download | qtlocation-mapboxgl-18c081334686d29b2ab251b62ef8962643cd9206.tar.gz |
[build] move regex linking to llmr.gyp
-rw-r--r-- | README.md | 5 | ||||
-rw-r--r-- | linux/llmr-app.gyp | 3 | ||||
-rw-r--r-- | llmr.gyp | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -6,11 +6,12 @@ implemented in C++11, currently targeting iOS, OS X, and Ubuntu Linux. # Depends - Modern C++ compiler that supports `-std=c++11` + - Boost headers - `libpng` - `libuv` - - `libcurl` (depends on OpenSSL; Linux only) - `glfw3` - - Boost + - `libcurl` (depends on OpenSSL; Linux only) + - `libboost_regex` (Linux only) - Python (for build only) - Node.js (for build only) diff --git a/linux/llmr-app.gyp b/linux/llmr-app.gyp index 93b08364ed..2a57515cd7 100644 --- a/linux/llmr-app.gyp +++ b/linux/llmr-app.gyp @@ -43,8 +43,7 @@ 'link_settings': { 'libraries': [ '<@(glfw3_libraries)', - '<@(curl_libraries)', - '-lboost_regex' + '<@(curl_libraries)' ], }, }], @@ -191,6 +191,7 @@ 'libraries': [ '<@(png_libraries)', '<@(uv_libraries)', + '-lboost_regex' ] }] ] |