summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-05-30 17:41:54 -0700
committerDane Springmeyer <dane@mapbox.com>2014-05-30 17:41:54 -0700
commit18c081334686d29b2ab251b62ef8962643cd9206 (patch)
tree5715dd214677f534d3c4ac54735221bcfefa3379
parentf291d609f41fa85aac1809baa42a44824a1cc952 (diff)
downloadqtlocation-mapboxgl-18c081334686d29b2ab251b62ef8962643cd9206.tar.gz
[build] move regex linking to llmr.gyp
-rw-r--r--README.md5
-rw-r--r--linux/llmr-app.gyp3
-rw-r--r--llmr.gyp1
3 files changed, 5 insertions, 4 deletions
diff --git a/README.md b/README.md
index 47c6a8d1d9..78dd3c576c 100644
--- a/README.md
+++ b/README.md
@@ -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)'
],
},
}],
diff --git a/llmr.gyp b/llmr.gyp
index a32a598f53..9b848b8bb3 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -191,6 +191,7 @@
'libraries': [
'<@(png_libraries)',
'<@(uv_libraries)',
+ '-lboost_regex'
]
}]
]