diff options
| -rwxr-xr-x | build-mac/mailcore2.xcodeproj/project.pbxproj | 8 | ||||
| -rwxr-xr-x | scripts/prepare-libetpan-ios.sh | 6 | ||||
| -rwxr-xr-x | scripts/prepare-tidy-ios.sh | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index c34b47a1..b1a6bd7d 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -3104,7 +3104,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libstdc++"; DEAD_CODE_STRIPPING = NO; @@ -3113,7 +3113,7 @@ PRODUCT_NAME = "MailCore-ios"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - VALID_ARCHS = "armv7 armv7s i386 x86_64"; + VALID_ARCHS = "armv7 armv7s i386 x86_64 arm64"; }; name = Debug; }; @@ -3121,7 +3121,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libstdc++"; DEAD_CODE_STRIPPING = NO; @@ -3130,7 +3130,7 @@ PRODUCT_NAME = "MailCore-ios"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - VALID_ARCHS = "armv7 armv7s i386 x86_64"; + VALID_ARCHS = "armv7 armv7s i386 x86_64 arm64"; }; name = Release; }; diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh index e8b9494c..a0facd18 100755 --- a/scripts/prepare-libetpan-ios.sh +++ b/scripts/prepare-libetpan-ios.sh @@ -9,8 +9,8 @@ else exit 1 fi -url="https://github.com/dinhviethoa/libetpan.git" -rev=df052805726c7825ea7dce127b5df501cbf62238 +url="https://github.com/mronge/libetpan.git" +rev=1d93aeef6d9a0bde6c2382926c5b6829d3872900 pushd `dirname $0` > /dev/null scriptpath=`pwd` @@ -71,7 +71,7 @@ echo building libetpan cd "$srcdir/libetpan/build-mac" sdk="iphoneos$sdkversion" -archs="armv7 armv7s" +archs="armv7 armv7s arm64" echo building $sdk xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs" if test x$? != x0 ; then diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh index f48f9726..045613ec 100755 --- a/scripts/prepare-tidy-ios.sh +++ b/scripts/prepare-tidy-ios.sh @@ -62,7 +62,7 @@ echo building tidy-html5 cd "$srcdir/tidy-html5/build-mac" sdk="iphoneos$sdkversion" -archs="armv7 armv7s" +archs="armv7 armv7s arm64" echo building $sdk xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs" >/dev/null 2>&1 if test x$? != x0 ; then |