From 24c00d107d75bf925fca7a4b92397d9bcc19fde9 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 20 Jun 2014 18:53:33 -0700 Subject: [PATCH] disable 64 bit sim build for now - refs #335 --- setup-libraries.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup-libraries.sh b/setup-libraries.sh index d0ed83e18..3642d91ff 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