Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[node] switch to mason-cxx-version branch and fetch geojsonvt-1.1.0-c…
Browse files Browse the repository at this point in the history
…xx binary

print_flags geojsonvt, drop print_build_flags
  • Loading branch information
mikemorris committed Sep 24, 2015
1 parent e88d3d4 commit 74ef39e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .mason
Submodule .mason updated 1 files
+19 −1 mason.sh
19 changes: 1 addition & 18 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,6 @@ 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 {
:
}
Expand Down Expand Up @@ -117,7 +100,7 @@ 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 geojsonvt static_libs cflags ldflags
print_flags variant static_libs cflags ldflags

CONFIG+=" }
Expand Down
2 changes: 1 addition & 1 deletion scripts/linux/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LIBUV_VERSION=0.10.28
ZLIB_VERSION=system
NUNICODE_VERSION=1.5.1
LIBZIP_VERSION=0.11.2
GEOJSONVT_VERSION=1.1.0
GEOJSONVT_VERSION=1.1.0-cxx
VARIANT_VERSION=1.0

function print_opengl_flags {
Expand Down

0 comments on commit 74ef39e

Please sign in to comment.