1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00

Fix install paths

Add openSSL to readme as dep
This commit is contained in:
Elias Steurer 2020-01-18 14:33:33 +01:00
parent d110fbc9d2
commit bfd7a839de
3 changed files with 9 additions and 4 deletions

View File

@ -41,6 +41,7 @@ git clone https://gitlab.com/kelteseth/ScreenPlay.git
* This will install these dependencies via __vcpkg__ * This will install these dependencies via __vcpkg__
* libzippp * libzippp
* nlohmann-json * nlohmann-json
* openSSL 1.1.1d
* Download these dependencies via __git submodules__ * Download these dependencies via __git submodules__
* stomt-qt-sdk * stomt-qt-sdk
* qt-google-analytics * qt-google-analytics

View File

@ -37,11 +37,13 @@ win32 {
src/winwindow.h src/winwindow.h
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
install_it.path = $${OUT_PWD}/debug/
install_it.files += \ install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.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 \ $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \
} else { } else {
install_it.path = $${OUT_PWD}/release/
install_it.files += \ install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.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 \ $$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \
@ -73,12 +75,10 @@ macx {
!macx { !macx {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += -lScreenPlaySDKd LIBS += -lScreenPlaySDKd
install_it.path = $${OUT_PWD}/debug/
QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/debug QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/debug
} else { } else {
LIBS += -lScreenPlaySDK LIBS += -lScreenPlaySDK
install_it.path = $${OUT_PWD}/release/
QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/release QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/release
} }
QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK

View File

@ -20,11 +20,13 @@ include(../ScreenPlaySDK/ScreenPlaySDK.pri)
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
install_it.path = $${OUT_PWD}/debug/
install_it.files += \ install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.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 \ $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \
} else { } else {
install_it.path = $${OUT_PWD}/release/
install_it.files += \ install_it.files += \
$$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.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 \ $$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \
@ -47,3 +49,5 @@ macx: {
} }
QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK
} }
INSTALLS += install_it