VSProps: Fix Qt TLS plugins not getting copied

This commit is contained in:
Connor McLaughlin 2022-04-13 20:23:21 +10:00 committed by refractionpcsx2
parent f270f34865
commit 59d6113ee4
1 changed files with 10 additions and 2 deletions

View File

@ -124,14 +124,17 @@
<QtPlugins Condition="$(Configuration.Contains(Debug))" Include="@(QtAllPlugins)" /> <QtPlugins Condition="$(Configuration.Contains(Debug))" Include="@(QtAllPlugins)" />
<QtPlugins Condition="!$(Configuration.Contains(Debug))" Exclude="$(QtPluginsDir)**\*$(QtDebugSuffix).dll" Include="@(QtAllPlugins)" /> <QtPlugins Condition="!$(Configuration.Contains(Debug))" Exclude="$(QtPluginsDir)**\*$(QtDebugSuffix).dll" Include="@(QtAllPlugins)" />
<QtPluginsDest Include="@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')" /> <QtPluginsDest Include="@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
<!--Our normal *d filter fails for the TLS DLLs, because backend ends in d. -->
<QtTLSDlls Include="$(QtPluginsDir)tls\qcertonlybackend$(QtLibSuffix).dll;$(QtPluginsDir)tls\qschannelbackend$(QtLibSuffix).dll" />
<QtTLSDllsDest Include="@(QtTLSDlls -> '$(BinaryOutputDir)$(QtPluginFolder)\tls\%(Filename)%(Extension)')" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<QtConfFile>$(BinaryOutputDir)qt.conf</QtConfFile> <QtConfFile>$(BinaryOutputDir)qt.conf</QtConfFile>
</PropertyGroup> </PropertyGroup>
<Target Name="QtCopyBinaries" <Target Name="QtCopyBinaries"
AfterTargets="Build" AfterTargets="Build"
Inputs="@(QtDlls);@(QtPlugins)" Inputs="@(QtDlls);@(QtPlugins);@(QtTLSDlls)"
Outputs="@(QtDlls -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)');@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')"> Outputs="@(QtDlls -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)');@(QtPluginsDest);@(QtTLSDllsDest)">
<Message Text="Copying Qt .dlls" Importance="High" /> <Message Text="Copying Qt .dlls" Importance="High" />
<Copy <Copy
SourceFiles="@(QtDlls)" SourceFiles="@(QtDlls)"
@ -143,6 +146,11 @@
DestinationFiles="@(QtPluginsDest)" DestinationFiles="@(QtPluginsDest)"
SkipUnchangedFiles="true" SkipUnchangedFiles="true"
/> />
<Copy
SourceFiles="@(QtTLSDlls)"
DestinationFiles="@(QtTLSDllsDest)"
SkipUnchangedFiles="true"
/>
</Target> </Target>
<Target Name="QtCreateConf" <Target Name="QtCreateConf"
BeforeTargets="QtCopyBinaries" BeforeTargets="QtCopyBinaries"