diff options
author | Dane Springmeyer <dane@mapbox.com> | 2014-06-20 18:53:33 -0700 |
---|---|---|
committer | Dane Springmeyer <dane@mapbox.com> | 2014-06-20 18:53:37 -0700 |
commit | 24c00d107d75bf925fca7a4b92397d9bcc19fde9 (patch) | |
tree | c26c55f55f114d65af838866973cd81f42d71b4e | |
parent | 51af61c350b587ce96701a747f928a0a7c567d0a (diff) | |
download | qtlocation-mapboxgl-24c00d107d75bf925fca7a4b92397d9bcc19fde9.tar.gz |
disable 64 bit sim build for now - refs #335
-rwxr-xr-x | setup-libraries.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/setup-libraries.sh b/setup-libraries.sh index d0ed83e182..3642d91ff4 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -70,10 +70,12 @@ source iPhoneSimulator.sh if [ ! -f out/build-cpp11-libcpp-i386-iphonesimulator/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi echo ' ...done' -source iPhoneSimulator64.sh - if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi - if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi - echo ' ...done' +# libs conflict with MacOSX build +# TODO: need to break apart targets +#source iPhoneSimulator64.sh +# if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi +# if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi +# echo ' ...done' source MacOSX.sh if [ ! -f out/build-cpp11-libcpp-x86_64-macosx/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi |