diff options
| -rw-r--r-- | bin/render.gypi | 3 | ||||
| -rwxr-xr-x | configure | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bin/render.gypi b/bin/render.gypi index b205e7a959..2e1dbd8f73 100644 --- a/bin/render.gypi +++ b/bin/render.gypi @@ -34,12 +34,11 @@ 'ldflags': [ '<@(glfw3_ldflags)', '<@(uv_ldflags)', - '<@(boost_ldflags)', - '-lboost_program_options' ], 'libraries': [ '<@(glfw3_static_libs)', '<@(uv_static_libs)', + '<@(boost_program_options_static_libs)' ], }, @@ -46,6 +46,7 @@ case ${MASON_PLATFORM} in LIBUV_VERSION=0.10.28 ZLIB_VERSION=system BOOST_VERSION=1.57.0 + BOOST_PROGRAM_OPTIONS_VERSION=1.57.0 NUNICODE_VERSION=1.5.1 LIBZIP_VERSION=0.11.2 ;; @@ -104,7 +105,11 @@ CONFIG="# Do not edit. Generated by the configure script. if [ ! -z ${BOOST_VERSION} ]; then mason install boost ${BOOST_VERSION} CONFIG+=" 'boost_cflags%': $(quote_flags $(mason cflags boost ${BOOST_VERSION})),"$LN - CONFIG+=" 'boost_ldflags%': $(quote_flags $(mason ldflags boost ${BOOST_VERSION})),"$LN +fi + +if [ ! -z ${BOOST_PROGRAM_OPTIONS_VERSION} ]; then + mason install boost_libprogram_options ${BOOST_PROGRAM_OPTIONS_VERSION} + CONFIG+=" 'boost_program_options_static_libs%': $(quote_flags $(mason static_libs boost_libprogram_options ${BOOST_VERSION})),"$LN fi if [ ! -z ${OPENSSL_VERSION} ]; then |