From 18c081334686d29b2ab251b62ef8962643cd9206 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 30 May 2014 17:41:54 -0700 Subject: [PATCH] [build] move regex linking to llmr.gyp --- README.md | 5 +++-- linux/llmr-app.gyp | 3 +-- llmr.gyp | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 47c6a8d1d..78dd3c576 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 93b08364e..2a57515cd 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 a32a598f5..9b848b8bb 100644 --- a/llmr.gyp +++ b/llmr.gyp @@ -191,6 +191,7 @@ 'libraries': [ '<@(png_libraries)', '<@(uv_libraries)', + '-lboost_regex' ] }] ]