diff --git a/IRCClient.xcodeproj/project.pbxproj b/IRCClient.xcodeproj/project.pbxproj index 5fd08bf..ccb78e6 100644 --- a/IRCClient.xcodeproj/project.pbxproj +++ b/IRCClient.xcodeproj/project.pbxproj @@ -10,14 +10,18 @@ 8657E6DD1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 8657E6DB1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.h */; }; 8657E6DE1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8657E6DC1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.m */; }; 8657E6E21C2B55B900BD4E50 /* IRC_Numerics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8657E6E11C2B55B900BD4E50 /* IRC_Numerics.plist */; }; + 86769D6D1C94DC5300B86A72 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D5B1C94DC5300B86A72 /* config.h */; }; + 86769D6E1C94DC5300B86A72 /* dcc.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D5C1C94DC5300B86A72 /* dcc.h */; }; + 86769D6F1C94DC5300B86A72 /* libirc_errors.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D5D1C94DC5300B86A72 /* libirc_errors.h */; }; + 86769D701C94DC5300B86A72 /* libirc_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D5E1C94DC5300B86A72 /* libirc_events.h */; }; + 86769D711C94DC5300B86A72 /* libirc_options.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D5F1C94DC5300B86A72 /* libirc_options.h */; }; + 86769D721C94DC5300B86A72 /* libirc_rfcnumeric.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D601C94DC5300B86A72 /* libirc_rfcnumeric.h */; }; + 86769D731C94DC5300B86A72 /* libircclient.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D611C94DC5300B86A72 /* libircclient.h */; }; + 86769D741C94DC5300B86A72 /* params.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D621C94DC5300B86A72 /* params.h */; }; + 86769D751C94DC5300B86A72 /* session.h in Headers */ = {isa = PBXBuildFile; fileRef = 86769D631C94DC5300B86A72 /* session.h */; }; + 86769D791C94DC5300B86A72 /* libircclient.c in Sources */ = {isa = PBXBuildFile; fileRef = 86769D681C94DC5300B86A72 /* libircclient.c */; }; 868374A91C24E774005B97E5 /* IRCClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 868374A81C24E774005B97E5 /* IRCClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; 86B6232C1C21FD7C00D6E3AF /* README in Resources */ = {isa = PBXBuildFile; fileRef = 86B6232B1C21FD7C00D6E3AF /* README */; }; - 86CEFEEB1C2BC9A6000DB861 /* libircclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86CEFEEA1C2BC9A6000DB861 /* libircclient.a */; }; - 86CEFEED1C2BC9BC000DB861 /* libirc_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 86CEFEEC1C2BC9BC000DB861 /* libirc_events.h */; }; - 86D784A61C24C39F00C7458D /* libirc_errors.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A01C24C39F00C7458D /* libirc_errors.h */; }; - 86D784A81C24C39F00C7458D /* libirc_options.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A21C24C39F00C7458D /* libirc_options.h */; }; - 86D784A91C24C39F00C7458D /* libirc_rfcnumeric.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A31C24C39F00C7458D /* libirc_rfcnumeric.h */; }; - 86D784AB1C24C39F00C7458D /* libircclient.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A51C24C39F00C7458D /* libircclient.h */; }; 86F2EFF81C21F81900B033A4 /* IRCClientChannel_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F2EFF11C21F81900B033A4 /* IRCClientChannel_Private.h */; }; 86F2EFF91C21F81900B033A4 /* IRCClientChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F2EFF21C21F81900B033A4 /* IRCClientChannel.h */; }; 86F2EFFA1C21F81900B033A4 /* IRCClientChannel.m in Sources */ = {isa = PBXBuildFile; fileRef = 86F2EFF31C21F81900B033A4 /* IRCClientChannel.m */; }; @@ -31,14 +35,18 @@ 8657E6DB1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+SA_NSDataExtensions.h"; sourceTree = ""; }; 8657E6DC1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+SA_NSDataExtensions.m"; sourceTree = ""; }; 8657E6E11C2B55B900BD4E50 /* IRC_Numerics.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = IRC_Numerics.plist; sourceTree = ""; }; + 86769D5B1C94DC5300B86A72 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; + 86769D5C1C94DC5300B86A72 /* dcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dcc.h; sourceTree = ""; }; + 86769D5D1C94DC5300B86A72 /* libirc_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_errors.h; sourceTree = ""; }; + 86769D5E1C94DC5300B86A72 /* libirc_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_events.h; sourceTree = ""; }; + 86769D5F1C94DC5300B86A72 /* libirc_options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_options.h; sourceTree = ""; }; + 86769D601C94DC5300B86A72 /* libirc_rfcnumeric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_rfcnumeric.h; sourceTree = ""; }; + 86769D611C94DC5300B86A72 /* libircclient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libircclient.h; sourceTree = ""; }; + 86769D621C94DC5300B86A72 /* params.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = params.h; sourceTree = ""; }; + 86769D631C94DC5300B86A72 /* session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = session.h; sourceTree = ""; }; + 86769D681C94DC5300B86A72 /* libircclient.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libircclient.c; sourceTree = ""; }; 868374A81C24E774005B97E5 /* IRCClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCClient.h; sourceTree = ""; }; 86B6232B1C21FD7C00D6E3AF /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - 86CEFEEA1C2BC9A6000DB861 /* libircclient.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libircclient.a; sourceTree = ""; }; - 86CEFEEC1C2BC9BC000DB861 /* libirc_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_events.h; sourceTree = ""; }; - 86D784A01C24C39F00C7458D /* libirc_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_errors.h; sourceTree = ""; }; - 86D784A21C24C39F00C7458D /* libirc_options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_options.h; sourceTree = ""; }; - 86D784A31C24C39F00C7458D /* libirc_rfcnumeric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_rfcnumeric.h; sourceTree = ""; }; - 86D784A51C24C39F00C7458D /* libircclient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libircclient.h; sourceTree = ""; }; 86F2EFE61C21F73600B033A4 /* IRCClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = IRCClient.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 86F2EFEB1C21F73600B033A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 86F2EFF11C21F81900B033A4 /* IRCClientChannel_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCClientChannel_Private.h; sourceTree = ""; }; @@ -55,7 +63,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 86CEFEEB1C2BC9A6000DB861 /* libircclient.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -71,24 +78,44 @@ path = "NSData+SA_NSDataExtensions"; sourceTree = ""; }; - 86D7849F1C24C39F00C7458D /* libircclient */ = { + 86769D591C94DC5300B86A72 /* libircclient */ = { isa = PBXGroup; children = ( - 86CEFEEA1C2BC9A6000DB861 /* libircclient.a */, - 86D784A01C24C39F00C7458D /* libirc_errors.h */, - 86CEFEEC1C2BC9BC000DB861 /* libirc_events.h */, - 86D784A21C24C39F00C7458D /* libirc_options.h */, - 86D784A31C24C39F00C7458D /* libirc_rfcnumeric.h */, - 86D784A51C24C39F00C7458D /* libircclient.h */, + 86769D5A1C94DC5300B86A72 /* include */, + 86769D641C94DC5300B86A72 /* src */, ); path = libircclient; sourceTree = ""; }; + 86769D5A1C94DC5300B86A72 /* include */ = { + isa = PBXGroup; + children = ( + 86769D5B1C94DC5300B86A72 /* config.h */, + 86769D5C1C94DC5300B86A72 /* dcc.h */, + 86769D5D1C94DC5300B86A72 /* libirc_errors.h */, + 86769D5E1C94DC5300B86A72 /* libirc_events.h */, + 86769D5F1C94DC5300B86A72 /* libirc_options.h */, + 86769D601C94DC5300B86A72 /* libirc_rfcnumeric.h */, + 86769D611C94DC5300B86A72 /* libircclient.h */, + 86769D621C94DC5300B86A72 /* params.h */, + 86769D631C94DC5300B86A72 /* session.h */, + ); + path = include; + sourceTree = ""; + }; + 86769D641C94DC5300B86A72 /* src */ = { + isa = PBXGroup; + children = ( + 86769D681C94DC5300B86A72 /* libircclient.c */, + ); + path = src; + sourceTree = ""; + }; 86F2EFDC1C21F73600B033A4 = { isa = PBXGroup; children = ( 868374A81C24E774005B97E5 /* IRCClient.h */, - 86D7849F1C24C39F00C7458D /* libircclient */, + 86769D591C94DC5300B86A72 /* libircclient */, 8657E6DA1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions */, 86B6232B1C21FD7C00D6E3AF /* README */, 86F2EFE81C21F73600B033A4 /* IRCClient */, @@ -129,15 +156,19 @@ files = ( 868374A91C24E774005B97E5 /* IRCClient.h in Headers */, 86F2EFFE1C21F81900B033A4 /* IRCClientSessionDelegate.h in Headers */, - 86D784AB1C24C39F00C7458D /* libircclient.h in Headers */, - 86D784A61C24C39F00C7458D /* libirc_errors.h in Headers */, 86F2EFF91C21F81900B033A4 /* IRCClientChannel.h in Headers */, + 86769D751C94DC5300B86A72 /* session.h in Headers */, + 86769D6E1C94DC5300B86A72 /* dcc.h in Headers */, 86F2EFFB1C21F81900B033A4 /* IRCClientChannelDelegate.h in Headers */, + 86769D721C94DC5300B86A72 /* libirc_rfcnumeric.h in Headers */, + 86769D6D1C94DC5300B86A72 /* config.h in Headers */, 8657E6DD1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.h in Headers */, + 86769D731C94DC5300B86A72 /* libircclient.h in Headers */, + 86769D741C94DC5300B86A72 /* params.h in Headers */, 86F2EFFC1C21F81900B033A4 /* IRCClientSession.h in Headers */, - 86D784A91C24C39F00C7458D /* libirc_rfcnumeric.h in Headers */, - 86D784A81C24C39F00C7458D /* libirc_options.h in Headers */, - 86CEFEED1C2BC9BC000DB861 /* libirc_events.h in Headers */, + 86769D701C94DC5300B86A72 /* libirc_events.h in Headers */, + 86769D6F1C94DC5300B86A72 /* libirc_errors.h in Headers */, + 86769D711C94DC5300B86A72 /* libirc_options.h in Headers */, 86F2EFF81C21F81900B033A4 /* IRCClientChannel_Private.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -214,6 +245,7 @@ 86F2EFFD1C21F81900B033A4 /* IRCClientSession.m in Sources */, 8657E6DE1C29F4C700BD4E50 /* NSData+SA_NSDataExtensions.m in Sources */, 86F2EFFA1C21F81900B033A4 /* IRCClientChannel.m in Sources */, + 86769D791C94DC5300B86A72 /* libircclient.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -352,18 +384,11 @@ GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNUSED_LABEL = YES; - HEADER_SEARCH_PATHS = ( - libircclient/, - "$(PROJECT_DIR)/", - ); + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = IRCClient/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - "$(PROJECT_DIR)/libircclient", - ); + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/libircclient"; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = saidachmiz.IRCClient; @@ -371,8 +396,8 @@ RUN_CLANG_STATIC_ANALYZER = YES; SKIP_INSTALL = YES; STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; - SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; - VALID_ARCHS = "x86_64 arm64 armv7 armv7s"; + SUPPORTED_PLATFORMS = macosx; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -393,18 +418,11 @@ GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNUSED_LABEL = YES; - HEADER_SEARCH_PATHS = ( - libircclient/, - "$(PROJECT_DIR)/", - ); + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = IRCClient/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - "$(PROJECT_DIR)/libircclient", - ); + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/libircclient"; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = saidachmiz.IRCClient; @@ -412,8 +430,8 @@ RUN_CLANG_STATIC_ANALYZER = YES; SKIP_INSTALL = YES; STRINGS_FILE_OUTPUT_ENCODING = "UTF-8"; - SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator"; - VALID_ARCHS = "x86_64 arm64 armv7 armv7s"; + SUPPORTED_PLATFORMS = macosx; + VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/README b/README index 7ec96ea..b805f48 100644 --- a/README +++ b/README @@ -8,8 +8,6 @@ ADDING IRCCLIENT TO YOUR APPLICATION (using Xcode) (these instructions apply to Xcode 7.1.1, build 7B1005) -0. Build libircclient and add it to the IRCClient project (see file “README_libircclient” for details) - 1. Place the entire IRCClient folder in your project folder 2. Using “File -> Add Files…”, add IRCClient.xcodeproj to your project diff --git a/README_libircclient b/README_libircclient deleted file mode 100644 index d9ace6f..0000000 --- a/README_libircclient +++ /dev/null @@ -1,12 +0,0 @@ -Before you can add IRCClient to your project, you must build libircclient and add it to IRCClient. -(these instructions apply to Xcode 7.1.1, build 7B1005) - -0. Download the libircclient source - -1. Create a folder called “libircclient” in the IRCClient project folder - -2. Build libircclient, according the instructions provided - -3. Place the library (libircclient.a) and the headers (libircclient.h, libirc_errors.h, libirc_events.h, libirc_options.h, and libirc_rfcnumeric.h) into the libircclient folder you created - -Now you can proceed with step 1 of the instructions in the main README file.