From 5fc6d09983b41fc02e3601565b0f925e2ae70bc8 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Thu, 16 Jan 2014 21:36:08 -0800 Subject: Revert "Use ICU of the system (fixed #533)" This reverts commit 46d412f1f057cfc0d138f3c16b5033310fe694af. --- README.md | 4 ++-- build-mac/mailcore2.xcodeproj/project.pbxproj | 24 ++++++++++++++-------- .../iOS UI Test.xcodeproj/project.pbxproj | 8 ++++++-- src/core/basetypes/MCData.cc | 1 - src/core/basetypes/MCString.cc | 1 - src/core/renderer/MCDateFormatter.cc | 1 - 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 0f4cb271..b997a47c 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,14 @@ MailCore 2 provides a simple and asynchronous Objective-C API to work with the e - Click the `+` icon and select `MailCore.framework`. * Mac static library - Go to Build Phases from your build target, and under 'Link Binary With Libraries', add `libMailCore.a` and `Security.framework`. - - Set 'Other Linker Flags' under Build Settings: `-lctemplate -letpan -licucore -lxml2 -lsasl2 -liconv -ltidy -lz` `-lc++ -stdlib=libc++ -ObjC` + - Set 'Other Linker Flags' under Build Settings: `-lctemplate -letpan -licudata -licui18n -licuuc -lxml2 -lsasl2 -liconv -ltidy -lz` `-lc++ -stdlib=libc++ -ObjC` - Make sure to use LLVM C++ standard library. In Build Settings, locate 'C++ Standard Library', and select `libc++`. - In Build Phases, add a Target Dependency of `static mailcore2 osx`. 5. **For iOS** - If you're targeting iOS, you have to link against MailCore 2 as a static library: * Add `libMailCore-ios.a` * Add `CFNetwork.framework` * Add `Security.framework` - * Set 'Other Linker Flags': `-lctemplate-ios -letpan-ios -licucore -lxml2 -lsasl2 -liconv -ltidy -lz` `-lstdc++ -stdlib=libstdc++ -ObjC` + * Set 'Other Linker Flags': `-lctemplate-ios -letpan-ios -licudata -licui18n -licuuc -lxml2 -lsasl2 -liconv -ltidy -lz` `-lstdc++ -stdlib=libstdc++ -ObjC` * Make sure to use GNU C++ standard library. In Build Settings, locate 'C++ Standard Library', and select `libstdc++`. * In Build Phases, add a Target Dependency of `static mailcore2 ios`. 6. Profit. diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index 91159176..b75a25b0 100755 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -3000,7 +3000,7 @@ "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)"; "HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)"; IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/icu4c-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" /usr/include/libxml2"; - IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\""; + IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/icu4c-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\""; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../Externals/libetpan/lib\"", "\"$(SRCROOT)/../Externals/icu4c/lib\"", @@ -3012,7 +3012,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/include\" \"$(SRCROOT)/../Externals/icu4c/include\" \"$(SRCROOT)/../Externals/ctemplate/include\" /usr/include/tidy /usr/include/libxml2"; - OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\""; + OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/icu4c/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\""; }; name = Debug; }; @@ -3048,7 +3048,7 @@ "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)"; "HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)"; IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/icu4c-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" /usr/include/libxml2"; - IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\""; + IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/icu4c-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\""; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../Externals/libetpan/lib\"", "\"$(SRCROOT)/../Externals/icu4c/lib\"", @@ -3059,7 +3059,7 @@ "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_LIBRARY_SEARCH_PATHS)"; MACOSX_DEPLOYMENT_TARGET = 10.8; OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/include\" \"$(SRCROOT)/../Externals/icu4c/include\" \"$(SRCROOT)/../Externals/ctemplate/include\" /usr/include/tidy /usr/include/libxml2"; - OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\""; + OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/icu4c/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\""; }; name = Release; }; @@ -3121,7 +3121,9 @@ OTHER_LDFLAGS = ( "-lctemplate-ios", "-letpan-ios", - "-licucore", + "-licudata", + "-licui18n", + "-licuuc", "-lxml2", "-lsasl2", "-liconv", @@ -3155,7 +3157,9 @@ OTHER_LDFLAGS = ( "-lctemplate-ios", "-letpan-ios", - "-licucore", + "-licudata", + "-licui18n", + "-licuuc", "-lxml2", "-lsasl2", "-liconv", @@ -3216,7 +3220,9 @@ OTHER_LDFLAGS = ( "-lctemplate", "-letpan", - "-licucore", + "-licudata", + "-licui18n", + "-licuuc", "-lxml2", "-lssl", "-lcrypto", @@ -3246,7 +3252,9 @@ OTHER_LDFLAGS = ( "-lctemplate", "-letpan", - "-licucore", + "-licudata", + "-licui18n", + "-licuuc", "-lxml2", "-lssl", "-lcrypto", diff --git a/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj b/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj index f3a94272..37556fc4 100644 --- a/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj +++ b/example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj @@ -532,7 +532,9 @@ OTHER_LDFLAGS = ( "-lctemplate-ios", "-letpan-ios", - "-licucore", + "-licudata", + "-licui18n", + "-licuuc", "-lxml2", "-lsasl2", "-liconv", @@ -556,7 +558,9 @@ OTHER_LDFLAGS = ( "-lctemplate-ios", "-letpan-ios", - "-licucore", + "-licudata", + "-licui18n", + "-licuuc", "-lxml2", "-lsasl2", "-liconv", diff --git a/src/core/basetypes/MCData.cc b/src/core/basetypes/MCData.cc index c92c1122..4cd38839 100644 --- a/src/core/basetypes/MCData.cc +++ b/src/core/basetypes/MCData.cc @@ -3,7 +3,6 @@ #include #include #include -#define U_DISABLE_RENAMING 1 #include #include #include diff --git a/src/core/basetypes/MCString.cc b/src/core/basetypes/MCString.cc index 3862cd4f..26e2f931 100644 --- a/src/core/basetypes/MCString.cc +++ b/src/core/basetypes/MCString.cc @@ -2,7 +2,6 @@ #include #include -#define U_DISABLE_RENAMING 1 #include #include #include diff --git a/src/core/renderer/MCDateFormatter.cc b/src/core/renderer/MCDateFormatter.cc index fc6ce215..2882977d 100644 --- a/src/core/renderer/MCDateFormatter.cc +++ b/src/core/renderer/MCDateFormatter.cc @@ -8,7 +8,6 @@ #include "MCDateFormatter.h" #include -#define U_DISABLE_RENAMING 1 #include #if defined(__APPLE__) -- cgit v1.2.3