From a21c85266c3d7d2971c97f3cf1b4125da6147bbf Mon Sep 17 00:00:00 2001 From: gigaherz Date: Sun, 19 Aug 2012 19:54:12 +0000 Subject: [PATCH] Make PCSX2 compile with Visual Studio 2012 (3/3): Upgrade the project files and fix a few project names. Update the .sln to point to the right project files. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5384 96395faa-99c1-11dd-bbfe-3dabce05a288 --- 3rdparty/SoundTouch/SoundTouch_vs11.vcxproj | 4 ++ 3rdparty/bzip2/bzip2_vs11.vcxproj | 4 ++ 3rdparty/glew/glew_static_vs11.vcxproj | 3 + 3rdparty/libjpeg/libjpeg_vs11.vcxproj | 3 + .../build/msvc/portaudio_vs11.vcxproj | 9 +++ .../w32pthreads/pthreads_lib_vs11.vcxproj | 3 + 3rdparty/w32pthreads/pthreads_vs11.vcxproj | 3 + .../wxWidgets/build/msw/wx_adv_vs11.vcxproj | 3 + .../wxWidgets/build/msw/wx_base_vs11.vcxproj | 3 + .../build/msw/wx_config_vs11.vcxproj | 3 + .../wxWidgets/build/msw/wx_core_vs11.vcxproj | 3 + 3rdparty/zlib/zlib_vs11.vcxproj | 4 ++ common/build/Utilities/utilities_vs11.vcxproj | 4 ++ .../build/x86emitter/x86emitter_vs11.vcxproj | 4 ++ pcsx2/windows/VCprojects/pcsx2_vs11.vcxproj | 3 + pcsx2_suite_2012.sln | 70 +++++++++---------- .../CDVDiso/src/Windows/CDVDiso_vs11.vcxproj | 3 + .../CDVDnull/Windows/CDVDnull_vs11.vcxproj | 1 + plugins/CDVDolio/cdvd_vs11.vcxproj | 22 ++++++ plugins/FWnull/Windows/FWnull_vs11.vcxproj | 2 + plugins/GSdx/GSdx_vs11.vcxproj | 18 ++++- plugins/GSnull/Windows/GSnull_vs11.vcxproj | 2 + plugins/LilyPad/LilyPad_vs11.vcxproj | 6 ++ plugins/PadNull/Windows/PadNull_vs11.vcxproj | 2 + plugins/SSSPSXPAD/PadSSSPSX_vs11.vcxproj | 2 + plugins/USBnull/Windows/USBnull_vs11.vcxproj | 2 + plugins/USBqemu/Win32/USBqemu_vs11.vcxproj | 3 + .../src/Windows/cdvdGigaherz_vs11.vcxproj | 2 + .../dev9null/Windows/DEV9null_vs11.vcxproj | 2 + .../spu2-x/src/Windows/Spu2-X_vs11.vcxproj | 4 ++ plugins/xpad/xpad_vs11.vcxproj | 20 ++++++ plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj | 3 + .../zerospu2/Windows/ZeroSPU2_vs11.vcxproj | 3 + .../opengl/Win32/zerogsogl-cg_vs11.vcxproj | 5 +- .../opengl/Win32/zerogsogl_vs11.vcxproj | 5 +- tools/bin2cpp/bin2c_vs11.vcxproj | 2 + 36 files changed, 197 insertions(+), 38 deletions(-) diff --git a/3rdparty/SoundTouch/SoundTouch_vs11.vcxproj b/3rdparty/SoundTouch/SoundTouch_vs11.vcxproj index 322da4f668..5d06a6c95a 100644 --- a/3rdparty/SoundTouch/SoundTouch_vs11.vcxproj +++ b/3rdparty/SoundTouch/SoundTouch_vs11.vcxproj @@ -17,21 +17,25 @@ {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D} SoundTouch + SoundTouch StaticLibrary MultiByte true + v110 StaticLibrary MultiByte true + v110 StaticLibrary MultiByte + v110 diff --git a/3rdparty/bzip2/bzip2_vs11.vcxproj b/3rdparty/bzip2/bzip2_vs11.vcxproj index bc996a6bbc..17eb496ca6 100644 --- a/3rdparty/bzip2/bzip2_vs11.vcxproj +++ b/3rdparty/bzip2/bzip2_vs11.vcxproj @@ -17,21 +17,25 @@ {F4EB4AB2-C595-4B05-8BC0-059024BC796C} bzip2 + bzip2 StaticLibrary MultiByte false + v110 StaticLibrary MultiByte true + v110 StaticLibrary MultiByte + v110 diff --git a/3rdparty/glew/glew_static_vs11.vcxproj b/3rdparty/glew/glew_static_vs11.vcxproj index 2da4e8bb39..c920124613 100644 --- a/3rdparty/glew/glew_static_vs11.vcxproj +++ b/3rdparty/glew/glew_static_vs11.vcxproj @@ -24,15 +24,18 @@ StaticLibrary MultiByte false + v110 StaticLibrary MultiByte true + v110 StaticLibrary MultiByte + v110 diff --git a/3rdparty/libjpeg/libjpeg_vs11.vcxproj b/3rdparty/libjpeg/libjpeg_vs11.vcxproj index cddcd2badc..9c52b0333d 100644 --- a/3rdparty/libjpeg/libjpeg_vs11.vcxproj +++ b/3rdparty/libjpeg/libjpeg_vs11.vcxproj @@ -25,15 +25,18 @@ StaticLibrary Unicode false + v110 StaticLibrary Unicode true + v110 StaticLibrary Unicode + v110 diff --git a/3rdparty/portaudio/build/msvc/portaudio_vs11.vcxproj b/3rdparty/portaudio/build/msvc/portaudio_vs11.vcxproj index d4d82d6fa2..4296667968 100644 --- a/3rdparty/portaudio/build/msvc/portaudio_vs11.vcxproj +++ b/3rdparty/portaudio/build/msvc/portaudio_vs11.vcxproj @@ -37,41 +37,50 @@ {0A18A071-125E-442F-AFF7-A3F68ABECF99} portaudio + portaudio StaticLibrary false + v110 StaticLibrary false true + v110 StaticLibrary false + v110 StaticLibrary false true + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 DynamicLibrary false + v110 diff --git a/3rdparty/w32pthreads/pthreads_lib_vs11.vcxproj b/3rdparty/w32pthreads/pthreads_lib_vs11.vcxproj index 0ad59fc823..89ee931f32 100644 --- a/3rdparty/w32pthreads/pthreads_lib_vs11.vcxproj +++ b/3rdparty/w32pthreads/pthreads_lib_vs11.vcxproj @@ -25,15 +25,18 @@ StaticLibrary MultiByte false + v110 StaticLibrary MultiByte true + v110 StaticLibrary MultiByte + v110 diff --git a/3rdparty/w32pthreads/pthreads_vs11.vcxproj b/3rdparty/w32pthreads/pthreads_vs11.vcxproj index 9742b1eda8..cc38d309c3 100644 --- a/3rdparty/w32pthreads/pthreads_vs11.vcxproj +++ b/3rdparty/w32pthreads/pthreads_vs11.vcxproj @@ -25,15 +25,18 @@ DynamicLibrary MultiByte false + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/3rdparty/wxWidgets/build/msw/wx_adv_vs11.vcxproj b/3rdparty/wxWidgets/build/msw/wx_adv_vs11.vcxproj index a1aa64ab16..90b3f601fc 100644 --- a/3rdparty/wxWidgets/build/msw/wx_adv_vs11.vcxproj +++ b/3rdparty/wxWidgets/build/msw/wx_adv_vs11.vcxproj @@ -25,17 +25,20 @@ false Unicode false + v110 StaticLibrary false Unicode true + v110 StaticLibrary false Unicode + v110 diff --git a/3rdparty/wxWidgets/build/msw/wx_base_vs11.vcxproj b/3rdparty/wxWidgets/build/msw/wx_base_vs11.vcxproj index a35217d902..6894f6120e 100644 --- a/3rdparty/wxWidgets/build/msw/wx_base_vs11.vcxproj +++ b/3rdparty/wxWidgets/build/msw/wx_base_vs11.vcxproj @@ -25,17 +25,20 @@ false Unicode false + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode true + v110 diff --git a/3rdparty/wxWidgets/build/msw/wx_config_vs11.vcxproj b/3rdparty/wxWidgets/build/msw/wx_config_vs11.vcxproj index cd075af389..57ae2468c5 100644 --- a/3rdparty/wxWidgets/build/msw/wx_config_vs11.vcxproj +++ b/3rdparty/wxWidgets/build/msw/wx_config_vs11.vcxproj @@ -24,16 +24,19 @@ Utility Unicode false + v110 Utility Unicode false + v110 Utility Unicode false + v110 diff --git a/3rdparty/wxWidgets/build/msw/wx_core_vs11.vcxproj b/3rdparty/wxWidgets/build/msw/wx_core_vs11.vcxproj index f025f5477a..9f8289f6c9 100644 --- a/3rdparty/wxWidgets/build/msw/wx_core_vs11.vcxproj +++ b/3rdparty/wxWidgets/build/msw/wx_core_vs11.vcxproj @@ -25,17 +25,20 @@ false Unicode false + v110 StaticLibrary false Unicode true + v110 StaticLibrary false Unicode + v110 diff --git a/3rdparty/zlib/zlib_vs11.vcxproj b/3rdparty/zlib/zlib_vs11.vcxproj index ec2599204c..4b076d4f1d 100644 --- a/3rdparty/zlib/zlib_vs11.vcxproj +++ b/3rdparty/zlib/zlib_vs11.vcxproj @@ -17,22 +17,26 @@ {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} zlib + zlib StaticLibrary MultiByte false + v110 StaticLibrary Static MultiByte true + v110 StaticLibrary MultiByte + v110 diff --git a/common/build/Utilities/utilities_vs11.vcxproj b/common/build/Utilities/utilities_vs11.vcxproj index f621e3db21..1a08e88d8f 100644 --- a/common/build/Utilities/utilities_vs11.vcxproj +++ b/common/build/Utilities/utilities_vs11.vcxproj @@ -18,21 +18,25 @@ {4639972E-424E-4E13-8B07-CA403C481346} x86emitter Win32Proj + utilities StaticLibrary Unicode true + v110 StaticLibrary Unicode true + v110 StaticLibrary Unicode + v110 diff --git a/common/build/x86emitter/x86emitter_vs11.vcxproj b/common/build/x86emitter/x86emitter_vs11.vcxproj index 95aa1cd514..d5dc12239c 100644 --- a/common/build/x86emitter/x86emitter_vs11.vcxproj +++ b/common/build/x86emitter/x86emitter_vs11.vcxproj @@ -18,21 +18,25 @@ {A51123F5-9505-4EAE-85E7-D320290A272C} x86emitter Win32Proj + x86emitter StaticLibrary Unicode true + v110 StaticLibrary Unicode true + v110 StaticLibrary Unicode + v110 diff --git a/pcsx2/windows/VCprojects/pcsx2_vs11.vcxproj b/pcsx2/windows/VCprojects/pcsx2_vs11.vcxproj index 90045dce9e..f486afff54 100644 --- a/pcsx2/windows/VCprojects/pcsx2_vs11.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2_vs11.vcxproj @@ -25,17 +25,20 @@ false Unicode true + v110 Application false Unicode false + v110 Application false Unicode + v110 diff --git a/pcsx2_suite_2012.sln b/pcsx2_suite_2012.sln index 52f714e6b5..98faa3c629 100644 --- a/pcsx2_suite_2012.sln +++ b/pcsx2_suite_2012.sln @@ -33,88 +33,88 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wx", "wx", "{62BF822E-6A12- EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2D6F0A62-A247-4CCF-947F-FCD54BE16103}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\windows\VCprojects\pcsx2.vcxproj", "{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\windows\VCprojects\pcsx2_vs11.vcxproj", "{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroGS", "plugins\zerogs\dx\Windows\zerogs.vcxproj", "{5C6B7D28-E73D-4F71-8FC0-17ADA640EBD8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroGS", "plugins\zerogs\dx\Windows\zerogs_vs11.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.vcxproj", "{5F78E90B-BD22-47B1-9CA5-7A80F4DF5EF3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDiso", "plugins\CDVDiso\src\Windows\CDVDiso_vs11.vcxproj", "{5F78E90B-BD22-47B1-9CA5-7A80F4DF5EF3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\src\Windows\Spu2-X.vcxproj", "{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\src\Windows\Spu2-X_vs11.vcxproj", "{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx_vs11.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\SoundTouch\SoundTouch_vs11.vcxproj", "{E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib_vs11.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "3rdparty\bzip2\bzip2.vcxproj", "{F4EB4AB2-C595-4B05-8BC0-059024BC796C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "3rdparty\bzip2\bzip2_vs11.vcxproj", "{F4EB4AB2-C595-4B05-8BC0-059024BC796C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LilyPad", "plugins\LilyPad\LilyPad.vcxproj", "{E4081455-398C-4610-A87C-90A8A7D72DC3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LilyPad", "plugins\LilyPad\LilyPad_vs11.vcxproj", "{E4081455-398C-4610-A87C-90A8A7D72DC3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w32pthreads.v4", "3rdparty\w32pthreads\pthreads.vcxproj", "{26511268-2902-4997-8421-ECD7055F9E28}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w32pthreads.v4", "3rdparty\w32pthreads\pthreads_vs11.vcxproj", "{26511268-2902-4997-8421-ECD7055F9E28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroSPU2", "plugins\zerospu2\Windows\ZeroSPU2.vcxproj", "{7F059854-568D-4E08-9D00-1E78E203E4DC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroSPU2", "plugins\zerospu2\Windows\ZeroSPU2_vs11.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}") = "xpad", "plugins\xpad\xpad.vcxproj", "{6F3C4136-5801-4EBC-AC6E-37DF6FAB150A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "plugins\xpad\xpad_vs11.vcxproj", "{6F3C4136-5801-4EBC-AC6E-37DF6FAB150A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDolio", "plugins\CDVDolio\cdvd.vcxproj", "{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDolio", "plugins\CDVDolio\cdvd_vs11.vcxproj", "{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDnull", "plugins\CDVDnull\Windows\CDVDnull.vcxproj", "{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDVDnull", "plugins\CDVDnull\Windows\CDVDnull_vs11.vcxproj", "{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBnull", "plugins\USBnull\Windows\USBnull.vcxproj", "{BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBnull", "plugins\USBnull\Windows\USBnull_vs11.vcxproj", "{BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FWnull", "plugins\FWnull\Windows\FWnull.vcxproj", "{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FWnull", "plugins\FWnull\Windows\FWnull_vs11.vcxproj", "{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DEV9null", "plugins\dev9null\Windows\DEV9null.vcxproj", "{04439C5F-05FB-4A9C-AAD1-5388C25377DB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DEV9null", "plugins\dev9null\Windows\DEV9null_vs11.vcxproj", "{04439C5F-05FB-4A9C-AAD1-5388C25377DB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "3rdparty\wxWidgets\build\msw\wx_base.vcxproj", "{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "3rdparty\wxWidgets\build\msw\wx_base_vs11.vcxproj", "{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "3rdparty\wxWidgets\build\msw\wx_core.vcxproj", "{0318BA30-EF48-441A-9E10-DC85EFAE39F0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "3rdparty\wxWidgets\build\msw\wx_core_vs11.vcxproj", "{0318BA30-EF48-441A-9E10-DC85EFAE39F0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxConfig28", "3rdparty\wxWidgets\build\msw\wx_config.vcxproj", "{C34487AF-228A-4D11-8E50-27803DF76873}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxConfig28", "3rdparty\wxWidgets\build\msw\wx_config_vs11.vcxproj", "{C34487AF-228A-4D11-8E50-27803DF76873}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86emitter", "common\build\x86emitter\x86emitter.vcxproj", "{A51123F5-9505-4EAE-85E7-D320290A272C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86emitter", "common\build\x86emitter\x86emitter_vs11.vcxproj", "{A51123F5-9505-4EAE-85E7-D320290A272C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities", "common\build\Utilities\utilities.vcxproj", "{4639972E-424E-4E13-8B07-CA403C481346}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities", "common\build\Utilities\utilities_vs11.vcxproj", "{4639972E-424E-4E13-8B07-CA403C481346}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "3rdparty\wxWidgets\build\msw\wx_adv.vcxproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "3rdparty\wxWidgets\build\msw\wx_adv_vs11.vcxproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2cpp", "tools\bin2cpp\bin2c.vcxproj", "{677B7D11-D5E1-40B3-88B1-9A4DF83D2213}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2cpp", "tools\bin2cpp\bin2c_vs11.vcxproj", "{677B7D11-D5E1-40B3-88B1-9A4DF83D2213}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg7", "3rdparty\libjpeg\libjpeg.vcxproj", "{BC236261-77E8-4567-8D09-45CD02965EB6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg7", "3rdparty\libjpeg\libjpeg_vs11.vcxproj", "{BC236261-77E8-4567-8D09-45CD02965EB6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "3rdparty\glew\glew_static.vcxproj", "{067D7863-393B-494F-B296-4A8853EB3D1D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "3rdparty\glew\glew_static_vs11.vcxproj", "{067D7863-393B-494F-B296-4A8853EB3D1D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w32pthreads_lib", "3rdparty\w32pthreads\pthreads_lib.vcxproj", "{7E9B2BE7-CEC3-4F14-847B-0AB8D562FB86}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w32pthreads_lib", "3rdparty\w32pthreads\pthreads_lib_vs11.vcxproj", "{7E9B2BE7-CEC3-4F14-847B-0AB8D562FB86}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdvdGigaherz", "plugins\cdvdGigaherz\src\Windows\cdvdGigaherz.vcxproj", "{5CF88D5F-64DD-4EDC-9F1A-436BD502940A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdvdGigaherz", "plugins\cdvdGigaherz\src\Windows\cdvdGigaherz_vs11.vcxproj", "{5CF88D5F-64DD-4EDC-9F1A-436BD502940A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSnull", "plugins\GSnull\Windows\GSnull.vcxproj", "{5FCBD521-5A0B-4D97-A823-A97E6BAB9101}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSnull", "plugins\GSnull\Windows\GSnull_vs11.vcxproj", "{5FCBD521-5A0B-4D97-A823-A97E6BAB9101}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PadSSSPSX", "plugins\SSSPSXPAD\PadSSSPSX.vcxproj", "{6C8D28E4-447E-4856-BD9E-6B8F5E7C58C9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PadSSSPSX", "plugins\SSSPSXPAD\PadSSSPSX_vs11.vcxproj", "{6C8D28E4-447E-4856-BD9E-6B8F5E7C58C9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Padnull", "plugins\PadNull\Windows\PadNull.vcxproj", "{6BC4D85D-A399-407E-96A9-CD5416A54269}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Padnull", "plugins\PadNull\Windows\PadNull_vs11.vcxproj", "{6BC4D85D-A399-407E-96A9-CD5416A54269}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "3rdparty\portaudio\build\msvc\portaudio.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "3rdparty\portaudio\build\msvc\portaudio_vs11.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZZOgl", "plugins\zzogl-pg\opengl\Win32\zerogsogl.vcxproj", "{2D4E85B2-F47F-4D65-B091-701E5C031DAC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZZOgl", "plugins\zzogl-pg\opengl\Win32\zerogsogl_vs11.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} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBqemu", "plugins\USBqemu\Win32\USBqemu.vcxproj", "{E613DA9F-41B4-4613-9911-E418EF5533BC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "USBqemu", "plugins\USBqemu\Win32\USBqemu_vs11.vcxproj", "{E613DA9F-41B4-4613-9911-E418EF5533BC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZZOgl-cg", "plugins\zzogl-pg-cg\opengl\Win32\zerogsogl-cg.vcxproj", "{019773FA-2DAA-4C12-9511-BD2D4EB2A718}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZZOgl-cg", "plugins\zzogl-pg-cg\opengl\Win32\zerogsogl-cg_vs11.vcxproj", "{019773FA-2DAA-4C12-9511-BD2D4EB2A718}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/plugins/CDVDiso/src/Windows/CDVDiso_vs11.vcxproj b/plugins/CDVDiso/src/Windows/CDVDiso_vs11.vcxproj index a8c74c6672..222ecfcfa4 100644 --- a/plugins/CDVDiso/src/Windows/CDVDiso_vs11.vcxproj +++ b/plugins/CDVDiso/src/Windows/CDVDiso_vs11.vcxproj @@ -25,17 +25,20 @@ false MultiByte false + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte + v110 diff --git a/plugins/CDVDnull/Windows/CDVDnull_vs11.vcxproj b/plugins/CDVDnull/Windows/CDVDnull_vs11.vcxproj index 6275f3103d..8781b68967 100644 --- a/plugins/CDVDnull/Windows/CDVDnull_vs11.vcxproj +++ b/plugins/CDVDnull/Windows/CDVDnull_vs11.vcxproj @@ -16,6 +16,7 @@ DynamicLibrary MultiByte true + v110 diff --git a/plugins/CDVDolio/cdvd_vs11.vcxproj b/plugins/CDVDolio/cdvd_vs11.vcxproj index ab12a2646a..89a0405bab 100644 --- a/plugins/CDVDolio/cdvd_vs11.vcxproj +++ b/plugins/CDVDolio/cdvd_vs11.vcxproj @@ -86,87 +86,109 @@ false MultiByte true + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte + v110 Application + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte + v110 DynamicLibrary Static MultiByte + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte false + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte + v110 + + + v110 + + + v110 diff --git a/plugins/FWnull/Windows/FWnull_vs11.vcxproj b/plugins/FWnull/Windows/FWnull_vs11.vcxproj index fd56bc5c72..77b8adfccf 100644 --- a/plugins/FWnull/Windows/FWnull_vs11.vcxproj +++ b/plugins/FWnull/Windows/FWnull_vs11.vcxproj @@ -21,10 +21,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/GSdx/GSdx_vs11.vcxproj b/plugins/GSdx/GSdx_vs11.vcxproj index 6da0cb013c..c88ce7e607 100644 --- a/plugins/GSdx/GSdx_vs11.vcxproj +++ b/plugins/GSdx/GSdx_vs11.vcxproj @@ -77,74 +77,90 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte false + v110 @@ -1694,4 +1710,4 @@ - + \ No newline at end of file diff --git a/plugins/GSnull/Windows/GSnull_vs11.vcxproj b/plugins/GSnull/Windows/GSnull_vs11.vcxproj index 09f91f748f..22e22efe69 100644 --- a/plugins/GSnull/Windows/GSnull_vs11.vcxproj +++ b/plugins/GSnull/Windows/GSnull_vs11.vcxproj @@ -21,10 +21,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/LilyPad/LilyPad_vs11.vcxproj b/plugins/LilyPad/LilyPad_vs11.vcxproj index d5d237f2e2..641dc39274 100644 --- a/plugins/LilyPad/LilyPad_vs11.vcxproj +++ b/plugins/LilyPad/LilyPad_vs11.vcxproj @@ -37,34 +37,40 @@ false MultiByte true + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte false + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte + v110 diff --git a/plugins/PadNull/Windows/PadNull_vs11.vcxproj b/plugins/PadNull/Windows/PadNull_vs11.vcxproj index bb5d1f3998..2017c8833c 100644 --- a/plugins/PadNull/Windows/PadNull_vs11.vcxproj +++ b/plugins/PadNull/Windows/PadNull_vs11.vcxproj @@ -21,10 +21,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/SSSPSXPAD/PadSSSPSX_vs11.vcxproj b/plugins/SSSPSXPAD/PadSSSPSX_vs11.vcxproj index 553097c273..abdb32aa1d 100644 --- a/plugins/SSSPSXPAD/PadSSSPSX_vs11.vcxproj +++ b/plugins/SSSPSXPAD/PadSSSPSX_vs11.vcxproj @@ -21,10 +21,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/USBnull/Windows/USBnull_vs11.vcxproj b/plugins/USBnull/Windows/USBnull_vs11.vcxproj index 2a1496ab86..01b286c44a 100644 --- a/plugins/USBnull/Windows/USBnull_vs11.vcxproj +++ b/plugins/USBnull/Windows/USBnull_vs11.vcxproj @@ -21,10 +21,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/USBqemu/Win32/USBqemu_vs11.vcxproj b/plugins/USBqemu/Win32/USBqemu_vs11.vcxproj index 844c6589a5..3b1a996597 100644 --- a/plugins/USBqemu/Win32/USBqemu_vs11.vcxproj +++ b/plugins/USBqemu/Win32/USBqemu_vs11.vcxproj @@ -25,15 +25,18 @@ DynamicLibrary true Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz_vs11.vcxproj b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz_vs11.vcxproj index 86c456f315..8c50986eb9 100644 --- a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz_vs11.vcxproj +++ b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz_vs11.vcxproj @@ -20,12 +20,14 @@ DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 diff --git a/plugins/dev9null/Windows/DEV9null_vs11.vcxproj b/plugins/dev9null/Windows/DEV9null_vs11.vcxproj index 5a0f93bde3..b8182e87ea 100644 --- a/plugins/dev9null/Windows/DEV9null_vs11.vcxproj +++ b/plugins/dev9null/Windows/DEV9null_vs11.vcxproj @@ -21,10 +21,12 @@ DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj index 9e7eb184c6..6b9085852f 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj +++ b/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj @@ -29,6 +29,7 @@ false Static Unicode + v110 DynamicLibrary @@ -36,12 +37,14 @@ Static Unicode true + v110 DynamicLibrary false Static Unicode + v110 DynamicLibrary @@ -49,6 +52,7 @@ Static Unicode true + v110 diff --git a/plugins/xpad/xpad_vs11.vcxproj b/plugins/xpad/xpad_vs11.vcxproj index 823da7578e..e050c98940 100644 --- a/plugins/xpad/xpad_vs11.vcxproj +++ b/plugins/xpad/xpad_vs11.vcxproj @@ -86,92 +86,112 @@ false MultiByte true + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false MultiByte + v110 Application + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte + v110 DynamicLibrary Static MultiByte + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte false + v110 DynamicLibrary Static MultiByte true + v110 DynamicLibrary Static MultiByte + v110 + + + v110 diff --git a/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj b/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj index ae23b29a49..181ae5092d 100644 --- a/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj +++ b/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj @@ -25,16 +25,19 @@ false MultiByte true + v110 DynamicLibrary MultiByte + v110 DynamicLibrary false MultiByte false + v110 diff --git a/plugins/zerospu2/Windows/ZeroSPU2_vs11.vcxproj b/plugins/zerospu2/Windows/ZeroSPU2_vs11.vcxproj index c0dfb76169..38e202778d 100644 --- a/plugins/zerospu2/Windows/ZeroSPU2_vs11.vcxproj +++ b/plugins/zerospu2/Windows/ZeroSPU2_vs11.vcxproj @@ -25,15 +25,18 @@ DynamicLibrary MultiByte false + v110 DynamicLibrary MultiByte true + v110 DynamicLibrary MultiByte + v110 diff --git a/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj b/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj index 18a260597c..454e353fa7 100644 --- a/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj +++ b/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj @@ -25,15 +25,18 @@ false Unicode true + v110 DynamicLibrary Unicode + v110 DynamicLibrary false Unicode + v110 @@ -277,4 +280,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj index dafe23603d..d5e5146735 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj +++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj @@ -25,15 +25,18 @@ false Unicode true + v110 DynamicLibrary Unicode + v110 DynamicLibrary false Unicode + v110 @@ -285,4 +288,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tools/bin2cpp/bin2c_vs11.vcxproj b/tools/bin2cpp/bin2c_vs11.vcxproj index ad2d5c6cd8..520e3a25e9 100644 --- a/tools/bin2cpp/bin2c_vs11.vcxproj +++ b/tools/bin2cpp/bin2c_vs11.vcxproj @@ -21,10 +21,12 @@ Application MultiByte true + v110 Application MultiByte + v110