lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-23 22:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update code for new SSL libraries in new Qt version

Browse Source
This commit is contained in:
baldurk
2021-01-27 17:06:09 +00:00
parent bddbc53226
commit 40b86b63fb
4 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/Dialogs/CrashDialog.cpp
+17
View File
@@ -184,10 +184,27 @@ CrashDialog::CrashDialog(PersistantConfig &cfg, QVariantMap crashReportJSON, QWi
"libraries needed for SSL support. "
"If you are building locally, check that ");
#if(QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
#if defined(Q_OS_WIN32)
#if QT_POINTER_SIZE == 8
text +=
tr("you have libcrypto-1_1-64.dll and libssl-1_1-64.dll available next to qrenderdoc.exe.");
#else
text += tr("you have libcrypto-1_1.dll and libssl-1_1.dll available next to qrenderdoc.exe.");
#endif
#else
text += tr("you have the runtime libopenssl library >= 1.1.1 available in your system.");
#endif
#else
#if defined(Q_OS_WIN32)
text += tr("you have libeay32.dll and ssleay32.dll available next to qrenderdoc.exe.");
#else
text += tr("you have the runtime libopenssl library >= 1.0.0 available in your system.");
#endif
#endif
text += lit("</p>");
qrenderdoc/qrenderdoc_local.vcxproj
+20
View File
@@ -1796,6 +1796,26 @@ IF %ERRORLEVEL% NEQ 0 (echo ====================================================
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(QtBinDir)\libcrypto-1_1.dll" Condition="Exists('$(QtBinDir)\libcrypto-1_1.dll') AND '$(Platform)'=='Win32'">
<Link>libcrypto-1_1.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(QtBinDir)\libssl-1_1.dll" Condition="Exists('$(QtBinDir)\libssl-1_1.dll') AND '$(Platform)'=='Win32'">
<Link>libssl-1_1.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(QtBinDir)\libcrypto-1_1-x64.dll" Condition="Exists('$(QtBinDir)\libcrypto-1_1-x64.dll') AND '$(Platform)'=='x64'">
<Link>libcrypto-1_1-x64.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(QtBinDir)\libssl-1_1-x64.dll" Condition="Exists('$(QtBinDir)\libssl-1_1-x64.dll') AND '$(Platform)'=='x64'">
<Link>libssl-1_1-x64.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</Content>
<Content Include="$(QtBinDir)\libeay32.dll" Condition="Exists('$(QtBinDir)\libeay32.dll')">
<Link>libeay32.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>