archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 01:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace QNetwork operations with libcurl + wolfssl

Browse source
This commit is contained in:
RipleyTom 2020-03-13 18:34:08 +01:00 • committed by Ivan
parent 132c3e1c1a
commit b1d8bf754e
17 changed files with 590 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

7
3rdparty/CMakeLists.txt vendored
View file

@ -413,6 +413,11 @@ endif()
# LLVM
include(llvm.cmake)
# Wolfssl
add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
# Libcurl
add_subdirectory(curl EXCLUDE_FROM_ALL)
# add nice ALIAS targets for ease of use
add_library(3rdparty::libusb ALIAS usb-1.0-static)
@ -436,3 +441,5 @@ add_library(3rdparty::vulkan ALIAS ${VULKAN_TARGET})
add_library(3rdparty::openal ALIAS 3rdparty_openal)
add_library(3rdparty::ffmpeg ALIAS 3rdparty_ffmpeg)
add_library(3rdparty::glew ALIAS 3rdparty_glew)
add_library(3rdparty::wolfssl ALIAS wolfssl-3-static)
add_library(3rdparty::libcurl ALIAS libcurl)

1
3rdparty/curl vendored Submodule

@ -0,0 +1 @@
Subproject commit aa1a12cb234bd31c6058d04c398a159d06b85889

8
3rdparty/qt5.cmake vendored
View file

@ -1,16 +1,16 @@
add_library(3rdparty_qt5 INTERFACE)
find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Network Qml Concurrent)
find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Qml Concurrent)
if(WIN32)
find_package(Qt5 5.14 COMPONENTS WinExtras REQUIRED)
target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml Qt5::Concurrent)
target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Qml Qt5::Concurrent)
else()
find_package(Qt5 5.14 COMPONENTS DBus Gui)
if(Qt5DBus_FOUND)
target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml Qt5::Concurrent)
target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Qml Qt5::Concurrent)
target_compile_definitions(3rdparty_qt5 INTERFACE -DHAVE_QTDBUS)
else()
target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Concurrent)
target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::Qml Qt5::Concurrent)
endif()
target_include_directories(3rdparty_qt5 INTERFACE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
endif()

1
3rdparty/wolfssl vendored Submodule

@ -0,0 +1 @@
Subproject commit f7130a4e43170ac2bb1046a65d10c01e6ec1d698