mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	Move WebServices to use LibreSSL + cpp-httplib (#3501)
Move WebServices to use LibreSSL + cpp-httplib Remove curl + openssl build dependencies
This commit is contained in:
		
							parent
							
								
									e2c5666883
								
							
						
					
					
						commit
						9283053701
					
				
					 18 changed files with 2633 additions and 150 deletions
				
			
		
							
								
								
									
										29
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										29
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -60,23 +60,18 @@ add_subdirectory(enet) | |||
| target_include_directories(enet INTERFACE ./enet/include) | ||||
| 
 | ||||
| if (ENABLE_WEB_SERVICE) | ||||
|     # msys installed curl is configured to use openssl, but that isn't portable | ||||
|     # since it relies on having the bundled certs install in the home folder for SSL | ||||
|     # by default on mingw, download the precompiled curl thats linked against windows native ssl | ||||
|     if (MINGW AND CITRA_USE_BUNDLED_CURL) | ||||
|         download_bundled_external("curl/" "curl-7_55_1" CURL_PREFIX) | ||||
|         set(CURL_PREFIX "${CMAKE_BINARY_DIR}/externals/curl-7_55_1") | ||||
|         set(CURL_FOUND YES) | ||||
|         set(CURL_INCLUDE_DIR "${CURL_PREFIX}/include" CACHE PATH "Path to curl headers") | ||||
|         set(CURL_LIBRARY "${CURL_PREFIX}/lib/libcurldll.a" CACHE PATH "Path to curl library") | ||||
|         set(CURL_DLL_DIR "${CURL_PREFIX}/lib/" CACHE PATH "Path to curl.dll") | ||||
|         set(USE_SYSTEM_CURL ON CACHE BOOL "") | ||||
|     endif() | ||||
|     # CPR | ||||
|     set(BUILD_TESTING OFF CACHE BOOL "") | ||||
|     set(BUILD_CPR_TESTS OFF CACHE BOOL "") | ||||
|     add_subdirectory(cpr) | ||||
|     target_include_directories(cpr INTERFACE ./cpr/include) | ||||
|     # LibreSSL | ||||
|     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") | ||||
|     add_definitions(-DHAVE_INET_NTOP) | ||||
|     add_subdirectory(libressl) | ||||
|     target_include_directories(ssl INTERFACE ./libressl/include) | ||||
| 
 | ||||
|     # lurlparser | ||||
|     add_subdirectory(lurlparser) | ||||
| 
 | ||||
|     # httplib | ||||
|     add_library(httplib INTERFACE) | ||||
|     target_include_directories(httplib INTERFACE ./httplib) | ||||
| 
 | ||||
|     # JSON | ||||
|     add_library(json-headers INTERFACE) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue