From 1964bbc03ae41de3c569cd92765daaaf405888d7 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 13 May 2023 15:29:07 +1000 Subject: [PATCH] MSBuild: Rename pcsx2core to pcsx2 No need to differentiate it, since wx is gone. --- PCSX2_qt.sln | 2 +- pcsx2-gsrunner/pcsx2-gsrunner.vcxproj | 2 +- pcsx2-qt/pcsx2-qt.vcxproj | 2 +- pcsx2/CMakeLists.txt | 2 +- pcsx2/{pcsx2core.vcxproj => pcsx2.vcxproj} | 4 +--- pcsx2/{pcsx2core.vcxproj.filters => pcsx2.vcxproj.filters} | 0 6 files changed, 5 insertions(+), 7 deletions(-) rename pcsx2/{pcsx2core.vcxproj => pcsx2.vcxproj} (99%) rename pcsx2/{pcsx2core.vcxproj.filters => pcsx2.vcxproj.filters} (100%) diff --git a/PCSX2_qt.sln b/PCSX2_qt.sln index 494ac666c0..b065371cf1 100644 --- a/PCSX2_qt.sln +++ b/PCSX2_qt.sln @@ -25,7 +25,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpgd", "3rdparty\jpgd\jpgd. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{4639972E-424E-4E13-8B07-CA403C481346}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2core", "pcsx2\pcsx2core.vcxproj", "{6C7986C4-3E4D-4DCC-B3C6-6BB12B238995}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\pcsx2.vcxproj", "{6C7986C4-3E4D-4DCC-B3C6-6BB12B238995}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "3rdparty\glad\glad.vcxproj", "{C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A}" EndProject diff --git a/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj b/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj index 88e6e101ec..a8240a3718 100644 --- a/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj +++ b/pcsx2-gsrunner/pcsx2-gsrunner.vcxproj @@ -106,7 +106,7 @@ {4639972e-424e-4e13-8b07-ca403c481346} - + {6c7986c4-3e4d-4dcc-b3c6-6bb12b238995} diff --git a/pcsx2-qt/pcsx2-qt.vcxproj b/pcsx2-qt/pcsx2-qt.vcxproj index 50a83f7723..2a7b33b5e8 100644 --- a/pcsx2-qt/pcsx2-qt.vcxproj +++ b/pcsx2-qt/pcsx2-qt.vcxproj @@ -118,7 +118,7 @@ {4639972e-424e-4e13-8b07-ca403c481346} - + {6c7986c4-3e4d-4dcc-b3c6-6bb12b238995} diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index c55e110201..fdd7e48a34 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1391,7 +1391,7 @@ function(setup_main_executable target) endif() endfunction() -source_groups_from_vcxproj_filters(pcsx2core.vcxproj.filters) +source_groups_from_vcxproj_filters(pcsx2.vcxproj.filters) # Unix-only files aren't in the vcxproj.filters source_group(System/Ps2/DEV9 REGULAR_EXPRESSION DEV9/*) diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2.vcxproj similarity index 99% rename from pcsx2/pcsx2core.vcxproj rename to pcsx2/pcsx2.vcxproj index 6bc897c0c8..d0202e016a 100644 --- a/pcsx2/pcsx2core.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -30,9 +30,7 @@ AllRules.ruleset - pcsx2core - $(ProjectDir)pcsx2core\$(Platform)\$(Configuration)\ - $(ProjectDir)pcsx2core\$(Platform)\$(Configuration)\ + pcsx2 diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters similarity index 100% rename from pcsx2/pcsx2core.vcxproj.filters rename to pcsx2/pcsx2.vcxproj.filters