Merge branch 'master' of github.com:mapbox/llmr-native
This commit is contained in:
@@ -1,9 +1,18 @@
|
||||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
set -e -u
|
||||
|
||||
if [ ! `which aclocal` ] || [ ! `which automake` ] || [ ! `which autoconf` ] || [ ! `which glibtool` ]; then
|
||||
echo 'autotools commands not found: run "brew install autoconf automake libtool" before continuing'
|
||||
exit 1
|
||||
UNAME=$(uname -s);
|
||||
|
||||
if [ ${UNAME} = 'Darwin' ]; then
|
||||
if [ ! `which aclocal` ] || [ ! `which automake` ] || [ ! `which autoconf` ] || [ ! `which glibtool` ]; then
|
||||
echo 'autotools commands not found: run "brew install autoconf automake libtool" before continuing'
|
||||
exit 1
|
||||
fi
|
||||
elif [ ${UNAME} = 'Linux' ]; then
|
||||
if [ ! `which aclocal` ] || [ ! `which automake` ] || [ ! `which autoconf` ] || [ ! `which libtool` ]; then
|
||||
echo 'autotools commands not found: run "sudo apt-get install automake libtool xutils-dev" before continuing'
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d 'mapnik-packaging' ]; then
|
||||
@@ -15,6 +24,7 @@ git pull
|
||||
|
||||
export CXX11=true
|
||||
|
||||
if [ ${UNAME} = 'Darwin' ]; then
|
||||
source iPhoneOS.sh
|
||||
if [ ! -f out/build-cpp11-libcpp-armv7/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libcpp-armv7/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
|
||||
@@ -41,7 +51,7 @@ source MacOSX.sh
|
||||
if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libssl.a ] ; then ./scripts/build_openssl.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libcpp-x86_64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi
|
||||
if [ ! -d out/build-cpp11-libcpp-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ ; fi
|
||||
if [ ! -d out/build-cpp11-libcpp-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ `pwd`/../../common/ ; fi
|
||||
echo ' ...done'
|
||||
|
||||
./scripts/make_universal.sh
|
||||
@@ -49,4 +59,21 @@ source MacOSX.sh
|
||||
cd ../../
|
||||
./configure \
|
||||
--pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/lib/pkgconfig \
|
||||
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/
|
||||
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/
|
||||
|
||||
elif [ ${UNAME} = 'Linux' ]; then
|
||||
|
||||
source Linux.sh
|
||||
if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libglfw3.a ] ; then ./scripts/build_glfw.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libssl.a ] ; then ./scripts/build_openssl.sh ; fi
|
||||
if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi
|
||||
if [ ! -d out/build-cpp11-libstdcpp-gcc-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ `pwd`/../../common/ ; fi
|
||||
|
||||
cd ../../
|
||||
./configure \
|
||||
--pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/lib/pkgconfig \
|
||||
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/
|
||||
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user