Skip to content

Commit

Permalink
Build: Remove references to the old Avast demangler
Browse files Browse the repository at this point in the history 
It was removed in favour of the proper GNU demangler.
  • Loading branch information
@chaoticgd
chaoticgd committed Feb 24, 2024
1 parent ba206a6 commit 420c237
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 59 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/demangler/demangler.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion 3rdparty/demangler/demangler.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>
75 changes: 25 additions & 50 deletions PCSX2_qt.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,30 +718,30 @@ Global
{67D0160C-0FE4-44B9-AC2E-82BBCF4104DF}.Release Clang|x64.Build.0 = Release Clang|x64
{67D0160C-0FE4-44B9-AC2E-82BBCF4104DF}.Release|x64.ActiveCfg = Release|x64
{67D0160C-0FE4-44B9-AC2E-82BBCF4104DF}.Release|x64.Build.0 = Release|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug AVX2|x64.ActiveCfg = Debug|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug AVX2|x64.Build.0 = Debug|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug Clang AVX2|x64.ActiveCfg = Debug Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug Clang AVX2|x64.Build.0 = Debug Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug Clang|x64.ActiveCfg = Debug Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug Clang|x64.Build.0 = Debug Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug|x64.ActiveCfg = Debug|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Debug|x64.Build.0 = Debug|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel AVX2|x64.ActiveCfg = Devel|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel AVX2|x64.Build.0 = Devel|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel Clang AVX2|x64.ActiveCfg = Devel Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel Clang AVX2|x64.Build.0 = Devel Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel Clang|x64.ActiveCfg = Devel Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel Clang|x64.Build.0 = Devel Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel|x64.ActiveCfg = Devel|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Devel|x64.Build.0 = Devel|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release AVX2|x64.ActiveCfg = Release|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release AVX2|x64.Build.0 = Release|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release Clang AVX2|x64.ActiveCfg = Release Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release Clang AVX2|x64.Build.0 = Release Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release Clang|x64.ActiveCfg = Release Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release Clang|x64.Build.0 = Release Clang|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release|x64.ActiveCfg = Release|x64
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F}.Release|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release AVX2|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release AVX2|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang AVX2|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang AVX2|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release|x64.Build.0 = Release|x64
{522DAF2A-1F24-4742-B2C4-A956411F6AB2}.Debug AVX2|x64.ActiveCfg = Debug|x64
{522DAF2A-1F24-4742-B2C4-A956411F6AB2}.Debug AVX2|x64.Build.0 = Debug|x64
{522DAF2A-1F24-4742-B2C4-A956411F6AB2}.Debug Clang AVX2|x64.ActiveCfg = Debug Clang|x64
Expand Down Expand Up @@ -790,30 +790,6 @@ Global
{39098635-446A-4FC3-9B1C-8609D94598A8}.Release Clang|x64.Build.0 = Release Clang|x64
{39098635-446A-4FC3-9B1C-8609D94598A8}.Release|x64.ActiveCfg = Release|x64
{39098635-446A-4FC3-9B1C-8609D94598A8}.Release|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug Clang|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Debug|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang AVX2|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang AVX2|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel Clang|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel|x64.ActiveCfg = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Devel|x64.Build.0 = Debug|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release AVX2|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release AVX2|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang AVX2|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang AVX2|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release Clang|x64.Build.0 = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release|x64.ActiveCfg = Release|x64
{D31A6DD1-99CA-41D8-A230-1FAE913C8989}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -841,10 +817,9 @@ Global
{95DD0A0C-D14D-4CFF-A593-820EF26EFCC8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{E960DFDF-1BD3-4C29-B251-D1A0919C9B09} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{67D0160C-0FE4-44B9-AC2E-82BBCF4104DF} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{1E3D706C-1D95-4E1B-BDF2-CA3D0007DF7F} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{D31A6DD1-99CA-41D8-A230-1FAE913C8989} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{522DAF2A-1F24-4742-B2C4-A956411F6AB2} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{39098635-446A-4FC3-9B1C-8609D94598A8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
{D31A6DD1-99CA-41D8-A230-1FAE913C8989} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0BC474EA-3628-45D3-9DBC-E22D0B7E0F77}
Expand Down
5 changes: 1 addition & 4 deletions pcsx2-qt/pcsx2-qt.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@
<ProjectReference Include="..\3rdparty\lzma\lzma.vcxproj">
<Project>{a4323327-3f2b-4271-83d9-7f9a3c66b6b2}</Project>
</ProjectReference>
<ProjectReference Include="..\3rdparty\demangler\demangler.vcxproj">
<Project>{1e3d706c-1d95-4e1b-bdf2-ca3d0007df7f}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\pcsx2\windows\PCSX2.manifest" />
Expand Down Expand Up @@ -463,4 +460,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(SolutionDir)common\vsprops\QtCompile.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion pcsx2-qt/pcsx2-qt.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -733,4 +733,4 @@
<Filter>Translations</Filter>
</QtTs>
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion pcsx2/pcsx2.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,4 +902,4 @@
<Import Condition="$(Configuration.Contains(Debug)) Or $(Configuration.Contains(Devel))" Project="$(SolutionDir)3rdparty\winpixeventruntime\WinPixEventRuntime.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion pcsx2/pcsx2.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2446,4 +2446,4 @@
<Filter>System\Ps2\GS</Filter>
</Natvis>
</ItemGroup>
</Project>
</Project>

0 comments on commit 420c237

Please sign in to comment.