From f52988b93cd5838ab75f12a143edc6ba0d862b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Mon, 10 Aug 2015 04:47:50 -0400 Subject: [PATCH] Run devenv /upgrade This ensures the solution can do round-tripping. --- .../build/msw/wx30_adv_vs2013.vcxproj | 2 +- .../build/msw/wx30_base_vs2013.vcxproj | 2 +- .../build/msw/wx30_config_vs2013.vcxproj | 4 ++-- .../build/msw/wx30_core_vs2013.vcxproj | 4 ++-- old_plugins_2013.sln | 15 --------------- pcsx2_suite_2013.sln | 5 +---- plugins/GSdx/GSdx_vs2013.vcxproj | 6 ++++++ plugins/zerospu2/Windows/ZeroSPU2_vs2013.vcxproj | 14 ++++++++++++++ .../opengl/Win32/zerogsogl_vs2013.vcxproj | 8 ++++++++ 9 files changed, 35 insertions(+), 25 deletions(-) diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj index b8067a3e6..05bf03411 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj index 48ac4b634..65618c1ee 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj index 4b86ce227..687223f39 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -159,4 +159,4 @@ - + \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj index c9e846517..6dcc9621c 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -2341,4 +2341,4 @@ - + \ No newline at end of file diff --git a/old_plugins_2013.sln b/old_plugins_2013.sln index 853754617..310c48387 100644 --- a/old_plugins_2013.sln +++ b/old_plugins_2013.sln @@ -32,9 +32,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wx", "wx", "{62BF822E-6A12- EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroGS", "plugins\zerogs\dx\Windows\zerogs_vs2013.vcxproj", "{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}" - ProjectSection(ProjectDependencies) = postProject - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} = {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDiso", "plugins\CDVDiso\src\Windows\CDVDiso_vs2013.vcxproj", "{5F78E90B-BD22-47B1-9CA5-7A80F4DF5EF3}" EndProject @@ -47,11 +44,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w32pthreads.v4", "3rdparty\w32pthreads\pthreads_vs2013.vcxproj", "{26511268-2902-4997-8421-ECD7055F9E28}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroSPU2", "plugins\zerospu2\Windows\ZeroSPU2_vs2013.vcxproj", "{7F059854-568D-4E08-9D00-1E78E203E4DC}" - ProjectSection(ProjectDependencies) = postProject - {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D} = {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D} - {26511268-2902-4997-8421-ECD7055F9E28} = {26511268-2902-4997-8421-ECD7055F9E28} - {7E9B2BE7-CEC3-4F14-847B-0AB8D562FB86} = {7E9B2BE7-CEC3-4F14-847B-0AB8D562FB86} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDolio", "plugins\CDVDolio\cdvd_vs2013.vcxproj", "{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}" EndProject @@ -66,13 +58,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PadSSSPSX", "plugins\SSSPSXPAD\PadSSSPSX_vs2013.vcxproj", "{6C8D28E4-447E-4856-BD9E-6B8F5E7C58C9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZZOgl", "plugins\zzogl-pg\opengl\Win32\zerogsogl_vs2013.vcxproj", "{2D4E85B2-F47F-4D65-B091-701E5C031DAC}" - ProjectSection(ProjectDependencies) = postProject - {4639972E-424E-4E13-8B07-CA403C481346} = {4639972E-424E-4E13-8B07-CA403C481346} - {BC236261-77E8-4567-8D09-45CD02965EB6} = {BC236261-77E8-4567-8D09-45CD02965EB6} - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} = {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBqemu", "plugins\USBqemu\Win32\USBqemu_vs2013.vcxproj", "{E613DA9F-41B4-4613-9911-E418EF5533BC}" EndProject diff --git a/pcsx2_suite_2013.sln b/pcsx2_suite_2013.sln index 7cf18faa9..fdd9e11fe 100644 --- a/pcsx2_suite_2013.sln +++ b/pcsx2_suite_2013.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nulls", "Nulls", "{E1828E40-2FBB-48FE-AE7F-5587755DCE0E}" EndProject @@ -40,9 +40,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\src\Windows\Spu2-X_vs2013.vcxproj", "{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs2013.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" - ProjectSection(ProjectDependencies) = postProject - {D80D4A75-C385-41BD-AE62-83D2E2B595A7} = {D80D4A75-C385-41BD-AE62-83D2E2B595A7} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soundtouch\SoundTouch_vs2013.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}" EndProject diff --git a/plugins/GSdx/GSdx_vs2013.vcxproj b/plugins/GSdx/GSdx_vs2013.vcxproj index fa8435df6..f5f0f67d0 100644 --- a/plugins/GSdx/GSdx_vs2013.vcxproj +++ b/plugins/GSdx/GSdx_vs2013.vcxproj @@ -2082,6 +2082,12 @@ + + + {d80d4a75-c385-41bd-ae62-83d2e2b595a7} + false + + diff --git a/plugins/zerospu2/Windows/ZeroSPU2_vs2013.vcxproj b/plugins/zerospu2/Windows/ZeroSPU2_vs2013.vcxproj index 32f19db01..0c1bc5680 100644 --- a/plugins/zerospu2/Windows/ZeroSPU2_vs2013.vcxproj +++ b/plugins/zerospu2/Windows/ZeroSPU2_vs2013.vcxproj @@ -156,6 +156,20 @@ + + + {e9b51944-7e6d-4bcd-83f2-7bbd5a46182d} + false + + + {7e9b2be7-cec3-4f14-847b-0ab8d562fb86} + false + + + {26511268-2902-4997-8421-ecd7055f9e28} + false + + diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs2013.vcxproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs2013.vcxproj index bd8f9a964..ad47bf0c5 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs2013.vcxproj +++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs2013.vcxproj @@ -255,6 +255,14 @@ true false + + {3fcc50c2-81e9-5db2-b8d8-2129427568b1} + false + + + {6744dad8-9c70-574a-bff2-9f8dddb24a75} + false + {2f6c0388-20cb-4242-9f6c-a6ebb6a83f47} true