libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 02:00:41 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Qt: link to openssl so Qt will have it for later

Browse Source
This commit is contained in:
Brad Parker 2018-08-26 10:40:33 -04:00
parent 78f5aba04b
commit 7731db9ed8
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.common
View File

@ -332,6 +332,11 @@ endif
# Qt WIMP GUI
ifeq ($(HAVE_OPENSSL), 1)
DEFINES += $(OPENSSL_CFLAGS)
LIBS += $(OPENSSL_LIBS)
endif
ifeq ($(HAVE_QT), 1)
OBJ += ui/drivers/ui_qt.o \
ui/drivers/qt/ui_qt_application.o \

2
qb/config.libs.sh
View File

@ -281,6 +281,7 @@ if [ "$HAVE_QT" != 'no' ] && [ "$MOC_PATH" != 'none' ]; then
check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2
check_pkgconf QT5NETWORK Qt5Network 5.2
#check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4
check_pkgconf OPENSSL openssl 1.0.0
check_val '' QT5CORE -lQt5Core QT5CORE
check_val '' QT5GUI -lQt5Gui QT5GUI
@ -288,6 +289,7 @@ if [ "$HAVE_QT" != 'no' ] && [ "$MOC_PATH" != 'none' ]; then
check_val '' QT5CONCURRENT -lQt5Concurrent QT5CONCURRENT
check_val '' QT5NETWORK -lQt5Network QT5NETWORK
#check_val '' QT5WEBENGINE -lQt5WebEngine QT5WEBENGINE
check_val '' OPENSSL -lssl OPENSSL
if [ "$HAVE_QT5CORE" = "no" ] || [ "$HAVE_QT5GUI" = "no" ] || [ "$HAVE_QT5WIDGETS" = "no" ] || [ "$HAVE_QT5CONCURRENT" = "no" ] || [ "$HAVE_QT5NETWORK" = "no" ]; then
die : 'Notice: Not building Qt support, required libraries were not found.'

10
ui/drivers/qt/ui_qt_window.cpp
View File

@ -73,6 +73,8 @@ extern "C" {
#include <file/archive_file.h>
#include <streams/file_stream.h>
#include <math.h>
#include <openssl/ssl.h>
#include <openssl/opensslv.h>
}
#include "../../../AUTHORS.h"
@ -572,6 +574,14 @@ MainWindow::MainWindow(QWidget *parent) :
#endif
removeUpdateTempFiles();
{
const SSL_METHOD* method = TLSv1_method();
RARCH_LOG("[Qt]: Using %s\n", OPENSSL_VERSION_TEXT);
RARCH_LOG("[Qt]: TLSv1 supports %d ciphers.\n", method->num_ciphers());
}
}
MainWindow::~MainWindow()