From 25cd9b94c2ac4e2e920ef5f3ac44cf517510a3cf Mon Sep 17 00:00:00 2001 From: Kazuho Oku Date: Mon, 30 Sep 2024 16:42:27 +0900 Subject: [PATCH 1/2] update homebrew path --- quicly.xcodeproj/project.pbxproj | 58 ++++++++------------------------ 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/quicly.xcodeproj/project.pbxproj b/quicly.xcodeproj/project.pbxproj index 2b63dfed..2ba357d9 100644 --- a/quicly.xcodeproj/project.pbxproj +++ b/quicly.xcodeproj/project.pbxproj @@ -930,10 +930,7 @@ "QUICLY_HAVE_FUSION=1", ); OTHER_CFLAGS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -947,10 +944,7 @@ "QUICLY_HAVE_FUSION=1", ); OTHER_CFLAGS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -958,10 +952,7 @@ E9804225223952FD008B9745 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -969,10 +960,7 @@ E9804226223952FD008B9745 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -1021,12 +1009,13 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "/usr/local/opt/openssl@1.1/include", + /opt/homebrew/include, deps/klib, deps/picotls/include, deps/dcc, include, ); + LIBRARY_SEARCH_PATHS = /opt/homebrew/lib; MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1081,12 +1070,13 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "/usr/local/opt/openssl@1.1/include", + /opt/homebrew/include, deps/klib, deps/picotls/include, deps/dcc, include, ); + LIBRARY_SEARCH_PATHS = /opt/homebrew/lib; MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = ( @@ -1130,13 +1120,9 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "QUICLY_USE_EMBEDDED_PROBES=1", - "QUICLY_HAVE_FUSION=1", ); OTHER_CFLAGS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1147,13 +1133,9 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "QUICLY_USE_EMBEDDED_PROBES=1", - "QUICLY_HAVE_FUSION=1", ); OTHER_CFLAGS = "$(inherited)"; - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -1161,10 +1143,7 @@ E98F4CB920E5CF1B00362F15 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1172,10 +1151,7 @@ E98F4CBA20E5CF1B00362F15 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -1183,10 +1159,7 @@ E9CC44211EC195DF00DC7D3E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1194,10 +1167,7 @@ E9CC44221EC195DF00DC7D3E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = ( - "-L/usr/local/opt/openssl@1.1/lib", - "-lcrypto", - ); + OTHER_LDFLAGS = "-lcrypto"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; From e5fc9a0262d96b1afbc25e2c7772b9f581b42ac2 Mon Sep 17 00:00:00 2001 From: Kazuho Oku Date: Mon, 30 Sep 2024 16:43:22 +0900 Subject: [PATCH 2/2] do not include fusion --- quicly.xcodeproj/project.pbxproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/quicly.xcodeproj/project.pbxproj b/quicly.xcodeproj/project.pbxproj index 2ba357d9..7a41c63a 100644 --- a/quicly.xcodeproj/project.pbxproj +++ b/quicly.xcodeproj/project.pbxproj @@ -22,7 +22,6 @@ 0829877026D372B70053638F /* cc-pico.c in Sources */ = {isa = PBXBuildFile; fileRef = 082195072683498900E3EFCF /* cc-pico.c */; }; 0829877126D372B70053638F /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = E99F8C251F4E9EBF00C26B3D /* frame.c */; }; 0829877226D372B70053638F /* recvstate.c in Sources */ = {isa = PBXBuildFile; fileRef = E920D21D1F43E05000799777 /* recvstate.c */; }; - 0829877326D372B70053638F /* fusion.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B43E11246943D300824E51 /* fusion.c */; }; 0829877426D372B70053638F /* defaults.c in Sources */ = {isa = PBXBuildFile; fileRef = E98042352244A5D7008B9745 /* defaults.c */; }; 0829877526D372B70053638F /* streambuf.c in Sources */ = {isa = PBXBuildFile; fileRef = E9D3CCCE21D22F4300516202 /* streambuf.c */; }; 0829877626D372B70053638F /* pembase64.c in Sources */ = {isa = PBXBuildFile; fileRef = E93E54681F663849001C50FE /* pembase64.c */; }; @@ -117,7 +116,6 @@ E99F8C261F4E9EBF00C26B3D /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = E99F8C251F4E9EBF00C26B3D /* frame.c */; }; E99F8C271F4E9F5D00C26B3D /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = E99F8C251F4E9EBF00C26B3D /* frame.c */; }; E99F8C291F4EAEF800C26B3D /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = E99F8C281F4EAEF800C26B3D /* frame.c */; }; - E9B43E12246943D300824E51 /* fusion.c in Sources */ = {isa = PBXBuildFile; fileRef = E9B43E11246943D300824E51 /* fusion.c */; }; E9CC44111EB85E0B00DC7D3E /* khash.h in Headers */ = {isa = PBXBuildFile; fileRef = E9CC44101EB85E0B00DC7D3E /* khash.h */; }; E9CC441B1EC195DF00DC7D3E /* openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = E98448271EA48D0000390927 /* openssl.c */; }; E9CC441C1EC195DF00DC7D3E /* picotls.c in Sources */ = {isa = PBXBuildFile; fileRef = E98448281EA48D0000390927 /* picotls.c */; }; @@ -786,7 +784,6 @@ 0829877126D372B70053638F /* frame.c in Sources */, 0829877226D372B70053638F /* recvstate.c in Sources */, 08B3297D29407097009D6766 /* hpke.c in Sources */, - 0829877326D372B70053638F /* fusion.c in Sources */, 0829877426D372B70053638F /* defaults.c in Sources */, 086001CB273271E80043886F /* rate.c in Sources */, 0829877526D372B70053638F /* streambuf.c in Sources */, @@ -851,7 +848,6 @@ 082195092683498900E3EFCF /* cc-pico.c in Sources */, E941428D23B0B839002D3CE0 /* frame.c in Sources */, E941429123B0B86D002D3CE0 /* recvstate.c in Sources */, - E9B43E12246943D300824E51 /* fusion.c in Sources */, E941428E23B0B845002D3CE0 /* defaults.c in Sources */, E941429023B0B861002D3CE0 /* streambuf.c in Sources */, 0829878F26E03D4D0053638F /* rate.c in Sources */, @@ -927,7 +923,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "QUICLY_USE_EMBEDDED_PROBES=1", - "QUICLY_HAVE_FUSION=1", ); OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "-lcrypto"; @@ -941,7 +936,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "QUICLY_USE_EMBEDDED_PROBES=1", - "QUICLY_HAVE_FUSION=1", ); OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "-lcrypto";