diff options
| -rwxr-xr-x | configure | 36 |
1 files changed, 22 insertions, 14 deletions
@@ -19,21 +19,22 @@ trap finish EXIT case ${MASON_PLATFORM} in 'ios') - SQLITE_VERSION=system - LIBUV_VERSION=0.10.28 - ZLIB_VERSION=system - BOOST_VERSION=system - ;; + SQLITE_VERSION=system + LIBUV_VERSION=0.10.28 + ZLIB_VERSION=system + BOOST_VERSION=system + ;; *) - GLFW_VERSION=a21f2377 - SQLITE_VERSION=system - LIBPNG_VERSION=1.6.13 - LIBCURL_VERSION=system - LIBUV_VERSION=0.10.28 - ZLIB_VERSION=system - BOOST_VERSION=system - NUNICODE_VERSION=1.4 - ;; + GLFW_VERSION=a21f2377 + SQLITE_VERSION=system + LIBPNG_VERSION=1.6.13 + LIBJPEG_VERSION=v8d + LIBCURL_VERSION=system + LIBUV_VERSION=0.10.28 + ZLIB_VERSION=system + BOOST_VERSION=system + NUNICODE_VERSION=1.4 + ;; esac function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; } @@ -91,6 +92,13 @@ if [ ! -z ${LIBPNG_VERSION} ]; then CONFIG+=" 'png_ldflags': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),"$LN fi +if [ ! -z ${LIBJPEG_VERSION} ]; then + mason install jpeg ${LIBJPEG_VERSION} + CONFIG+=" 'jpeg_static_libs': $(quote_flags $(mason static_libs jpeg ${LIBJPEG_VERSION})),"$LN + CONFIG+=" 'jpeg_cflags': $(quote_flags $(mason cflags jpeg ${LIBJPEG_VERSION})),"$LN + CONFIG+=" 'jpeg_ldflags': $(quote_flags $(mason ldflags jpeg ${LIBJPEG_VERSION})),"$LN +fi + if [ ! -z ${SQLITE_VERSION} ]; then mason install sqlite ${SQLITE_VERSION} CONFIG+=" 'sqlite3_static_libs': $(quote_flags $(mason static_libs sqlite ${SQLITE_VERSION})),"$LN |