We need from now on Qt 5.13 because of the upgrade of OpenSSL from 1 to 1.1.1

2024-09-14 22:42:34 +02:00 · 2019-07-27 11:10:12 +02:00 · 2019-07-27 11:10:12 +02:00 · 6c5a8f9049
commit 6c5a8f9049
parent 974c737dc4
6 changed files with 21 additions and 18 deletions
--- a/README.md
+++ b/README.md
@ -3,9 +3,9 @@
 </div>

 <div align="center">
-ScreenPlay is an open source cross plattform app for displaying Wallpaper, Widgets and AppDrawer. It is written in modern C++17/Qt5/QML. Binaries with workshop support are available for Windows/Linux/MacOSX via <a href="https://store.steampowered.com/about/">Steam</a>. 
+ScreenPlay is an open source cross platform app for displaying Wallpaper, Widgets and AppDrawer. It is written in modern C++17/Qt5/QML. Binaries with workshop support are available for Windows/Linux/MacOSX via <a href="https://store.steampowered.com/about/">Steam</a>. 
 Join our community: <a href="https://screen-play.app/">Homepage</a>, <a href="https://forum.screen-play.app/">Forum</a>, <a href="https://discord.gg/3RygPHZ">Discord</a>
-<br> Visit our <a href="https://aimber.gitlab.io/ScreenPlayDocs/"> Developer Documentation</a> and our <a href="https://aimber.gitlab.io/ScreenPlayDocs/"> Getting Started Guide</a>!
+<br> Visit our <a href="https://kelteseth.gitlab.io/ScreenPlayDocs/"> Developer Documentation</a> and our <a href="https://kelteseth.gitlab.io/ScreenPlayDocs/"> Getting Started Guide</a>!
 <br>
 <h3><a href="https://steamcommunity.com/app/672870/">Download ScreenPlay!</a></h3>

@ -14,7 +14,7 @@ Join our community: <a href="https://screen-play.app/">Homepage</a>, <a href="ht

 ## Contributing

-Everyone can contribute with code, design, documentation or translation. Visit our [contributing guide](https://gitlab.com/aimber/ScreenPlay/blob/dev/CONTRIBUTING.md) for more informations.
+Everyone can contribute with code, design, documentation or translation. Visit our [contributing guide](https://gitlab.com/kelteseth/ScreenPlay/blob/dev/CONTRIBUTING.md) for more informations.

 # Getting started

@ -23,20 +23,23 @@ Everyone can contribute with code, design, documentation or translation. Visit o
 2. Download ScreenPlay with  __all submodules__
 ``` bash
 # HTTPS
-git clone --recursive https://gitlab.com/aimber/ScreenPlay.git
+git clone --recursive https://gitlab.com/kelteseth/ScreenPlay.git
 ```
 ### Windows
-1. [Download and install MSVC 2017 Community](https://visualstudio.microsoft.com/vs/community/)
+1. [Download and install MSVC 2019 Community](https://visualstudio.microsoft.com/vs/community/)
 2. [Download and install Win 10 SDK (debugging support. Not included via the MSVC installer)](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
    - Select debugging support during the installation (CDB)
 3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
    - Install the Maintaince tool
    - Select the following features to install:
-        - Qt 5.12.0 LTS
-            - MSVC 2017 64-bit
+        - Qt 5.13.0 
+            - MSVC 2019 (updated MSVC 2017 should work too) 64-bit
            - Qt WebEngine
        - Tools
            - Qt Creator 4.x CDB Debugger Support
+4. Start the vcpkg-install-dependencies.bat for the automatic dependencies management.
+
+
 ### Linux
 1. Install dependencies for your distro:
 ``` bash
@ -53,7 +56,7 @@ sudo zypper install -t pattern devel_basis
 2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
    - Install the Maintaince tool
    - Select the following features to install:
-        - Qt 5.12.0 LTS
+        - Qt 5.13.0
            - GCC
            - Qt WebEngine
 ### OSX
@ -63,6 +66,6 @@ sudo zypper install -t pattern devel_basis
 3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
    - Install the Maintaince tool
    - Select the following features to install:
-        - Qt 5.12.0 LTS
+        - Qt 5.13.0
            - Qt WebEngine
-4. Change your default kit: QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 5.11.2) -> Change c and c++ Compiler to Apple Clang (x86_64)
+4. Change your default kit: QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 5.13.0) -> Change c and c++ Compiler to Apple Clang (x86_64)
--- a/ScreenPlay/ScreenPlay.pro
+++ b/ScreenPlay/ScreenPlay.pro
@ -87,8 +87,8 @@ CONFIG(debug, debug|release) {

    LIBS += -luser32
    install_it.files += \
-                        Common/vcpkg/packages/openssl-windows_x64-windows/bin/libeay32.dll \
-                        Common/vcpkg/packages/openssl-windows_x64-windows/bin/ssleay32.dll \
+                        Common/vcpkg/packages/openssl-windows_x64-windows/bin/libcrypto-1_1-x64.dll \
+                        Common/vcpkg/packages/openssl-windows_x64-windows/bin/libssl-1_1-x64.dll \
 }


--- a/ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll
+++ b/ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d9286a9a225746890acf1325dbe24301536cbbe370c28467bb63918da07beb1
+size 3407360
--- a/ScreenPlay/ThirdParty/OpenSSL/libeay32.dll
+++ b/ScreenPlay/ThirdParty/OpenSSL/libeay32.dll
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7b8544110ad44015fef87135a02edce8aa5084f6468532574a89556767490bb
-size 2278400
--- a/ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll
+++ b/ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1917eb05675a807fe05cc89c0cab05911474dbc8883faa16cd1cb34086c3944
+size 681472
--- a/ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll
+++ b/ScreenPlay/ThirdParty/OpenSSL/ssleay32.dll
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d1943ac0ec73f1bf954fcaa631ec322a23ab2af7e65af5c31bf90e45cae48a7
-size 361984