From c264cd28b9d58313ab93952d4e80ebf01c5d2fc6 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 14 Apr 2014 11:18:20 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Add=20brew=E2=80=99s=20keg-only=20openssl?= =?UTF-8?q?=20to=20the=20search=20paths.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 58a365f2d..e6ef47ada 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1489,6 +1489,10 @@ FRAMEWORK_VERSION = A; GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch; INFOPLIST_FILE = Info.plist; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/openssl/1.0.1g/lib/, + ); OTHER_LDFLAGS = ( "-lgit2", "-force_load", @@ -1510,6 +1514,10 @@ FRAMEWORK_VERSION = A; GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch; INFOPLIST_FILE = Info.plist; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/openssl/1.0.1g/lib/, + ); OTHER_LDFLAGS = ( "-lgit2", "-force_load", @@ -1688,6 +1696,10 @@ FRAMEWORK_VERSION = A; GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch; INFOPLIST_FILE = Info.plist; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /usr/local/Cellar/openssl/1.0.1g/lib/, + ); OTHER_LDFLAGS = ( "-lgit2", "-force_load", From ee6ec74e4991b83dc88555e5eb11019bb137a90d Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 14 Apr 2014 11:18:50 -0400 Subject: [PATCH 2/2] Attempt to link with the brewed libssl/libcrypto. --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index e6ef47ada..3318591e9 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -207,8 +207,6 @@ 88746CC517FA1C950005888A /* GTRepository+Committing.h in Headers */ = {isa = PBXBuildFile; fileRef = 88746CC217FA1C950005888A /* GTRepository+Committing.h */; settings = {ATTRIBUTES = (Public, ); }; }; 88746CC617FA1C950005888A /* GTRepository+Committing.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746CC317FA1C950005888A /* GTRepository+Committing.m */; }; 88746CC717FA1C950005888A /* GTRepository+Committing.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746CC317FA1C950005888A /* GTRepository+Committing.m */; }; - 887DAFFC15CB1CBD00F30D0D /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 887DAFFB15CB1CBD00F30D0D /* libcrypto.dylib */; }; - 887DAFFD15CB1CE200F30D0D /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 887DAFF915CB1C9F00F30D0D /* libssl.dylib */; }; 88948AC91779243600809CDA /* GTObjectDatabaseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */; }; 88A994BA16FCE7D400402C7B /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; }; 88A994CB16FCED1D00402C7B /* GTTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* GTTestCase.m */; }; @@ -571,8 +569,6 @@ buildActionMask = 2147483647; files = ( 4D103ADD1819CFAA0029DB24 /* libiconv.dylib in Frameworks */, - 887DAFFD15CB1CE200F30D0D /* libssl.dylib in Frameworks */, - 887DAFFC15CB1CBD00F30D0D /* libcrypto.dylib in Frameworks */, 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, 8803DA871313145700E6E818 /* libz.dylib in Frameworks */, ); @@ -1498,6 +1494,8 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, + "-lcrypto", + "-lssl", ); PRODUCT_NAME = ObjectiveGit; USER_HEADER_SEARCH_PATHS = ""; @@ -1523,6 +1521,8 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, + "-lcrypto", + "-lssl", ); PRODUCT_NAME = ObjectiveGit; USER_HEADER_SEARCH_PATHS = ""; @@ -1705,6 +1705,8 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, + "-lcrypto", + "-lssl", ); PRODUCT_NAME = ObjectiveGit; USER_HEADER_SEARCH_PATHS = "";