aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md4
-rwxr-xr-xbuild-mac/mailcore2.xcodeproj/project.pbxproj24
-rw-r--r--example/ios/iOS UI Test/iOS UI Test.xcodeproj/project.pbxproj8
-rw-r--r--src/core/basetypes/MCData.cc1
-rw-r--r--src/core/basetypes/MCString.cc1
-rw-r--r--src/core/renderer/MCDateFormatter.cc1
6 files changed, 15 insertions, 24 deletions
diff --git a/README.md b/README.md
index b997a47c..0f4cb271 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 -licudata -licui18n -licuuc -lxml2 -lsasl2 -liconv -ltidy -lz` `-lc++ -stdlib=libc++ -ObjC`
+ - Set 'Other Linker Flags' under Build Settings: `-lctemplate -letpan -licucore -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 -licudata -licui18n -licuuc -lxml2 -lsasl2 -liconv -ltidy -lz` `-lstdc++ -stdlib=libstdc++ -ObjC`
+ * Set 'Other Linker Flags': `-lctemplate-ios -letpan-ios -licucore -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 b75a25b0..91159176 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/icu4c-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/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/icu4c/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
+ OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/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/icu4c-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/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/icu4c/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
+ OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
};
name = Release;
};
@@ -3121,9 +3121,7 @@
OTHER_LDFLAGS = (
"-lctemplate-ios",
"-letpan-ios",
- "-licudata",
- "-licui18n",
- "-licuuc",
+ "-licucore",
"-lxml2",
"-lsasl2",
"-liconv",
@@ -3157,9 +3155,7 @@
OTHER_LDFLAGS = (
"-lctemplate-ios",
"-letpan-ios",
- "-licudata",
- "-licui18n",
- "-licuuc",
+ "-licucore",
"-lxml2",
"-lsasl2",
"-liconv",
@@ -3220,9 +3216,7 @@
OTHER_LDFLAGS = (
"-lctemplate",
"-letpan",
- "-licudata",
- "-licui18n",
- "-licuuc",
+ "-licucore",
"-lxml2",
"-lssl",
"-lcrypto",
@@ -3252,9 +3246,7 @@
OTHER_LDFLAGS = (
"-lctemplate",
"-letpan",
- "-licudata",
- "-licui18n",
- "-licuuc",
+ "-licucore",
"-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 37556fc4..f3a94272 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,9 +532,7 @@
OTHER_LDFLAGS = (
"-lctemplate-ios",
"-letpan-ios",
- "-licudata",
- "-licui18n",
- "-licuuc",
+ "-licucore",
"-lxml2",
"-lsasl2",
"-liconv",
@@ -558,9 +556,7 @@
OTHER_LDFLAGS = (
"-lctemplate-ios",
"-letpan-ios",
- "-licudata",
- "-licui18n",
- "-licuuc",
+ "-licucore",
"-lxml2",
"-lsasl2",
"-liconv",
diff --git a/src/core/basetypes/MCData.cc b/src/core/basetypes/MCData.cc
index 4cd38839..c92c1122 100644
--- a/src/core/basetypes/MCData.cc
+++ b/src/core/basetypes/MCData.cc
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#define U_DISABLE_RENAMING 1
#include <unicode/ucsdet.h>
#include <libetpan/libetpan.h>
#include <iconv.h>
diff --git a/src/core/basetypes/MCString.cc b/src/core/basetypes/MCString.cc
index 26e2f931..3862cd4f 100644
--- a/src/core/basetypes/MCString.cc
+++ b/src/core/basetypes/MCString.cc
@@ -2,6 +2,7 @@
#include <string.h>
#include <stdlib.h>
+#define U_DISABLE_RENAMING 1
#include <unicode/ustring.h>
#include <unicode/ucnv.h>
#include <unicode/utypes.h>
diff --git a/src/core/renderer/MCDateFormatter.cc b/src/core/renderer/MCDateFormatter.cc
index 2882977d..fc6ce215 100644
--- a/src/core/renderer/MCDateFormatter.cc
+++ b/src/core/renderer/MCDateFormatter.cc
@@ -8,6 +8,7 @@
#include "MCDateFormatter.h"
#include <stdlib.h>
+#define U_DISABLE_RENAMING 1
#include <unicode/udat.h>
#if defined(__APPLE__)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-22 17:47:47 +0000