Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix mailcore build

  • Loading branch information...
commit f75d94f68eae638536bf2c182ba1508b8be27fb6 1 parent 68b3518
@mronge mronge authored
Showing with 76 additions and 76 deletions.
  1. +75 −75 MailCore.xcodeproj/project.pbxproj
  2. +1 −1  libetpan
View
150 MailCore.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
2D538B46119803A6000AB4A2 /* CTSMTPAsyncConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D538B43119803A6000AB4A2 /* CTSMTPAsyncConnection.m */; };
2D538B48119803E2000AB4A2 /* CTSMTPAsyncConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D538B43119803A6000AB4A2 /* CTSMTPAsyncConnection.m */; };
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
+ F80A105917A576910063BCD2 /* libetpan-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F80A105117A573A50063BCD2 /* libetpan-ios.a */; };
F81A8ADC0C03FC3B002F780A /* CTMIME_MessagePart.h in Headers */ = {isa = PBXBuildFile; fileRef = F81A8AD20C03FC3B002F780A /* CTMIME_MessagePart.h */; settings = {ATTRIBUTES = (Public, ); }; };
F81A8ADD0C03FC3B002F780A /* CTMIME_MessagePart.m in Sources */ = {isa = PBXBuildFile; fileRef = F81A8AD30C03FC3B002F780A /* CTMIME_MessagePart.m */; };
F81A8ADE0C03FC3B002F780A /* CTMIME_MultiPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F81A8AD40C03FC3B002F780A /* CTMIME_MultiPart.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -106,13 +107,10 @@
F88CA0CF0BF7A7B00055AC29 /* CTSMTP.m in Sources */ = {isa = PBXBuildFile; fileRef = F88CA0CD0BF7A7B00055AC29 /* CTSMTP.m */; };
F88CA0D40BF7AC0B0055AC29 /* CTESMTP.h in Headers */ = {isa = PBXBuildFile; fileRef = F88CA0D20BF7AC0B0055AC29 /* CTESMTP.h */; settings = {ATTRIBUTES = (Public, ); }; };
F88CA0D50BF7AC0B0055AC29 /* CTESMTP.m in Sources */ = {isa = PBXBuildFile; fileRef = F88CA0D30BF7AC0B0055AC29 /* CTESMTP.m */; };
- F8B245CE144BAC15002B56DA /* libetpan_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B245CA144BABA4002B56DA /* libetpan_ios.a */; };
- F8B6D4F0156EE189008DE9EB /* libetpan_mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B6D4EC156EE173008DE9EB /* libetpan_mac.a */; };
F8DFCF4C15801A5000C01975 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DFCF4B15801A5000C01975 /* SenTestingKit.framework */; };
F8DFCF4E15801A5000C01975 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DFCF4D15801A5000C01975 /* UIKit.framework */; };
F8DFCF5015801A5000C01975 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DFCF4F15801A5000C01975 /* Foundation.framework */; };
F8DFCF5615801A5000C01975 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F8DFCF5415801A5000C01975 /* InfoPlist.strings */; };
- F8DFCF7415801B3500C01975 /* libetpan_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B245CA144BABA4002B56DA /* libetpan_ios.a */; };
F8EC5B0314C37F60006AF4D3 /* CTMIME_HtmlPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F8EC5B0114C37F60006AF4D3 /* CTMIME_HtmlPart.h */; settings = {ATTRIBUTES = (Public, ); }; };
F8EC5B0414C37F60006AF4D3 /* CTMIME_HtmlPart.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EC5B0214C37F60006AF4D3 /* CTMIME_HtmlPart.m */; };
F8EC5B0514C37F60006AF4D3 /* CTMIME_HtmlPart.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EC5B0214C37F60006AF4D3 /* CTMIME_HtmlPart.m */; };
@@ -122,6 +120,41 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
+ F80A104E17A573A50063BCD2 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = C69AB10A10546FE500F32FBD;
+ remoteInfo = "static libetpan";
+ };
+ F80A105017A573A50063BCD2 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = C682E2C015B315EF00BE9DA7;
+ remoteInfo = "libetpan ios";
+ };
+ F80A105317A573AD0063BCD2 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = C682E21815B315EF00BE9DA7;
+ remoteInfo = "libetpan ios";
+ };
+ F80A105517A575D00063BCD2 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = C682E21815B315EF00BE9DA7;
+ remoteInfo = "libetpan ios";
+ };
+ F80A105717A575D80063BCD2 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = C69AB10910546FE500F32FBD;
+ remoteInfo = "static libetpan";
+ };
F88863041581019F0088CF38 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -178,41 +211,6 @@
remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
remoteInfo = libetpan;
};
- F8B245C9144BABA4002B56DA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = F8B2455E144B8C48002B56DA;
- remoteInfo = "static libetpan iOS";
- };
- F8B245CC144BAC04002B56DA /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = F8B244B6144B8C48002B56DA;
- remoteInfo = "static libetpan iOS";
- };
- F8B6D4EB156EE173008DE9EB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = F8B6D4CC156EE0B6008DE9EB;
- remoteInfo = "static libetpan Mac";
- };
- F8B6D4EE156EE183008DE9EB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = F8B6D422156EE0B6008DE9EB;
- remoteInfo = "static libetpan Mac";
- };
- F8DFCF7E15801B8200C01975 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = F8B244B6144B8C48002B56DA;
- remoteInfo = "static libetpan iOS";
- };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@@ -308,7 +306,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- F8B6D4F0156EE189008DE9EB /* libetpan_mac.a in Frameworks */,
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
F8483E4109CE7B9000B80440 /* libssl.dylib in Frameworks */,
F8483E4309CE7B9C00B80440 /* libiconv.dylib in Frameworks */,
@@ -321,7 +318,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- F8B245CE144BAC15002B56DA /* libetpan_ios.a in Frameworks */,
+ F80A105917A576910063BCD2 /* libetpan-ios.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -335,7 +332,6 @@
F8886336158103080088CF38 /* libsasl2.a in Frameworks */,
F888630A1581023C0088CF38 /* libiconv.dylib in Frameworks */,
F8886306158101A50088CF38 /* libmailcore.a in Frameworks */,
- F8DFCF7415801B3500C01975 /* libetpan_ios.a in Frameworks */,
F8DFCF4C15801A5000C01975 /* SenTestingKit.framework in Frameworks */,
F8DFCF4E15801A5000C01975 /* UIKit.framework in Frameworks */,
F8DFCF5015801A5000C01975 /* Foundation.framework in Frameworks */,
@@ -534,8 +530,8 @@
isa = PBXGroup;
children = (
F890D39610CEECD50039817C /* libetpan.framework */,
- F8B245CA144BABA4002B56DA /* libetpan_ios.a */,
- F8B6D4EC156EE173008DE9EB /* libetpan_mac.a */,
+ F80A104F17A573A50063BCD2 /* libetpan.a */,
+ F80A105117A573A50063BCD2 /* libetpan-ios.a */,
);
name = Products;
sourceTree = "<group>";
@@ -640,7 +636,7 @@
buildRules = (
);
dependencies = (
- F8B6D4EF156EE183008DE9EB /* PBXTargetDependency */,
+ F80A105817A575D80063BCD2 /* PBXTargetDependency */,
);
name = MailCore;
productInstallPath = "$(HOME)/Library/Frameworks";
@@ -659,7 +655,7 @@
buildRules = (
);
dependencies = (
- F8B245CD144BAC04002B56DA /* PBXTargetDependency */,
+ F80A105617A575D00063BCD2 /* PBXTargetDependency */,
);
name = "MailCore iOS";
productName = "MailCore iPhone";
@@ -678,11 +674,11 @@
buildRules = (
);
dependencies = (
+ F80A105417A573AD0063BCD2 /* PBXTargetDependency */,
F8886348158103630088CF38 /* PBXTargetDependency */,
F88863441581034C0088CF38 /* PBXTargetDependency */,
F8886335158102FD0088CF38 /* PBXTargetDependency */,
F88863051581019F0088CF38 /* PBXTargetDependency */,
- F8DFCF7F15801B8200C01975 /* PBXTargetDependency */,
);
name = Tests;
productName = Tests;
@@ -731,6 +727,20 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
+ F80A104F17A573A50063BCD2 /* libetpan.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libetpan.a;
+ remoteRef = F80A104E17A573A50063BCD2 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ F80A105117A573A50063BCD2 /* libetpan-ios.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libetpan-ios.a";
+ remoteRef = F80A105017A573A50063BCD2 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
F8886333158102F50088CF38 /* libsasl2.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -759,20 +769,6 @@
remoteRef = F890D39510CEECD50039817C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- F8B245CA144BABA4002B56DA /* libetpan_ios.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libetpan_ios.a;
- remoteRef = F8B245C9144BABA4002B56DA /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- F8B6D4EC156EE173008DE9EB /* libetpan_mac.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libetpan_mac.a;
- remoteRef = F8B6D4EB156EE173008DE9EB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@@ -909,6 +905,21 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
+ F80A105417A573AD0063BCD2 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "libetpan ios";
+ targetProxy = F80A105317A573AD0063BCD2 /* PBXContainerItemProxy */;
+ };
+ F80A105617A575D00063BCD2 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "libetpan ios";
+ targetProxy = F80A105517A575D00063BCD2 /* PBXContainerItemProxy */;
+ };
+ F80A105817A575D80063BCD2 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "static libetpan";
+ targetProxy = F80A105717A575D80063BCD2 /* PBXContainerItemProxy */;
+ };
F88863051581019F0088CF38 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F8618B5610DADB5C00C41188 /* MailCore iOS */;
@@ -929,21 +940,6 @@
name = crypto;
targetProxy = F8886347158103630088CF38 /* PBXContainerItemProxy */;
};
- F8B245CD144BAC04002B56DA /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "static libetpan iOS";
- targetProxy = F8B245CC144BAC04002B56DA /* PBXContainerItemProxy */;
- };
- F8B6D4EF156EE183008DE9EB /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "static libetpan Mac";
- targetProxy = F8B6D4EE156EE183008DE9EB /* PBXContainerItemProxy */;
- };
- F8DFCF7F15801B8200C01975 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "static libetpan iOS";
- targetProxy = F8DFCF7E15801B8200C01975 /* PBXContainerItemProxy */;
- };
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -977,6 +973,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MailCore_Prefix.pch;
+ HEADER_SEARCH_PATHS = "\"$(SRCROOT)/libetpan/build-mac/include/**";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
@@ -1012,6 +1009,7 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MailCore_Prefix.pch;
+ HEADER_SEARCH_PATHS = "\"$(SRCROOT)/libetpan/build-mac/include/**";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
@@ -1070,6 +1068,7 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
+ HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/include/libetpan/**";
ONLY_ACTIVE_ARCH = NO;
PRIVATE_HEADERS_FOLDER_PATH = ../../include/MailCore/Private;
PRODUCT_NAME = mailcore;
@@ -1086,6 +1085,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ HEADER_SEARCH_PATHS = "$BUILT_PRODUCTS_DIR/include/libetpan/**";
ONLY_ACTIVE_ARCH = NO;
PRIVATE_HEADERS_FOLDER_PATH = ../../include/MailCore/Private;
PRODUCT_NAME = mailcore;
2  libetpan
@@ -1 +1 @@
-Subproject commit 9809db133cb66cd174484fb08d07c63ae1f07653
+Subproject commit 6c738db179d73813ebf1c22db8c0ba0984a67b83
Please sign in to comment.
Something went wrong with that request. Please try again.