From f754db4c7a77d2991d77742409150796f1e97018 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 4 Feb 2014 13:29:52 -0800 Subject: [PATCH] fix include directory, remove tabs, get latest from github --- ios/setup_libpng.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ios/setup_libpng.sh b/ios/setup_libpng.sh index df012d97a..eb64a304c 100755 --- a/ios/setup_libpng.sh +++ b/ios/setup_libpng.sh @@ -4,14 +4,15 @@ if [ ! -d 'mapnik-packaging' ]; then git clone --depth=0 https://github.com/mapnik/mapnik-packaging.git fi cd mapnik-packaging/osx/ +git pull export CXX11=true (source iPhoneSimulator.sh; ./scripts/build_png.sh; \ - source MacOSX.sh; ./scripts/build_png.sh; \ - source iPhoneOS.sh; ./scripts/build_png.sh; \ - source iPhoneOSs.sh; ./scripts/build_png.sh; \ - source iPhoneOS64.sh; ./scripts/build_png.sh; \ + source MacOSX.sh; ./scripts/build_png.sh; \ + source iPhoneOS.sh; ./scripts/build_png.sh; \ + source iPhoneOSs.sh; ./scripts/build_png.sh; \ + source iPhoneOS64.sh; ./scripts/build_png.sh; \ ./scripts/make_universal.sh) export UNIVERSAL_LIBS=`pwd`/out/build-cpp11-libcpp-universal/ -export PNG_INCLUDES=`pwd`/out/build-cpp11-libcpp-i386/ +export PNG_INCLUDES=`pwd`/out/build-cpp11-libcpp-i386/include cd ../../ ./configure --png-libpath=${UNIVERSAL_LIBS} --png-includes=${PNG_INCLUDES} \ No newline at end of file