From 221de6561b89830b792ec3fc27ea02394fbc4e34 Mon Sep 17 00:00:00 2001 From: Elias Date: Tue, 4 Dec 2018 19:21:10 +0100 Subject: [PATCH] Add OpenSSL libs Remove google analytics --- ScreenPlay.pro | 3 +-- ScreenPlay/ScreenPlay.pro | 16 ++++++---------- ScreenPlay/ThirdParty/OpenSSL/libeay32.dll | 3 +++ ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll | 3 +++ 4 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 ScreenPlay/ThirdParty/OpenSSL/libeay32.dll create mode 100644 ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll diff --git a/ScreenPlay.pro b/ScreenPlay.pro index 99ef953c..30c99178 100644 --- a/ScreenPlay.pro +++ b/ScreenPlay.pro @@ -4,9 +4,8 @@ SUBDIRS = \ ScreenPlaySDK/ScreenPlaySDK.pro \ ScreenPlaySysInfo/ScreenPlaySysInfo.pro \ ScreenPlayWindow/ScreenPlayWindow.pro \ - ScreenPlay/ThirdParty/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \ ScreenPlayWidget/ScreenPlayWidget.pro \ -#ScreenPlay/ThirdParty/qt-google-analytics/qt-google-analytics.pro \ + ScreenPlay/ThirdParty/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \ ScreenPlayWindow.depends = ScreenPlaySDK ScreenPlayWidget.depends = ScreenPlaySDK diff --git a/ScreenPlay/ScreenPlay.pro b/ScreenPlay/ScreenPlay.pro index bea1b2ae..fb81d90c 100644 --- a/ScreenPlay/ScreenPlay.pro +++ b/ScreenPlay/ScreenPlay.pro @@ -1,7 +1,7 @@ TEMPLATE = app QT += qml quick widgets quickcontrols2 core webengine CONFIG += c++17 -CONFIG += qtquickcompiler +#CONFIG += qtquickcompiler #DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT msvc: LIBS += -luser32 @@ -56,16 +56,10 @@ INCLUDEPATH += \ $$PWD/ThirdParty/ \ $$PWD/src/ -#include(ThirdParty/qt-google-analytics/qt-google-analytics.pri) -#LIBS += -lqt-google-analytics - CONFIG(debug, debug|release) { install_it.path = $${OUT_PWD}/debug/ - #QMAKE_LIBDIR += $$OUT_PWD/ThirdParty/qt-google-analytics/debug - - } else { +} else { install_it.path = $${OUT_PWD}/release/ - #QMAKE_LIBDIR += $$OUT_PWD/ThirdParty/qt-google-analytics/release } @@ -84,7 +78,9 @@ install_it.files += assets/templates/config.json \ ThirdParty/ffmpeg/Windows/ffprobe.exe \ ThirdParty/ffmpeg/Windows/postproc-55.dll \ ThirdParty/ffmpeg/Windows/swresample-3.dll \ - ThirdParty/ffmpeg/Windows/swscale-5.dll + ThirdParty/ffmpeg/Windows/swscale-5.dll \ + ThirdParty/OpenSSL/libeay32.dll \ + ThirdParty/OpenSSL/ssleay32.dll \ installOut.files += steam_appid.txt \ @@ -150,5 +146,5 @@ macx: { } DISTFILES += \ - favicon.ico + favicon.ico \ diff --git a/ScreenPlay/ThirdParty/OpenSSL/libeay32.dll b/ScreenPlay/ThirdParty/OpenSSL/libeay32.dll new file mode 100644 index 00000000..1251b39b --- /dev/null +++ b/ScreenPlay/ThirdParty/OpenSSL/libeay32.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7b8544110ad44015fef87135a02edce8aa5084f6468532574a89556767490bb +size 2278400 diff --git a/ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll b/ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll new file mode 100644 index 00000000..3fa5a409 --- /dev/null +++ b/ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d1943ac0ec73f1bf954fcaa631ec322a23ab2af7e65af5c31bf90e45cae48a7 +size 361984