Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a CMake option to use the bundled TLS certificates with cURL.

Browse source
This commit is contained in:
Leon Styhre 2021-11-25 17:34:34 +01:00
parent 1f9f9b903c
commit 360be460a2
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -32,6 +32,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utils
option(GL "Set to ON if targeting Desktop OpenGL" ${GL}) option(GL "Set to ON if targeting Desktop OpenGL" ${GL})
option(GLES "Set to ON if targeting Embedded OpenGL" ${GLES}) option(GLES "Set to ON if targeting Embedded OpenGL" ${GLES})
option(RPI "Set to ON to enable Raspberry Pi specific build" ${RPI}) option(RPI "Set to ON to enable Raspberry Pi specific build" ${RPI})
option(BUNDLED_CERTS "Set to ON to use bundled TLS/SSL certificates" ${BUNDLED_CERTS})
option(CEC "Set to ON to enable CEC" ${CEC}) option(CEC "Set to ON to enable CEC" ${CEC})
option(VIDEO_HW_DECODING "Set to ON to enable FFmpeg HW decoding" ${VIDEO_HW_DECODING}) option(VIDEO_HW_DECODING "Set to ON to enable FFmpeg HW decoding" ${VIDEO_HW_DECODING})
option(VLC_PLAYER "Set to ON to build the VLC-based video player" ${VLC_PLAYER}) option(VLC_PLAYER "Set to ON to build the VLC-based video player" ${VLC_PLAYER})
@ -254,6 +255,10 @@ if(RPI)
add_definitions(-D_RPI_) add_definitions(-D_RPI_)
endif() endif()
if(BUNDLED_CERTS OR WIN32)
add_definitions(-DUSE_BUNDLED_CERTIFICATES)
endif()
if(DEFINED libCEC_FOUND) if(DEFINED libCEC_FOUND)
add_definitions(-DHAVE_LIBCEC) add_definitions(-DHAVE_LIBCEC)
endif() endif()

2
es-core/src/HttpReq.cpp
View file

@ -59,7 +59,7 @@ HttpReq::HttpReq(const std::string& url)
mHandle = curl_easy_init(); mHandle = curl_easy_init();
#if defined(_WIN64) #if defined(USE_BUNDLED_CERTIFICATES)
// On Windows, use the bundled cURL TLS/SSL certificates (which actually come from the // On Windows, use the bundled cURL TLS/SSL certificates (which actually come from the
// Mozilla project). There is a possibility to use the OS provided Schannel certificates // Mozilla project). There is a possibility to use the OS provided Schannel certificates
// but I haven't been able to get this to work and it also seems to be problematic on // but I haven't been able to get this to work and it also seems to be problematic on