From 65350da5fd060bfb95b0a65f6bdc32aa580e2731 Mon Sep 17 00:00:00 2001 From: achmizs Date: Fri, 18 Dec 2015 20:49:25 -0500 Subject: [PATCH] stuff2 --- IRCClient/IRCClient.h => IRCClient.h | 8 ++++---- IRCClient.xcodeproj/project.pbxproj | 18 ++++++++++++------ IRCClient/IRCClientChannel_Private.h | 1 + IRCClient/IRCClientSession.h | 1 - IRCClient/IRCClientSession.m | 1 + 5 files changed, 18 insertions(+), 11 deletions(-) rename IRCClient/IRCClient.h => IRCClient.h (84%) diff --git a/IRCClient/IRCClient.h b/IRCClient.h similarity index 84% rename from IRCClient/IRCClient.h rename to IRCClient.h index 2072e8e..bde11eb 100644 --- a/IRCClient/IRCClient.h +++ b/IRCClient.h @@ -26,7 +26,7 @@ FOUNDATION_EXPORT const unsigned char IRCClientVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import -#import "IRCClientChannel.h" -#import "IRCClientChannelDelegate.h" -#import "IRCClientSession.h" -#import "IRCClientSessionDelegate.h" +#import "IRCClient/IRCClientSession.h" +#import "IRCClient/IRCClientSessionDelegate.h" +#import "IRCClient/IRCClientChannel.h" +#import "IRCClient/IRCClientChannelDelegate.h" diff --git a/IRCClient.xcodeproj/project.pbxproj b/IRCClient.xcodeproj/project.pbxproj index d3d8a28..f3942ca 100644 --- a/IRCClient.xcodeproj/project.pbxproj +++ b/IRCClient.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 868374A91C24E774005B97E5 /* IRCClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 868374A81C24E774005B97E5 /* IRCClient.h */; }; 86B6232C1C21FD7C00D6E3AF /* README in Resources */ = {isa = PBXBuildFile; fileRef = 86B6232B1C21FD7C00D6E3AF /* README */; }; - 86D7849E1C24C2CC00C7458D /* IRCClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D7849D1C24C2CC00C7458D /* IRCClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; 86D784A61C24C39F00C7458D /* libirc_errors.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A01C24C39F00C7458D /* libirc_errors.h */; }; 86D784A71C24C39F00C7458D /* libirc_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A11C24C39F00C7458D /* libirc_events.h */; }; 86D784A81C24C39F00C7458D /* libirc_options.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D784A21C24C39F00C7458D /* libirc_options.h */; }; @@ -25,8 +25,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 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 = ""; }; - 86D7849D1C24C2CC00C7458D /* IRCClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCClient.h; sourceTree = ""; }; 86D784A01C24C39F00C7458D /* libirc_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_errors.h; sourceTree = ""; }; 86D784A11C24C39F00C7458D /* libirc_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_events.h; sourceTree = ""; }; 86D784A21C24C39F00C7458D /* libirc_options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libirc_options.h; sourceTree = ""; }; @@ -72,6 +72,7 @@ 86F2EFDC1C21F73600B033A4 = { isa = PBXGroup; children = ( + 868374A81C24E774005B97E5 /* IRCClient.h */, 86D7849F1C24C39F00C7458D /* libircclient */, 86B6232B1C21FD7C00D6E3AF /* README */, 86F2EFE81C21F73600B033A4 /* IRCClient */, @@ -90,7 +91,6 @@ 86F2EFE81C21F73600B033A4 /* IRCClient */ = { isa = PBXGroup; children = ( - 86D7849D1C24C2CC00C7458D /* IRCClient.h */, 86F2EFF11C21F81900B033A4 /* IRCClientChannel_Private.h */, 86F2EFF21C21F81900B033A4 /* IRCClientChannel.h */, 86F2EFF31C21F81900B033A4 /* IRCClientChannel.m */, @@ -110,8 +110,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 86D7849E1C24C2CC00C7458D /* IRCClient.h in Headers */, 86F2EFFE1C21F81900B033A4 /* IRCClientSessionDelegate.h in Headers */, + 868374A91C24E774005B97E5 /* IRCClient.h in Headers */, 86D784AB1C24C39F00C7458D /* libircclient.h in Headers */, 86D784A61C24C39F00C7458D /* libirc_errors.h in Headers */, 86F2EFF91C21F81900B033A4 /* IRCClientChannel.h in Headers */, @@ -296,7 +296,10 @@ DYLIB_CURRENT_VERSION = 2.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = 2.0; - HEADER_SEARCH_PATHS = libircclient/; + HEADER_SEARCH_PATHS = ( + libircclient/, + "$(PROJECT_DIR)/", + ); INFOPLIST_FILE = IRCClient/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; @@ -325,7 +328,10 @@ DYLIB_CURRENT_VERSION = 2.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = 2.0; - HEADER_SEARCH_PATHS = libircclient/; + HEADER_SEARCH_PATHS = ( + libircclient/, + "$(PROJECT_DIR)/", + ); INFOPLIST_FILE = IRCClient/Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; diff --git a/IRCClient/IRCClientChannel_Private.h b/IRCClient/IRCClientChannel_Private.h index c0b0fd7..d54349b 100644 --- a/IRCClient/IRCClientChannel_Private.h +++ b/IRCClient/IRCClientChannel_Private.h @@ -6,6 +6,7 @@ // #import "IRCClientChannel.h" +#include "libircclient.h" @interface IRCClientChannel () diff --git a/IRCClient/IRCClientSession.h b/IRCClient/IRCClientSession.h index 11dc056..6847685 100644 --- a/IRCClient/IRCClientSession.h +++ b/IRCClient/IRCClientSession.h @@ -64,7 +64,6 @@ #import #import "IRCClientSessionDelegate.h" -#include "libircclient.h" /** @class IRCClientSession * @brief Represents a connected IRC Session. diff --git a/IRCClient/IRCClientSession.m b/IRCClient/IRCClientSession.m index 31e5c84..62a496d 100644 --- a/IRCClient/IRCClientSession.m +++ b/IRCClient/IRCClientSession.m @@ -21,6 +21,7 @@ #import "IRCClientSession.h" #import "IRCClientChannel.h" #import "IRCClientChannel_Private.h" +#include "libircclient.h" #include "string.h" #pragma mark - Callback function declarations