Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Code Issues Projects Releases Activity

Update openSSL to 1.1.1d via vcpkg now

Browse Source
This commit is contained in:
Elias Steurer 2020-01-18 14:20:39 +01:00
parent 20d2667548
commit d110fbc9d2
4 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ScreenPlay/ScreenPlay.pro
View File

@ -77,28 +77,28 @@ win32 {
RC_ICONS += favicon.ico
INCLUDEPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
DEPENDPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-windows/lib/ -llibzippp
CONFIG(debug, debug|release) {
install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zip.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zlibd1.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libzippp.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/bz2d.dll \
} else {
install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/bin/zip.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/zlib1.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libzippp.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/bz2.dll \
}
DEPENDPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
LIBS += -luser32
install_it.files += \
$$PWD/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll \
$$PWD/ThirdParty/OpenSSL/libssl-1_1-x64.dll \
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-windows/lib/ -llibzippp
CONFIG(debug, debug|release) {
install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zip.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zlibd1.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libzippp.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/bz2d.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \
} else {
install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/bin/zip.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/zlib1.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libzippp.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/bz2.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \
}
}

11
ScreenPlayWallpaper/ScreenPlayWallpaper.pro
View File

@ -35,6 +35,17 @@ win32 {
HEADERS += \
src/windowsdesktopproperties.h \
src/winwindow.h
CONFIG(debug, debug|release) {
install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \
} else {
install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \
}
}
include(../ScreenPlaySDK/ScreenPlaySDK.pri)

18
ScreenPlayWidget/ScreenPlayWidget.pro
View File

@ -15,6 +15,24 @@ RESOURCES += \
include(../ScreenPlaySDK/ScreenPlaySDK.pri)
win32 {
CONFIG(debug, debug|release) {
install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \
} else {
install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.dll \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \
}
}
macx: {
QMAKE_LIBDIR += $$OUT_PWD/
}

2
install-dependencies.bat
View File

@ -6,5 +6,5 @@ cd vcpkg
git pull
git checkout origin/master
call bootstrap-vcpkg.bat
vcpkg.exe install libzippp:x64-windows nlohmann-json:x64-windows
vcpkg.exe install libzippp:x64-windows nlohmann-json:x64-windows openssl:x64-windows
pause