Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@
828CED672AFC486000CA08B1 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED642AFC486000CA08B1 /* unzip.c */; };
828CED682AFC486000CA08B1 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED642AFC486000CA08B1 /* unzip.c */; };
828CED692AFC486100CA08B1 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED632AFC486100CA08B1 /* ioapi.c */; };
828CED6C2AFD885100CA08B1 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED262AFC484D00CA08B1 /* adler32.c */; settings = {COMPILER_FLAGS = "-Wno-error=macro-redefined"; }; };
828CED6A2AFC486100CA08B1 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED632AFC486100CA08B1 /* ioapi.c */; };
828CED6B2AFC486100CA08B1 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED632AFC486100CA08B1 /* ioapi.c */; };
828CED6C2AFD885100CA08B1 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED262AFC484D00CA08B1 /* adler32.c */; settings = {COMPILER_FLAGS = "-Wno-error=macro-redefined"; }; };
828CED6D2AFD885100CA08B1 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED1E2AFC484D00CA08B1 /* crc32.c */; settings = {COMPILER_FLAGS = "-Wno-error=implicit-int-conversion -Wno-error=shorten-64-to-32 -Wno-error=macro-redefined"; }; };
828CED6E2AFD885100CA08B1 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED1D2AFC484D00CA08B1 /* deflate.c */; settings = {COMPILER_FLAGS = "-Wno-error=implicit-int-conversion -Wno-error=shorten-64-to-32 -Wno-error=comma -Wno-error=macro-redefined"; }; };
828CED6F2AFD885100CA08B1 /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = 828CED252AFC484D00CA08B1 /* gzread.c */; settings = {COMPILER_FLAGS = "-Wno-error=implicit-int-conversion -Wno-error=shorten-64-to-32"; }; };
Expand Down Expand Up @@ -475,7 +475,6 @@
D3DAA84821C0E4090009C7F6 /* TaskQueueP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskQueueP.h; sourceTree = "<group>"; };
D3DAA84921C0E4090009C7F6 /* TaskQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TaskQueue.cpp; sourceTree = "<group>"; };
D3DAA84A21C0E4090009C7F6 /* referenced_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = referenced_ptr.h; sourceTree = "<group>"; };
D3DAA84B21C0E4090009C7F6 /* SpinLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpinLock.h; sourceTree = "<group>"; };
D3DAA84B21C0E4090009C7F6 /* StaticArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticArray.h; sourceTree = "<group>"; };
D3DAA84C21C0E4090009C7F6 /* ThreadPool_stl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadPool_stl.cpp; sourceTree = "<group>"; };
D3DAA84D21C0E4090009C7F6 /* TaskQueueImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskQueueImpl.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1855,7 +1854,9 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1890,7 +1891,9 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1966,12 +1969,14 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/openssl/lib";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
Expand All @@ -1992,12 +1997,14 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/openssl/lib";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_MODULE_NAME = SSL;
Expand Down Expand Up @@ -2039,8 +2046,10 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
KEEP_PRIVATE_EXTERNS = NO;
LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/openssl/lib";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2077,8 +2086,10 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
KEEP_PRIVATE_EXTERNS = NO;
LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/openssl/lib";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_LDFLAGS = "";
OTHER_LIBTOOLFLAGS = "";
SKIP_INSTALL = YES;
Expand All @@ -2093,12 +2104,14 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/openssl/lib";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
Expand All @@ -2120,12 +2133,14 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/openssl/lib";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_MODULE_NAME = SSL;
Expand Down Expand Up @@ -2161,7 +2176,9 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DHC_NOWEBSOCKETS",
Expand Down Expand Up @@ -2195,7 +2212,9 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DHC_NOWEBSOCKETS",
Expand Down Expand Up @@ -2299,7 +2318,9 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DHC_NOWEBSOCKETS",
Expand Down Expand Up @@ -2334,7 +2355,9 @@
"$(SRCROOT)/../../Source/**",
"$(SRCROOT)/../../Source/Global",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 12.4;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DHC_NOWEBSOCKETS",
Expand Down
1 change: 1 addition & 0 deletions Build/libHttpClient.CMake/GetOpenSSLFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function(GET_OPENSSL_FLAGS OUT_FLAGS OUT_FLAGS_DEBUG OUT_FLAGS_RELEASE)
"-DUNICODE"
"-DOPENSSLDIR=\"THIS_SHOULD_NOT_BE_USED\""
"-DENGINESDIR=\"THIS_SHOULD_NOT_BE_USED\""
"-DMODULESDIR=\"THIS_SHOULD_NOT_BE_USED\""
PARENT_SCOPE
)

Expand Down
2 changes: 1 addition & 1 deletion Build/libHttpClient.Linux/curl_Linux.bash
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ else
fi

# make libcrypto and libssl
./configure "${CONFIGURE_ARGS[@]}"
perl configure "${CONFIGURE_ARGS[@]}"

MAKE_PARALLELISM="-j$(nproc)" # run Make in parallel to speed up the build process
make $MAKE_PARALLELISM
Expand Down
2 changes: 1 addition & 1 deletion Build/libHttpClient.Linux/openssl_Linux.bash
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if [ "$CONFIGURATION" = "Debug" ]; then
fi

# make libcrypto and libssl
./Configure "${CONFIGURE_ARGS[@]}"
perl Configure "${CONFIGURE_ARGS[@]}"

MAKE_PARALLELISM="-j$(nproc)" # run Make in parallel to speed up the build process
make $MAKE_PARALLELISM CFLAGS="-fvisibility=hidden" CXXFLAGS="-fvisibility=hidden"
Expand Down
9 changes: 2 additions & 7 deletions Build/libcrypto.143.Win32/libcrypto.143.Win32.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(libHttpClient.Win32.props))" />
<Import Project="$([MSBuild]::GetPathOfFileAbove(libHttpClient.Win32.props))" />
<Import Project="$(HCBuildRoot)\libcrypto.Win32\libcrypto.Win32.vcxitems" Label="Shared" />
<ItemDefinitionGroup>
<ClCompile>
<DisableSpecificWarnings>4005;4244;4267;4319</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
Loading
Loading