X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=projects%2Fosx%2FXestiaAddressBook.xcodeproj%2Fproject.pbxproj;h=e337b7c788f78bc2925b3d74464284befa62899b;hp=3a8d59c70e0e8469fd8bc55d1979b8956a177706;hb=3ccffc151c20a3333a73802caf53a9e5c2f95d1a;hpb=262a5698fc00109ca51bc884c469e46fc14321f3 diff --git a/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj b/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj index 3a8d59c..e337b7c 100644 --- a/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj +++ b/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj @@ -7,16 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 4A4891891D972347002EB687 /* carddav2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4891831D96EB50002EB687 /* carddav2.cpp */; }; + 4A48918A1D972347002EB687 /* ConnectionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4891861D96EB6A002EB687 /* ConnectionObject.cpp */; }; + 4A48918E1D9733DA002EB687 /* frmNewAccount-CardDAV2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A48918C1D973121002EB687 /* frmNewAccount-CardDAV2.cpp */; }; + 4A616E961D31A7B000BFF63E /* ContactDataObject-Save.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A616E951D31A7B000BFF63E /* ContactDataObject-Save.cpp */; }; 4A6DA3471CAC049B00A15B3D /* frmActivityMgr-tasks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3441CAC049B00A15B3D /* frmActivityMgr-tasks.cpp */; }; 4A6DA3481CAC049B00A15B3D /* frmActivityMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3451CAC049B00A15B3D /* frmActivityMgr.cpp */; }; 4A6DA34B1CAC04AD00A15B3D /* convert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3491CAC04AD00A15B3D /* convert.cpp */; }; - 4A6DA3531CAC04E100A15B3D /* carddav-connect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA34C1CAC04E100A15B3D /* carddav-connect.cpp */; }; - 4A6DA3541CAC04E100A15B3D /* carddav-contactlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA34D1CAC04E100A15B3D /* carddav-contactlist.cpp */; }; - 4A6DA3551CAC04E100A15B3D /* carddav-defaultadrurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA34E1CAC04E100A15B3D /* carddav-defaultadrurl.cpp */; }; - 4A6DA3561CAC04E100A15B3D /* carddav-processdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA34F1CAC04E100A15B3D /* carddav-processdata.cpp */; }; - 4A6DA3571CAC04E100A15B3D /* carddav-servercontact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3501CAC04E100A15B3D /* carddav-servercontact.cpp */; }; - 4A6DA3581CAC04E100A15B3D /* carddav-serveretag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3511CAC04E100A15B3D /* carddav-serveretag.cpp */; }; - 4A6DA3591CAC04E100A15B3D /* carddav-sslverify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3521CAC04E100A15B3D /* carddav-sslverify.cpp */; }; 4A6DA35D1CAC068900A15B3D /* ContactDataObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA35B1CAC068900A15B3D /* ContactDataObject.cpp */; }; 4A6DA39C1CAC069D00A15B3D /* frmContactEditor-Business.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA35E1CAC069D00A15B3D /* frmContactEditor-Business.cpp */; }; 4A6DA39D1CAC069D00A15B3D /* frmContactEditor-Calendar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA35F1CAC069D00A15B3D /* frmContactEditor-Calendar.cpp */; }; @@ -67,27 +64,11 @@ 4A6DA3D61CAC0A9F00A15B3D /* vcard34conv-v4conv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3D41CAC0A9F00A15B3D /* vcard34conv-v4conv.cpp */; }; 4A6DA3D91CAC0AAC00A15B3D /* XABContactMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3D71CAC0AAC00A15B3D /* XABContactMenu.cpp */; }; 4A6DA3EB1CAC0B8C00A15B3D /* bitmapcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3EA1CAC0B8C00A15B3D /* bitmapcode.cpp */; }; - 4A6DA3EC1CAC0B9F00A15B3D /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; }; - 4A6DA3EF1CAC0FCB00A15B3D /* libwx_osx_cocoa.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 4A6DA3F11CB044EA00A15B3D /* frmNewAccount.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3F01CB044EA00A15B3D /* frmNewAccount.mm */; }; - 4A6DA3F81CB0F54A00A15B3D /* carddav-sslverify.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3F71CB0F54A00A15B3D /* carddav-sslverify.mm */; }; 4A6DA3FE1CB19BDF00A15B3D /* frmActivityMgr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3FD1CB19BDF00A15B3D /* frmActivityMgr.mm */; }; 4A6DA4001CB1CE0400A15B3D /* frmMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3FF1CB1CE0400A15B3D /* frmMain.mm */; }; 4A6DA4021CBD8D9300A15B3D /* frmEditAccount.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA4011CBD8D9200A15B3D /* frmEditAccount.mm */; }; - 4A8259191CF4EA3800E57862 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8259181CF4EA3800E57862 /* libcurl.framework */; }; - 4A82591D1CF4EA4600E57862 /* sfml-audio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */; }; - 4A82591E1CF4EA4600E57862 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591B1CF4EA4600E57862 /* sfml-system.framework */; }; - 4A82591F1CF4EA4600E57862 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591C1CF4EA4600E57862 /* SFML.framework */; }; - 4A8259211CF4EA9700E57862 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8259201CF4EA9700E57862 /* libxml2.dylib */; }; - 4A8259221CF4EC5500E57862 /* sfml-audio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */; }; - 4A8259231CF4EC5500E57862 /* sfml-audio.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A8259241CF4EC5D00E57862 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591B1CF4EA4600E57862 /* sfml-system.framework */; }; - 4A8259251CF4EC5D00E57862 /* sfml-system.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A82591B1CF4EA4600E57862 /* sfml-system.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A8259261CF4EC5D00E57862 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591C1CF4EA4600E57862 /* SFML.framework */; }; - 4A8259271CF4EC5D00E57862 /* SFML.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A82591C1CF4EA4600E57862 /* SFML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A8259281CF4EC5D00E57862 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8259181CF4EA3800E57862 /* libcurl.framework */; }; - 4A8259291CF4EC5D00E57862 /* libcurl.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A8259181CF4EA3800E57862 /* libcurl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A82592A1CF4EC6A00E57862 /* libxml2.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A8259201CF4EA9700E57862 /* libxml2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4A73D5791E74A440001AB708 /* languages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A73D5761E74A06E001AB708 /* languages.cpp */; }; 4A83E33E1B236DD7003294C2 /* AppXestiaAddrBk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3211B236DD7003294C2 /* AppXestiaAddrBk.cpp */; }; 4A83E33F1B236DD7003294C2 /* frmAbout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3261B236DD7003294C2 /* frmAbout.cpp */; }; 4A83E3411B236DD7003294C2 /* frmConflictResolution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E32A1B236DD7003294C2 /* frmConflictResolution.cpp */; }; @@ -99,7 +80,6 @@ 4A83E3471B236DD7003294C2 /* frmPreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3361B236DD7003294C2 /* frmPreferences.cpp */; }; 4A83E3491B236DD7003294C2 /* frmSSLCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E33A1B236DD7003294C2 /* frmSSLCertificate.cpp */; }; 4A83E34A1B236DD7003294C2 /* frmUpdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E33C1B236DD7003294C2 /* frmUpdate.cpp */; }; - 4A83E34E1B236E12003294C2 /* carddav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E34C1B236E12003294C2 /* carddav.cpp */; }; 4A83E36B1B236F21003294C2 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3501B236F21003294C2 /* base64.cpp */; }; 4A83E36C1B236F21003294C2 /* defaults.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3521B236F21003294C2 /* defaults.cpp */; }; 4A83E36D1B236F21003294C2 /* dirs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3541B236F21003294C2 /* dirs.cpp */; }; @@ -131,10 +111,30 @@ 4ABACC9D1B20E968001368B0 /* wxdebug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 4ABACC981B20E968001368B0 /* wxdebug.xcconfig */; }; 4ABACC9E1B20E968001368B0 /* wxrelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 4ABACC991B20E968001368B0 /* wxrelease.xcconfig */; }; 4ABACC9F1B20E968001368B0 /* Info_cocoa.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4ABACC9A1B20E968001368B0 /* Info_cocoa.plist */; }; - 4ABACCAE1B20F6B2001368B0 /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; }; 4ADDA7F51B222936007AD131 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ADDA7F41B222936007AD131 /* main.cpp */; }; - 4ADDA7FE1B235FDB007AD131 /* libwx_osx_cocoa.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 4AE7527A1B24F8B90058ECBE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4AE752791B24F8B90058ECBE /* Images.xcassets */; }; + 4BA8B3921F63CE7D00065071 /* XABPriorityCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA8B38F1F63CA8A00065071 /* XABPriorityCtrl.cpp */; }; + 4BF08A2F1EF6D838004CDF65 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A291EF6D647004CDF65 /* SFML.framework */; }; + 4BF08A301EF6D83A004CDF65 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A281EF6D647004CDF65 /* sfml-system.framework */; }; + 4BF08A311EF6D83D004CDF65 /* sfml-audio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */; }; + 4BF08A3D1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */; }; + 4BF08A3E1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */; }; + 4BF08A401EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; }; + 4BF08A411EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; }; + 4BF08A421EF6FB46004CDF65 /* libxml2.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BF08A431EF6FB54004CDF65 /* sfml-audio.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A441EF6FB56004CDF65 /* sfml-system.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A281EF6D647004CDF65 /* sfml-system.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A451EF6FB57004CDF65 /* SFML.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A291EF6D647004CDF65 /* SFML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A461EF6FB5D004CDF65 /* libxml2.2.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BF08A471EF6FB64004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BF08A4F1EF706C7004CDF65 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */; }; + 4BF08A501EF706DE004CDF65 /* libcurl.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A571EF70AB3004CDF65 /* FLAC.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A511EF70AB3004CDF65 /* FLAC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A581EF70AB3004CDF65 /* ogg.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A521EF70AB3004CDF65 /* ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A591EF70AB3004CDF65 /* OpenAL.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A531EF70AB3004CDF65 /* OpenAL.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A5A1EF70AB3004CDF65 /* vorbis.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A541EF70AB3004CDF65 /* vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A5B1EF70AB3004CDF65 /* vorbisenc.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A551EF70AB3004CDF65 /* vorbisenc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A5C1EF70AB3004CDF65 /* vorbisfile.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A561EF70AB3004CDF65 /* vorbisfile.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -154,7 +154,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4A6DA3EF1CAC0FCB00A15B3D /* libwx_osx_cocoa.dylib in CopyFiles */, + 4BF08A421EF6FB46004CDF65 /* libxml2.2.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -164,12 +164,18 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4A8259271CF4EC5D00E57862 /* SFML.framework in Copy Files */, - 4A8259291CF4EC5D00E57862 /* libcurl.framework in Copy Files */, - 4A8259251CF4EC5D00E57862 /* sfml-system.framework in Copy Files */, - 4ADDA7FE1B235FDB007AD131 /* libwx_osx_cocoa.dylib in Copy Files */, - 4A82592A1CF4EC6A00E57862 /* libxml2.dylib in Copy Files */, - 4A8259231CF4EC5500E57862 /* sfml-audio.framework in Copy Files */, + 4BF08A501EF706DE004CDF65 /* libcurl.framework in Copy Files */, + 4BF08A571EF70AB3004CDF65 /* FLAC.framework in Copy Files */, + 4BF08A581EF70AB3004CDF65 /* ogg.framework in Copy Files */, + 4BF08A591EF70AB3004CDF65 /* OpenAL.framework in Copy Files */, + 4BF08A5A1EF70AB3004CDF65 /* vorbis.framework in Copy Files */, + 4BF08A5B1EF70AB3004CDF65 /* vorbisenc.framework in Copy Files */, + 4BF08A5C1EF70AB3004CDF65 /* vorbisfile.framework in Copy Files */, + 4BF08A431EF6FB54004CDF65 /* sfml-audio.framework in Copy Files */, + 4BF08A471EF6FB64004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Copy Files */, + 4BF08A461EF6FB5D004CDF65 /* libxml2.2.dylib in Copy Files */, + 4BF08A451EF6FB57004CDF65 /* SFML.framework in Copy Files */, + 4BF08A441EF6FB56004CDF65 /* sfml-system.framework in Copy Files */, ); name = "Copy Files"; runOnlyForDeploymentPostprocessing = 0; @@ -177,18 +183,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 4A4891831D96EB50002EB687 /* carddav2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = carddav2.cpp; path = ../../source/carddav2/carddav2.cpp; sourceTree = ""; }; + 4A4891841D96EB50002EB687 /* carddav2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = carddav2.h; path = ../../source/carddav2/carddav2.h; sourceTree = ""; }; + 4A4891861D96EB6A002EB687 /* ConnectionObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConnectionObject.cpp; path = ../../source/connobject/ConnectionObject.cpp; sourceTree = ""; }; + 4A4891871D96EB6A002EB687 /* ConnectionObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectionObject.h; path = ../../source/connobject/ConnectionObject.h; sourceTree = ""; }; + 4A48918C1D973121002EB687 /* frmNewAccount-CardDAV2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "frmNewAccount-CardDAV2.cpp"; path = "../../source/frmNewAccount-CardDAV2.cpp"; sourceTree = ""; }; + 4A616E951D31A7B000BFF63E /* ContactDataObject-Save.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ContactDataObject-Save.cpp"; path = "../../source/contacteditor/cdo/ContactDataObject-Save.cpp"; sourceTree = ""; }; 4A6DA3441CAC049B00A15B3D /* frmActivityMgr-tasks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "frmActivityMgr-tasks.cpp"; path = "../../source/actmgr/frmActivityMgr-tasks.cpp"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA3451CAC049B00A15B3D /* frmActivityMgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = frmActivityMgr.cpp; path = ../../source/actmgr/frmActivityMgr.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA3461CAC049B00A15B3D /* frmActivityMgr.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; indentWidth = 8; name = frmActivityMgr.h; path = ../../source/actmgr/frmActivityMgr.h; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA3491CAC04AD00A15B3D /* convert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = convert.cpp; path = ../../source/convert.cpp; sourceTree = ""; }; 4A6DA34A1CAC04AD00A15B3D /* convert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = convert.h; path = ../../source/convert.h; sourceTree = ""; }; - 4A6DA34C1CAC04E100A15B3D /* carddav-connect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-connect.cpp"; path = "../../source/carddav/carddav-connect.cpp"; sourceTree = ""; tabWidth = 8; }; - 4A6DA34D1CAC04E100A15B3D /* carddav-contactlist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-contactlist.cpp"; path = "../../source/carddav/carddav-contactlist.cpp"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - 4A6DA34E1CAC04E100A15B3D /* carddav-defaultadrurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-defaultadrurl.cpp"; path = "../../source/carddav/carddav-defaultadrurl.cpp"; sourceTree = ""; tabWidth = 8; }; - 4A6DA34F1CAC04E100A15B3D /* carddav-processdata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-processdata.cpp"; path = "../../source/carddav/carddav-processdata.cpp"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - 4A6DA3501CAC04E100A15B3D /* carddav-servercontact.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-servercontact.cpp"; path = "../../source/carddav/carddav-servercontact.cpp"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - 4A6DA3511CAC04E100A15B3D /* carddav-serveretag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-serveretag.cpp"; path = "../../source/carddav/carddav-serveretag.cpp"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - 4A6DA3521CAC04E100A15B3D /* carddav-sslverify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = "carddav-sslverify.cpp"; path = "../../source/carddav/carddav-sslverify.cpp"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA35B1CAC068900A15B3D /* ContactDataObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContactDataObject.cpp; path = ../../source/contacteditor/cdo/ContactDataObject.cpp; sourceTree = ""; }; 4A6DA35C1CAC068900A15B3D /* ContactDataObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContactDataObject.h; path = ../../source/contacteditor/cdo/ContactDataObject.h; sourceTree = ""; }; 4A6DA35E1CAC069D00A15B3D /* frmContactEditor-Business.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "frmContactEditor-Business.cpp"; path = "../../source/contacteditor/frmContactEditor-Business.cpp"; sourceTree = ""; }; @@ -269,15 +274,11 @@ 4A6DA3E21CAC0B3E00A15B3D /* bitmaphelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = bitmaphelper; sourceTree = BUILT_PRODUCTS_DIR; }; 4A6DA3EA1CAC0B8C00A15B3D /* bitmapcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmapcode.cpp; path = ../../source/tools/bitmapcode.cpp; sourceTree = ""; }; 4A6DA3F01CB044EA00A15B3D /* frmNewAccount.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.objcpp; name = frmNewAccount.mm; path = ../../source/frmNewAccount.mm; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - 4A6DA3F71CB0F54A00A15B3D /* carddav-sslverify.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.objcpp; name = "carddav-sslverify.mm"; path = "../../source/carddav/carddav-sslverify.mm"; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA3FD1CB19BDF00A15B3D /* frmActivityMgr.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.objcpp; name = frmActivityMgr.mm; path = ../../source/actmgr/frmActivityMgr.mm; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA3FF1CB1CE0400A15B3D /* frmMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.objcpp; name = frmMain.mm; path = ../../source/frmMain.mm; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A6DA4011CBD8D9200A15B3D /* frmEditAccount.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = frmEditAccount.mm; path = ../../source/frmEditAccount.mm; sourceTree = ""; }; - 4A8259181CF4EA3800E57862 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = "../../../../../Library/curl-7.49.0/libcurl.framework"; sourceTree = ""; }; - 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-audio.framework"; path = "../../../../../Library/SFML-2.3-osx-clang-universal/Frameworks/sfml-audio.framework"; sourceTree = ""; }; - 4A82591B1CF4EA4600E57862 /* sfml-system.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-system.framework"; path = "../../../../../Library/SFML-2.3-osx-clang-universal/Frameworks/sfml-system.framework"; sourceTree = ""; }; - 4A82591C1CF4EA4600E57862 /* SFML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFML.framework; path = "../../../../../Library/SFML-2.3-osx-clang-universal/Frameworks/SFML.framework"; sourceTree = ""; }; - 4A8259201CF4EA9700E57862 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = "../../../../../Library/libxml2-2.9.2/.libs/libxml2.dylib"; sourceTree = ""; }; + 4A73D5761E74A06E001AB708 /* languages.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = languages.cpp; path = ../../source/common/languages.cpp; sourceTree = ""; }; + 4A73D5771E74A06E001AB708 /* languages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = languages.h; path = ../../source/common/languages.h; sourceTree = ""; }; 4A83E3211B236DD7003294C2 /* AppXestiaAddrBk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppXestiaAddrBk.cpp; path = ../../source/AppXestiaAddrBk.cpp; sourceTree = ""; }; 4A83E3221B236DD7003294C2 /* AppXestiaAddrBk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppXestiaAddrBk.h; path = ../../source/AppXestiaAddrBk.h; sourceTree = ""; }; 4A83E3241B236DD7003294C2 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../source/debug.h; sourceTree = ""; }; @@ -302,8 +303,6 @@ 4A83E33B1B236DD7003294C2 /* frmSSLCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = frmSSLCertificate.h; path = ../../source/frmSSLCertificate.h; sourceTree = ""; }; 4A83E33C1B236DD7003294C2 /* frmUpdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = frmUpdate.cpp; path = ../../source/frmUpdate.cpp; sourceTree = ""; }; 4A83E33D1B236DD7003294C2 /* frmUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = frmUpdate.h; path = ../../source/frmUpdate.h; sourceTree = ""; }; - 4A83E34C1B236E12003294C2 /* carddav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = carddav.cpp; path = ../../source/carddav/carddav.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; - 4A83E34D1B236E12003294C2 /* carddav.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.c.h; name = carddav.h; path = ../../source/carddav/carddav.h; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4A83E3501B236F21003294C2 /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../../source/common/base64.cpp; sourceTree = ""; }; 4A83E3511B236F21003294C2 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../../source/common/base64.h; sourceTree = ""; }; 4A83E3521B236F21003294C2 /* defaults.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = defaults.cpp; path = ../../source/common/defaults.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; @@ -362,9 +361,22 @@ 4ABACC991B20E968001368B0 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; 4ABACC9A1B20E968001368B0 /* Info_cocoa.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_cocoa.plist; sourceTree = ""; }; 4ABACCA11B20ECA8001368B0 /* Xestia Address Book.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Xestia Address Book.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwx_osx_cocoa.dylib; path = "/Users/sbrokenshire/Library/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release/libwx_osx_cocoa.dylib"; sourceTree = ""; }; 4ADDA7F41B222936007AD131 /* main.cpp */ = {isa = PBXFileReference; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../source/main.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4AE752791B24F8B90058ECBE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 4BA8B38F1F63CA8A00065071 /* XABPriorityCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XABPriorityCtrl.cpp; path = ../../source/widgets/XABPriorityCtrl.cpp; sourceTree = ""; }; + 4BA8B3901F63CA8A00065071 /* XABPriorityCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XABPriorityCtrl.h; path = ../../source/widgets/XABPriorityCtrl.h; sourceTree = ""; }; + 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-audio.framework"; path = "../../../../Libraries/sfml-audio.framework"; sourceTree = ""; }; + 4BF08A281EF6D647004CDF65 /* sfml-system.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-system.framework"; path = "../../../../Libraries/sfml-system.framework"; sourceTree = ""; }; + 4BF08A291EF6D647004CDF65 /* SFML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFML.framework; path = ../../../../Libraries/SFML.framework; sourceTree = ""; }; + 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_osx_cocoau-3.0.0.3.0.dylib"; path = "../../../../Build/wxWidgets-3.0.3/lib/libwx_osx_cocoau-3.0.0.3.0.dylib"; sourceTree = ""; }; + 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.2.dylib; path = ../../../../Libraries/libxml2.2.dylib; sourceTree = ""; }; + 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = "../../../../Build/curl-7.53.1/libcurl.framework"; sourceTree = ""; }; + 4BF08A511EF70AB3004CDF65 /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/FLAC.framework"; sourceTree = ""; }; + 4BF08A521EF70AB3004CDF65 /* ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ogg.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/ogg.framework"; sourceTree = ""; }; + 4BF08A531EF70AB3004CDF65 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/OpenAL.framework"; sourceTree = ""; }; + 4BF08A541EF70AB3004CDF65 /* vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbis.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/vorbis.framework"; sourceTree = ""; }; + 4BF08A551EF70AB3004CDF65 /* vorbisenc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbisenc.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/vorbisenc.framework"; sourceTree = ""; }; + 4BF08A561EF70AB3004CDF65 /* vorbisfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbisfile.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/vorbisfile.framework"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -372,7 +384,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A6DA3EC1CAC0B9F00A15B3D /* libwx_osx_cocoa.dylib in Frameworks */, + 4BF08A3D1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */, + 4BF08A401EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -380,25 +393,30 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A8259261CF4EC5D00E57862 /* SFML.framework in Frameworks */, - 4A8259281CF4EC5D00E57862 /* libcurl.framework in Frameworks */, - 4A8259241CF4EC5D00E57862 /* sfml-system.framework in Frameworks */, - 4A82591D1CF4EA4600E57862 /* sfml-audio.framework in Frameworks */, - 4A8259221CF4EC5500E57862 /* sfml-audio.framework in Frameworks */, - 4A8259191CF4EA3800E57862 /* libcurl.framework in Frameworks */, - 4A8259211CF4EA9700E57862 /* libxml2.dylib in Frameworks */, + 4BF08A4F1EF706C7004CDF65 /* libcurl.framework in Frameworks */, + 4BF08A301EF6D83A004CDF65 /* sfml-system.framework in Frameworks */, + 4BF08A2F1EF6D838004CDF65 /* SFML.framework in Frameworks */, 4A96DD751B93D5D400FAD2CA /* SecurityInterface.framework in Frameworks */, + 4BF08A411EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */, + 4BF08A3E1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */, + 4BF08A311EF6D83D004CDF65 /* sfml-audio.framework in Frameworks */, 4A98DD431B7E57FC0002E872 /* Security.framework in Frameworks */, 4A98DD3B1B6ABEC80002E872 /* CoreFoundation.framework in Frameworks */, - 4A82591E1CF4EA4600E57862 /* sfml-system.framework in Frameworks */, - 4A82591F1CF4EA4600E57862 /* SFML.framework in Frameworks */, - 4ABACCAE1B20F6B2001368B0 /* libwx_osx_cocoa.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4A4891821D96EAAD002EB687 /* connobject */ = { + isa = PBXGroup; + children = ( + 4A4891861D96EB6A002EB687 /* ConnectionObject.cpp */, + 4A4891871D96EB6A002EB687 /* ConnectionObject.h */, + ); + name = connobject; + sourceTree = ""; + }; 4A6DA3431CAC047600A15B3D /* actmgr */ = { isa = PBXGroup; children = ( @@ -415,6 +433,7 @@ children = ( 4A6DA35B1CAC068900A15B3D /* ContactDataObject.cpp */, 4A6DA35C1CAC068900A15B3D /* ContactDataObject.h */, + 4A616E951D31A7B000BFF63E /* ContactDataObject-Save.cpp */, ); name = cdo; sourceTree = ""; @@ -430,15 +449,21 @@ 4A6DA3F21CB04F9400A15B3D /* Frameworks & Libraries */ = { isa = PBXGroup; children = ( - 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */, - 4A82591B1CF4EA4600E57862 /* sfml-system.framework */, - 4A82591C1CF4EA4600E57862 /* SFML.framework */, - 4A8259181CF4EA3800E57862 /* libcurl.framework */, + 4BF08A511EF70AB3004CDF65 /* FLAC.framework */, + 4BF08A521EF70AB3004CDF65 /* ogg.framework */, + 4BF08A531EF70AB3004CDF65 /* OpenAL.framework */, + 4BF08A541EF70AB3004CDF65 /* vorbis.framework */, + 4BF08A551EF70AB3004CDF65 /* vorbisenc.framework */, + 4BF08A561EF70AB3004CDF65 /* vorbisfile.framework */, + 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */, + 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */, + 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */, + 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */, + 4BF08A281EF6D647004CDF65 /* sfml-system.framework */, + 4BF08A291EF6D647004CDF65 /* SFML.framework */, 4A96DD741B93D5D400FAD2CA /* SecurityInterface.framework */, 4A98DD421B7E57FC0002E872 /* Security.framework */, 4A98DD3A1B6ABEC80002E872 /* CoreFoundation.framework */, - 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */, - 4A8259201CF4EA9700E57862 /* libxml2.dylib */, ); name = "Frameworks & Libraries"; sourceTree = ""; @@ -448,8 +473,9 @@ children = ( 4A6DA3431CAC047600A15B3D /* actmgr */, 4A83E3CB1B2370CE003294C2 /* search */, - 4A83E34B1B236E01003294C2 /* carddav */, + 4A83E34B1B236E01003294C2 /* carddav2 */, 4A83E34F1B236F06003294C2 /* common */, + 4A4891821D96EAAD002EB687 /* connobject */, 4A83E3781B236F54003294C2 /* contacteditor */, 4A83E3C01B237022003294C2 /* export */, 4A83E3CA1B2370A3003294C2 /* import */, @@ -478,6 +504,7 @@ 4A83E3341B236DD7003294C2 /* frmNewAccount.cpp */, 4A83E3351B236DD7003294C2 /* frmNewAccount.h */, 4A6DA3F01CB044EA00A15B3D /* frmNewAccount.mm */, + 4A48918C1D973121002EB687 /* frmNewAccount-CardDAV2.cpp */, 4A83E3361B236DD7003294C2 /* frmPreferences.cpp */, 4A83E3371B236DD7003294C2 /* frmPreferences.h */, 4A83E33A1B236DD7003294C2 /* frmSSLCertificate.cpp */, @@ -490,26 +517,20 @@ name = src; sourceTree = ""; }; - 4A83E34B1B236E01003294C2 /* carddav */ = { + 4A83E34B1B236E01003294C2 /* carddav2 */ = { isa = PBXGroup; children = ( - 4A83E34C1B236E12003294C2 /* carddav.cpp */, - 4A83E34D1B236E12003294C2 /* carddav.h */, - 4A6DA34C1CAC04E100A15B3D /* carddav-connect.cpp */, - 4A6DA34D1CAC04E100A15B3D /* carddav-contactlist.cpp */, - 4A6DA34E1CAC04E100A15B3D /* carddav-defaultadrurl.cpp */, - 4A6DA34F1CAC04E100A15B3D /* carddav-processdata.cpp */, - 4A6DA3501CAC04E100A15B3D /* carddav-servercontact.cpp */, - 4A6DA3511CAC04E100A15B3D /* carddav-serveretag.cpp */, - 4A6DA3521CAC04E100A15B3D /* carddav-sslverify.cpp */, - 4A6DA3F71CB0F54A00A15B3D /* carddav-sslverify.mm */, + 4A4891831D96EB50002EB687 /* carddav2.cpp */, + 4A4891841D96EB50002EB687 /* carddav2.h */, ); - name = carddav; + name = carddav2; sourceTree = ""; }; 4A83E34F1B236F06003294C2 /* common */ = { isa = PBXGroup; children = ( + 4A73D5761E74A06E001AB708 /* languages.cpp */, + 4A73D5771E74A06E001AB708 /* languages.h */, 4A83E3501B236F21003294C2 /* base64.cpp */, 4A83E3511B236F21003294C2 /* base64.h */, 4A83E3521B236F21003294C2 /* defaults.cpp */, @@ -674,6 +695,8 @@ 4A83E3D91B237162003294C2 /* widgets */ = { isa = PBXGroup; children = ( + 4BA8B38F1F63CA8A00065071 /* XABPriorityCtrl.cpp */, + 4BA8B3901F63CA8A00065071 /* XABPriorityCtrl.h */, 4A83E3DA1B237178003294C2 /* XABAccountView.cpp */, 4A83E3DB1B237178003294C2 /* XABAccountView.h */, 4A6DA3D71CAC0AAC00A15B3D /* XABContactMenu.cpp */, @@ -750,6 +773,7 @@ }; 4ABACC681B20E7AE001368B0 = { CreatedOnToolsVersion = 6.3.2; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.Mac = { enabled = 0; @@ -805,6 +829,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 4A48918E1D9733DA002EB687 /* frmNewAccount-CardDAV2.cpp in Sources */, + 4A4891891D972347002EB687 /* carddav2.cpp in Sources */, + 4A48918A1D972347002EB687 /* ConnectionObject.cpp in Sources */, 4A6DA3A81CAC069D00A15B3D /* frmContactEditor-Picture.cpp in Sources */, 4A6DA39E1CAC069D00A15B3D /* frmContactEditor-Category.cpp in Sources */, 4A6DA4001CB1CE0400A15B3D /* frmMain.mm in Sources */, @@ -817,7 +844,6 @@ 4A83E3D81B237157003294C2 /* vcard34conv.cpp in Sources */, 4A83E3771B236F21003294C2 /* uuid.cpp in Sources */, 4A6DA3BE1CAC069D00A15B3D /* frmContactEditorTimezones.cpp in Sources */, - 4A6DA3531CAC04E100A15B3D /* carddav-connect.cpp in Sources */, 4A6DA3A71CAC069D00A15B3D /* frmContactEditor-Other.cpp in Sources */, 4A83E3DC1B237178003294C2 /* XABAccountView.cpp in Sources */, 4A6DA3AF1CAC069D00A15B3D /* frmContactEditorCategory.cpp in Sources */, @@ -825,6 +851,7 @@ 4A6DA35D1CAC068900A15B3D /* ContactDataObject.cpp in Sources */, 4A83E36F1B236F21003294C2 /* events.cpp in Sources */, 4A83E3731B236F21003294C2 /* preferences.cpp in Sources */, + 4A616E961D31A7B000BFF63E /* ContactDataObject-Save.cpp in Sources */, 4A83E36B1B236F21003294C2 /* base64.cpp in Sources */, 4A6DA3C11CAC069D00A15B3D /* frmContactEditorWebsites.cpp in Sources */, 4A6DA39D1CAC069D00A15B3D /* frmContactEditor-Calendar.cpp in Sources */, @@ -846,7 +873,7 @@ 4A6DA3471CAC049B00A15B3D /* frmActivityMgr-tasks.cpp in Sources */, 4A6DA3B01CAC069D00A15B3D /* frmContactEditorEmail.cpp in Sources */, 4A83E3471B236DD7003294C2 /* frmPreferences.cpp in Sources */, - 4A6DA3561CAC04E100A15B3D /* carddav-processdata.cpp in Sources */, + 4BA8B3921F63CE7D00065071 /* XABPriorityCtrl.cpp in Sources */, 4A6DA3AE1CAC069D00A15B3D /* frmContactEditorCalAdr.cpp in Sources */, 4A6DA3AA1CAC069D00A15B3D /* frmContactEditor-Save.cpp in Sources */, 4A6DA3481CAC049B00A15B3D /* frmActivityMgr.cpp in Sources */, @@ -867,16 +894,12 @@ 4A6DA3BA1CAC069D00A15B3D /* frmContactEditorRelated.cpp in Sources */, 4A6DA3B91CAC069D00A15B3D /* frmContactEditorPicture.cpp in Sources */, 4A6DA39C1CAC069D00A15B3D /* frmContactEditor-Business.cpp in Sources */, - 4A6DA3541CAC04E100A15B3D /* carddav-contactlist.cpp in Sources */, - 4A6DA3591CAC04E100A15B3D /* carddav-sslverify.cpp in Sources */, 4A83E3F01B238813003294C2 /* import.cpp in Sources */, 4A6DA3D91CAC0AAC00A15B3D /* XABContactMenu.cpp in Sources */, 4A6DA3A11CAC069D00A15B3D /* frmContactEditor-Groups.cpp in Sources */, - 4A83E34E1B236E12003294C2 /* carddav.cpp in Sources */, 4ADDA7F51B222936007AD131 /* main.cpp in Sources */, 4A6DA3D11CAC0A8900A15B3D /* frmSearchAccounts.cpp in Sources */, 4A83E3751B236F21003294C2 /* textprocessing.cpp in Sources */, - 4A6DA3F81CB0F54A00A15B3D /* carddav-sslverify.mm in Sources */, 4A83E3491B236DD7003294C2 /* frmSSLCertificate.cpp in Sources */, 4A83E36D1B236F21003294C2 /* dirs.cpp in Sources */, 4A83E3701B236F21003294C2 /* filename.cpp in Sources */, @@ -893,10 +916,8 @@ 4A83E3C71B237033003294C2 /* export-vcard3.cpp in Sources */, 4A6DA3BB1CAC069D00A15B3D /* frmContactEditorRoles.cpp in Sources */, 4A6DA3F11CB044EA00A15B3D /* frmNewAccount.mm in Sources */, - 4A6DA3581CAC04E100A15B3D /* carddav-serveretag.cpp in Sources */, 4A6DA3AC1CAC069D00A15B3D /* frmContactEditor.cpp in Sources */, 4A83E3411B236DD7003294C2 /* frmConflictResolution.cpp in Sources */, - 4A6DA3551CAC04E100A15B3D /* carddav-defaultadrurl.cpp in Sources */, 4A83E3461B236DD7003294C2 /* frmNewAccount.cpp in Sources */, 4A83E3C91B237033003294C2 /* export.cpp in Sources */, 4A83E3421B236DD7003294C2 /* frmContact.cpp in Sources */, @@ -904,8 +925,8 @@ 4A83E3441B236DD7003294C2 /* frmInvalidSSLCertificate.cpp in Sources */, 4A83E3711B236F21003294C2 /* getcontactinfo.cpp in Sources */, 4A83E3741B236F21003294C2 /* svrblist.cpp in Sources */, - 4A6DA3571CAC04E100A15B3D /* carddav-servercontact.cpp in Sources */, 4A6DA3A31CAC069D00A15B3D /* frmContactEditor-Init.cpp in Sources */, + 4A73D5791E74A440001AB708 /* languages.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -923,9 +944,10 @@ 4A6DA3E71CAC0B3E00A15B3D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LIBRARY = "compiler-default"; DEPLOYMENT_LOCATION = NO; ENABLE_TESTABILITY = YES; GCC_PREFIX_HEADER = "$(WXROOT)/include/wx/wxprec.h"; @@ -950,20 +972,24 @@ "$(WXROOT)/build/osx/setup/cocoa/include", "$(WXROOT)/samples/minimal", ); - LIBRARY_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + LIBRARY_SEARCH_PATHS = ( + "$(WXROOT)/lib", + /Users/kiri/Libraries, + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(TARGET_NAME)"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Debug; }; 4A6DA3E81CAC0B3E00A15B3D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LIBRARY = "compiler-default"; DEPLOYMENT_LOCATION = NO; GCC_PREFIX_HEADER = "$(WXROOT)/include/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -987,11 +1013,14 @@ "$(WXROOT)/build/osx/setup/cocoa/include", "$(WXROOT)/samples/minimal", ); - LIBRARY_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + LIBRARY_SEARCH_PATHS = ( + "$(WXROOT)/lib", + /Users/kiri/Libraries, + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(TARGET_NAME)"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Release; }; @@ -1014,7 +1043,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1036,7 +1064,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_VERSION = ""; + PRODUCT_VERSION = 0.19; SDKROOT = macosx; }; name = Debug; @@ -1060,7 +1088,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -1076,7 +1103,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_VERSION = ""; + PRODUCT_VERSION = 0.19; SDKROOT = macosx; }; name = Release; @@ -1091,12 +1118,11 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CODE_SIGN_ENTITLEMENTS = ""; - CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; - CURL_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/curl-7.49.0/"; + CURL_FRAMEWORKPATH = "/Users/kiri/Build/curl-7.53.1/"; FRAMEWORK_SEARCH_PATHS = ( - "$(SFML_FRAMEWORKPATH)/Frameworks", - "$(CURL_FRAMEWORKPATH)", + "$(SFML_FRAMEWORKPATH)/**", + "$(CURL_FRAMEWORKPATH)/**", "$(inherited)", "$(PROJECT_DIR)", ); @@ -1121,17 +1147,17 @@ "$(WXROOT)/include", "$(WXROOT)/build/osx/setup/cocoa/include", "$(WXROOT)/samples/minimal", - "$(LIBXML2_PATH)/include", + "$(LIBXML2_PATH)/include/", "$(inherited)", ); INFOPLIST_FILE = "$(SRCROOT)/Info_cocoa.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release", - "($LIBXML2_PATH)/.libs", + "$(WXROOT)/lib", + "$(LIBXML2_PATH)/.libs", ); - LIBXML2_PATH = "/Volumes/XestiaDevel/Library/libxml2-2.9.2/"; + LIBXML2_PATH = "/Users/kiri/Build/libxml2-2.9.4"; MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1157,10 +1183,10 @@ "-lz", ); PRODUCT_NAME = "Xestia Address Book"; - PRODUCT_VERSION = 0.13; - SFML_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/SFML-2.3-osx-clang-universal/"; + PRODUCT_VERSION = 0.19; + SFML_FRAMEWORKPATH = "/Users/kiri/Build/SFML-2.4.2-build/"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Debug; }; @@ -1174,12 +1200,11 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CODE_SIGN_ENTITLEMENTS = ""; - CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; - CURL_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/curl-7.49.0/"; + CURL_FRAMEWORKPATH = "/Users/kiri/Build/curl-7.53.1/"; FRAMEWORK_SEARCH_PATHS = ( - "$(SFML_FRAMEWORKPATH)/Frameworks", - "$(CURL_FRAMEWORKPATH)", + "$(SFML_FRAMEWORKPATH)/**", + "$(CURL_FRAMEWORKPATH)/**", "$(inherited)", "$(PROJECT_DIR)", ); @@ -1204,17 +1229,17 @@ "$(WXROOT)/include", "$(WXROOT)/build/osx/setup/cocoa/include", "$(WXROOT)/samples/minimal", - "$(LIBXML2_PATH)/include", + "$(LIBXML2_PATH)/include/", "$(inherited)", ); INFOPLIST_FILE = "$(SRCROOT)/Info_cocoa.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release", - "($LIBXML2_PATH)/.libs", + "$(WXROOT)/lib", + "$(LIBXML2_PATH)/.libs", ); - LIBXML2_PATH = "/Volumes/XestiaDevel/Library/libxml2-2.9.2/"; + LIBXML2_PATH = "/Users/kiri/Build/libxml2-2.9.4"; MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1240,10 +1265,10 @@ "-lz", ); PRODUCT_NAME = "Xestia Address Book"; - PRODUCT_VERSION = 0.13; - SFML_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/SFML-2.3-osx-clang-universal/"; + PRODUCT_VERSION = 0.19; + SFML_FRAMEWORKPATH = "/Users/kiri/Build/SFML-2.4.2-build/"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Release; };