From 2a3c29a0cc4dbcb0fa6cd7889e7612af9e50f5ac Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Fri, 18 Sep 2020 17:44:03 +0200 Subject: [PATCH] Fix dependencies --- ScreenPlay/CMakeLists.txt | 5 ----- ScreenPlay/src/util.h | 4 +--- install_dependencies_windows.bat | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 202a854a..c437f89c 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -18,13 +18,9 @@ find_package( LinguistTools REQUIRED) -find_package(ZLIB REQUIRED) find_package(OpenSSL REQUIRED) -find_package(libzippp CONFIG REQUIRED) find_package(sentry CONFIG REQUIRED) - - set(src main.cpp app.cpp ../Common/qt-google-analytics/ganalytics.cpp @@ -104,7 +100,6 @@ target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Core Qt5::WebEngine - libzippp::libzippp sentry::sentry ScreenPlaySDK ) diff --git a/ScreenPlay/src/util.h b/ScreenPlay/src/util.h index e608a8cd..42875d79 100644 --- a/ScreenPlay/src/util.h +++ b/ScreenPlay/src/util.h @@ -58,7 +58,7 @@ #include #include "globalvariables.h" -#include "libzippp.h" + namespace ScreenPlay { @@ -144,8 +144,6 @@ public slots: emit debugMessagesChanged(m_debugMessages); } -private: - bool saveExtractedByteArray(libzippp::ZipEntry& entry, std::string& absolutePathAndName); private: QNetworkAccessManager* m_networkAccessManager { nullptr }; diff --git a/install_dependencies_windows.bat b/install_dependencies_windows.bat index 92db827c..83abd1ed 100644 --- a/install_dependencies_windows.bat +++ b/install_dependencies_windows.bat @@ -9,7 +9,7 @@ git checkout 18ab4b72a26284f0df28295ce7bf9b21c96f20f4 call bootstrap-vcpkg.bat rem Install vcpkg dependencies -vcpkg.exe install openssl --triplet x64-windows --recurse +vcpkg.exe install openssl sentry-native --triplet x64-windows --recurse cd .. cd ..