summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure30
1 files changed, 28 insertions, 2 deletions
diff --git a/configure b/configure
index 6fbaa9f7f8..6d0ac780c3 100755
--- a/configure
+++ b/configure
@@ -15,8 +15,15 @@ function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; }
function info { >&2 echo -e "\033[1m\033[33m$1\033[0m"; }
function warn { >&2 echo -e "\033[1m\033[33m$1\033[0m"; }
-# Install mason
-export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+if [ -d "`pwd`/.git" ]; then
+ info "This build is within a git repository"
+ export MASON_DIR="`pwd`/.mason"
+ export PATH="${MASON_DIR}:${PATH}"
+else
+ info "This build is NOT within a git repository"
+ which mason || abort "You must install mason to build mapbox-gl-native (https://github.com/mapbox/mason)"
+ export MASON_DIR="$(dirname $(readlink $(which mason)))"
+fi
# You can override the function for a particular set of flags by defining a
# print_XXX_flags function in your dependencies.sh file
@@ -37,6 +44,23 @@ function print_flags {
fi
}
+function print_build_flags {
+ local NAME=$1; shift
+ if [ "$(type -t print_${NAME}_flags)" = 'function' ]; then
+ print_${NAME}_flags
+ else
+ local VERSION=`echo "${NAME}_VERSION" | tr "[:lower:]" "[:upper:]"`
+ if [ ! -z ${!VERSION:-} ] ; then
+ mason build ${NAME} ${!VERSION}
+ for FLAGS in "$@" ; do
+ CONFIG+=" '${NAME}_${FLAGS}%': $(quote_flags $(mason ${FLAGS} ${NAME} ${!VERSION})),"$LN
+ done
+ else
+ warn "* Not using ${NAME}"
+ fi
+ fi
+}
+
function print_default_flags {
:
}
@@ -93,6 +117,8 @@ print_flags libuv static_libs cflags ldflags
print_flags zlib static_libs cflags ldflags
print_flags nunicode static_libs cflags ldflags
print_flags libzip static_libs cflags ldflags
+print_build_flags geojsonvt static_libs cflags ldflags
+print_flags variant static_libs cflags ldflags
CONFIG+=" }
}