summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorartemp <artem@mapnik.org>2014-10-31 14:43:46 -0400
committerartemp <artem@mapnik.org>2014-10-31 14:43:46 -0400
commitea2416c7cf0bc1bc745dd4d219057d9d979a2dbe (patch)
tree2f70fa896d57247e82890bc8b409b3769ce31a78 /configure
parent15cf30652cf6b6d9a52bc6eb9815fd2e19ab78e3 (diff)
downloadqtlocation-mapboxgl-ea2416c7cf0bc1bc745dd4d219057d9d979a2dbe.tar.gz
use nunicode for proper to_upper/to_lower string conversions
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure38
1 files changed, 24 insertions, 14 deletions
diff --git a/configure b/configure
index afb94d4795..6894a7b275 100755
--- a/configure
+++ b/configure
@@ -37,21 +37,23 @@ alias mason='~/.mason/mason'
case $MASON_PLATFORM in
'ios')
- SQLITE_VERSION=system
- LIBPNG_VERSION=1.6.13
- LIBUV_VERSION=0.10.28
- ZLIB_VERSION=system
- BOOST_VERSION=system
- ;;
+ SQLITE_VERSION=system
+ LIBPNG_VERSION=1.6.13
+ LIBUV_VERSION=0.10.28
+ ZLIB_VERSION=system
+ BOOST_VERSION=system
+ NUNICODE_VERSION=1.4
+ ;;
*)
- GLFW_VERSION=a21f2377
- SQLITE_VERSION=system
- LIBPNG_VERSION=system
- LIBCURL_VERSION=system
- LIBUV_VERSION=0.10.28
- ZLIB_VERSION=system
- BOOST_VERSION=system
- ;;
+ GLFW_VERSION=a21f2377
+ SQLITE_VERSION=system
+ LIBPNG_VERSION=system
+ 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; }
@@ -138,6 +140,14 @@ if [ ! -z ${ZLIB_VERSION} ]; then
CONFIG+=" 'zlib_ldflags': $(quote_flags $(mason ldflags zlib ${ZLIB_VERSION})),"$LN
fi
+if [ ! -z ${NUNICODE_VERSION} ]; then
+ mason install nunicode ${NUNICODE_VERSION}
+ CONFIG+=" 'nu_static_libs': $(quote_flags $(mason static_libs nunicode ${NUNICODE_VERSION})),"$LN
+ CONFIG+=" 'nu_cflags': $(quote_flags $(mason cflags nunicode ${NUNICODE_VERSION})),"$LN
+ CONFIG+=" 'nu_ldflags': $(quote_flags $(mason ldflags nunicode ${NUNICODE_VERSION})),"$LN
+fi
+
+
CONFIG+=" }
}
"