From bd75509e1da4091a25e622dd6d653846a49060e2 Mon Sep 17 00:00:00 2001 From: chris warner Date: Thu, 21 Nov 2019 09:34:50 -0800 Subject: [PATCH 1/7] KAL-40 - Xcode project updates --- .../project.pbxproj | 2 +- .../xcschemes/ObjectiveGit Mac.xcscheme | 24 ++++++++----------- .../xcschemes/ObjectiveGit iOS.xcscheme | 24 ++++++++----------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 6f1a65b9d..1faaa5c2f 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1282,7 +1282,7 @@ attributes = { LastSwiftUpdateCheck = 0700; LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1120; ORGANIZATIONNAME = "GitHub, Inc"; TargetAttributes = { 88F05A6A16011E5400B7AD1D = { diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme index 2e7f2c268..d966bdc45 100644 --- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -95,17 +104,6 @@ - - - - - - - - + + + + @@ -81,17 +90,6 @@ - - - - - - - - Date: Wed, 11 Dec 2019 11:27:18 -0800 Subject: [PATCH 2/7] Removes the linking dependency on OpenSSL (libcrypto and libssl). This also removes the need for the packaging script at the end of the build phases. --- .../project.pbxproj | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1faaa5c2f..e8dc68f2f 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1225,7 +1225,6 @@ 79262F0F13C697BE00A4B1EA /* Copy git2 Headers */, BEF7E4DF1A3A47450035BB8E /* Copy git2 Headers again */, 8DC2EF500486A6940098B216 /* Headers */, - 4D751E9D215D765D003CD3CE /* Package external libraries */, ); buildRules = ( ); @@ -1357,20 +1356,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 4D751E9D215D765D003CD3CE /* Package external libraries */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Package external libraries"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./script/repackage-dylibs.rb"; - }; 6A28265317C69CB400C6A948 /* OpenSSL-iOS */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1702,7 +1687,6 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; @@ -1711,8 +1695,6 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, - "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1731,7 +1713,6 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; @@ -1740,8 +1721,6 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, - "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1971,7 +1950,6 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; @@ -1980,8 +1958,6 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, - "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2191,7 +2167,6 @@ INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; @@ -2200,8 +2175,6 @@ "-force_load", External/libgit2.a, /usr/local/lib/libssh2.a, - "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; From 99b8040ce9281c81614baa2aef2f307c4a10f1ac Mon Sep 17 00:00:00 2001 From: Dominik Wagner Date: Mon, 4 Jan 2021 18:18:40 +0100 Subject: [PATCH 3/7] fix .gitignore to properly ignore the External/build directory when created by scripts (on ios build) --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dc2f3d3ef..8f169f08b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.swp *~.nib -build/* +**/build/* .build/* build-iPhoneSimulator/* build-iPhoneOS/* From ed89ddaef6c00e1ad8f247422c0e6294e099d916 Mon Sep 17 00:00:00 2001 From: Dominik Wagner Date: Mon, 4 Jan 2021 18:19:31 +0100 Subject: [PATCH 4/7] readding the linking of ssl and crypto to make clean builds work again --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index e8dc68f2f..d3f06545c 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1694,6 +1694,8 @@ "-lgit2", "-force_load", External/libgit2.a, + "/usr/local/opt/openssl@1.1/lib/libssl.a", + "/usr/local/opt/openssl@1.1/lib/libcrypto.a", /usr/local/lib/libssh2.a, "-lcurl", ); @@ -1720,6 +1722,8 @@ "-lgit2", "-force_load", External/libgit2.a, + "/usr/local/opt/openssl@1.1/lib/libssl.a", + "/usr/local/opt/openssl@1.1/lib/libcrypto.a", /usr/local/lib/libssh2.a, "-lcurl", ); @@ -1957,6 +1961,8 @@ "-lgit2", "-force_load", External/libgit2.a, + "/usr/local/opt/openssl@1.1/lib/libssl.a", + "/usr/local/opt/openssl@1.1/lib/libcrypto.a", /usr/local/lib/libssh2.a, "-lcurl", ); @@ -2174,6 +2180,8 @@ "-lgit2", "-force_load", External/libgit2.a, + "/usr/local/opt/openssl@1.1/lib/libssl.a", + "/usr/local/opt/openssl@1.1/lib/libcrypto.a", /usr/local/lib/libssh2.a, "-lcurl", ); From cf5670eec34fad12e7e062328ca15688e57e13c0 Mon Sep 17 00:00:00 2001 From: Florian Albrecht Date: Mon, 18 Jan 2021 16:53:46 +0100 Subject: [PATCH 5/7] Add schemes, to be able to hide them in the main project. --- .../xcschemes/OpenSSL-iOS.xcscheme | 67 +++++++++++++++++++ .../xcschemes/libgit2-iOS.xcscheme | 67 +++++++++++++++++++ .../xcshareddata/xcschemes/libgit2.xcscheme | 67 +++++++++++++++++++ .../xcschemes/libssh2-iOS.xcscheme | 67 +++++++++++++++++++ 4 files changed, 268 insertions(+) create mode 100644 ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/OpenSSL-iOS.xcscheme create mode 100644 ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme create mode 100644 ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme create mode 100644 ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/OpenSSL-iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/OpenSSL-iOS.xcscheme new file mode 100644 index 000000000..10e2d51c5 --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/OpenSSL-iOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme new file mode 100644 index 000000000..aed8e5a5d --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme new file mode 100644 index 000000000..758bed7a8 --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme new file mode 100644 index 000000000..877b81c3b --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From a0806b90fb75fc8c60b2a3a9e44fe2a31c59ed6f Mon Sep 17 00:00:00 2001 From: Florian Albrecht Date: Mon, 18 Jan 2021 17:05:53 +0100 Subject: [PATCH 6/7] Using 10.15 as SDK and 10.12 as deployment, like all other targets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not sure it’s worth bothering, but why not. --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index d3f06545c..60eddbc25 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1701,6 +1701,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -1729,6 +1730,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Release; @@ -1758,13 +1760,12 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1797,12 +1798,11 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1930,12 +1930,11 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1968,6 +1967,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Test; @@ -2149,12 +2149,11 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -2187,6 +2186,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Profile; From 89f6168b001465cb608f176f73056b211e8abade Mon Sep 17 00:00:00 2001 From: Christopher Atlan Date: Tue, 19 Jan 2021 14:19:05 +0100 Subject: [PATCH 7/7] Update OpenSSL Use $(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL --- .../project.pbxproj | 60 ++++++++++++++----- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 60eddbc25..ed752a9af 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1684,19 +1684,22 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - "/usr/local/opt/openssl@1.1/lib/libssl.a", - "/usr/local/opt/openssl@1.1/lib/libcrypto.a", - /usr/local/lib/libssh2.a, + "-lcrypto", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1713,19 +1716,22 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - "/usr/local/opt/openssl@1.1/lib/libssl.a", - "/usr/local/opt/openssl@1.1/lib/libcrypto.a", - /usr/local/lib/libssh2.a, + "-lcrypto", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1950,19 +1956,22 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - "/usr/local/opt/openssl@1.1/lib/libssl.a", - "/usr/local/opt/openssl@1.1/lib/libcrypto.a", - /usr/local/lib/libssh2.a, + "-lcrypto", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2005,9 +2014,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2062,9 +2075,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2087,9 +2104,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2112,9 +2133,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2169,19 +2194,22 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - "/usr/local/opt/openssl@1.1/lib/libssl.a", - "/usr/local/opt/openssl@1.1/lib/libcrypto.a", - /usr/local/lib/libssh2.a, + "-lcrypto", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";