Statically link OpenSSL on OSX

git-up · Sep 1, 2016 · d03f696 · d03f696
1 parent 22e26b5
commit d03f696
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/GitUp/GitUp.xcodeproj/project.pbxproj b/GitUp/GitUp.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
 		E21DCAF61B254F33006424E8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2C338D819F85C3400063D95 /* Foundation.framework */; };
 		E21DCAF71B254F53006424E8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E28200AC1A7D71EE00DA4096 /* CoreServices.framework */; };
 		E21DCAF81B255471006424E8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2C3394419F85D4B00063D95 /* libz.dylib */; };
-		E222FF7F1B9210F600507E77 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E222FF7E1B9210F600507E77 /* libcrypto.dylib */; };
 		E23C9B291B92104500ACA5A9 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2B14B561A88102C00003E64 /* Security.framework */; };
 		E25EBCEB1AA3F8B700D3AF44 /* Application.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E25EBCEA1AA3F8B700D3AF44 /* Application.xcassets */; };
 		E2653D251A5B2FBD006A9871 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2653D241A5B2FBD006A9871 /* Sparkle.framework */; };
@@ -155,7 +154,6 @@
 				E23C9B291B92104500ACA5A9 /* Security.framework in Frameworks */,
 				E21DCAF71B254F53006424E8 /* CoreServices.framework in Frameworks */,
 				E21DCAF61B254F33006424E8 /* Foundation.framework in Frameworks */,
-				E222FF7F1B9210F600507E77 /* libcrypto.dylib in Frameworks */,
 				E212A6DE1B92100E00F62B18 /* libiconv.dylib in Frameworks */,
 				E21DCAF81B255471006424E8 /* libz.dylib in Frameworks */,
 			);
@@ -487,6 +485,7 @@
 				HEADER_SEARCH_PATHS = "../GitUpKit/Third-Party/libgit2/include";
 				OTHER_LDFLAGS = (
 					"$(BUILD_DIR)/$(CONFIGURATION)/libgit2.a",
+					"../GitUpKit/Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
 					"../GitUpKit/Third-Party/Libraries/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
 				);
 				PRODUCT_NAME = gitup;
@@ -501,6 +500,7 @@
 				HEADER_SEARCH_PATHS = "../GitUpKit/Third-Party/libgit2/include";
 				OTHER_LDFLAGS = (
 					"$(BUILD_DIR)/$(CONFIGURATION)/libgit2.a",
+					"../GitUpKit/Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
 					"../GitUpKit/Third-Party/Libraries/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
 				);
 				PRODUCT_NAME = gitup;
@@ -515,6 +515,7 @@
 				HEADER_SEARCH_PATHS = "../GitUpKit/Third-Party/libgit2/include";
 				OTHER_LDFLAGS = (
 					"$(BUILD_DIR)/$(CONFIGURATION)/libgit2.a",
+					"../GitUpKit/Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
 					"../GitUpKit/Third-Party/Libraries/libssh2/$(PLATFORM_NAME)/lib/libssh2.a",
 				);
 				PRODUCT_NAME = gitup;

diff --git a/GitUpKit/GitUpKit.xcodeproj/project.pbxproj b/GitUpKit/GitUpKit.xcodeproj/project.pbxproj
@@ -355,8 +355,6 @@
 		E2B9879C1B9172470097629D /* GILine.h in Headers */ = {isa = PBXBuildFile; fileRef = E2D4DEAA1A4D587800B6AF66 /* GILine.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E2B9879D1B9172470097629D /* GINode.h in Headers */ = {isa = PBXBuildFile; fileRef = E2D4DEA61A4D57AA00B6AF66 /* GINode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E2B987A11B9173440097629D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E284D6701AAC004F0038C176 /* CoreGraphics.framework */; };
-		E2B987B41B9206470097629D /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2B987B31B9206470097629D /* libcrypto.dylib */; };
-		E2B987B51B9206750097629D /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2B987B31B9206470097629D /* libcrypto.dylib */; };
 		E2C338D919F85C3400063D95 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2C338D819F85C3400063D95 /* Foundation.framework */; };
 		E2C338EC19F85C8600063D95 /* GCBranch.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C338DC19F85C8600063D95 /* GCBranch.m */; };
 		E2C338EE19F85C8600063D95 /* GCCommit.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C338DE19F85C8600063D95 /* GCCommit.m */; };
@@ -670,7 +668,6 @@
 				E267E1FB1B84DA7600BAB377 /* Cocoa.framework in Frameworks */,
 				E267E2301B84DC0900BAB377 /* QuartzCore.framework in Frameworks */,
 				E267E1F91B84DA3F00BAB377 /* Security.framework in Frameworks */,
-				E2B987B51B9206750097629D /* libcrypto.dylib in Frameworks */,
 				E267E1F41B84D95B00BAB377 /* libz.dylib in Frameworks */,
 				E267E1F51B84D95E00BAB377 /* libiconv.dylib in Frameworks */,
 			);
@@ -685,7 +682,6 @@
 				E28200AE1A7D720000DA4096 /* CoreServices.framework in Frameworks */,
 				E284D6711AAC004F0038C176 /* CoreGraphics.framework in Frameworks */,
 				E2FEED6C1AEF7B8300CBED80 /* Security.framework in Frameworks */,
-				E2B987B41B9206470097629D /* libcrypto.dylib in Frameworks */,
 				E2C3394819F85D8700063D95 /* libheimdal-asn1.dylib in Frameworks */,
 				E2C3394919F85D8700063D95 /* libz.dylib in Frameworks */,
 				E2C3394C19F85D8700063D95 /* libiconv.dylib in Frameworks */,
@@ -1823,6 +1819,10 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
 				PRODUCT_NAME = GitUpKit;
 				SDKROOT = macosx;
@@ -1839,6 +1839,10 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
 				PRODUCT_NAME = GitUpKit;
 				SDKROOT = macosx;
@@ -1855,6 +1859,10 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = co.gitup.kit;
 				PRODUCT_NAME = GitUpKit;
 				SDKROOT = macosx;
@@ -1905,6 +1913,10 @@
 					"$(inherited)",
 					"__GI_HAS_APPKIT__=0",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
+				);
 				PRODUCT_NAME = GitUpTests;
 				SDKROOT = macosx;
 				WARNING_CFLAGS = (
@@ -1925,6 +1937,10 @@
 					"$(inherited)",
 					"__GI_HAS_APPKIT__=0",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
+				);
 				PRODUCT_NAME = GitUpTests;
 				SDKROOT = macosx;
 				WARNING_CFLAGS = (
@@ -1961,6 +1977,10 @@
 					"$(inherited)",
 					"__GI_HAS_APPKIT__=0",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"Third-Party/Libraries/libssl/$(PLATFORM_NAME)/lib/libcrypto.a",
+				);
 				PRODUCT_NAME = GitUpTests;
 				SDKROOT = macosx;
 				WARNING_CFLAGS = (