From 9ed9b2d8cd213691e439095314e66cac8146d603 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Fri, 26 Feb 2016 00:39:20 +0000 Subject: [PATCH 1/2] windows: Switch to DefaultPlatformToolset aka non-XP toolsets Basically I ran find . -name "*.vcxproj" -exec sed -i -e 's/_xp//' {} \; This will likely break XP, but it paves the way on Windows for a PCSX2 that does not require the DirectX redistributables to be installed for Windows 8, 8.1 and 10 users. Windows Vista and 7 users will still require the DirectX redistributable files for XInput and XAudio, though PCSX2 should still be capable of running if a user does not actually use either of them. --- 3rdparty/bzip2/bzip2.vcxproj | 6 +-- 3rdparty/libjpeg/libjpeg.vcxproj | 6 +-- .../projects/vstudio/libpng/libpng.vcxproj | 6 +-- 3rdparty/opencl/opencl.vcxproj | 8 ++-- .../portaudio/build/msvc/portaudio.vcxproj | 16 ++++---- 3rdparty/pthreads4w/build/pthreads4w.vcxproj | 2 +- 3rdparty/soundtouch/SoundTouch.vcxproj | 2 +- .../wxwidgets3.0/build/msw/wx30_adv.vcxproj | 12 +++--- .../wxwidgets3.0/build/msw/wx30_base.vcxproj | 12 +++--- .../build/msw/wx30_config.vcxproj | 12 +++--- .../wxwidgets3.0/build/msw/wx30_core.vcxproj | 12 +++--- 3rdparty/zlib/zlib.vcxproj | 6 +-- common/build/Utilities/utilities.vcxproj | 6 +-- common/build/x86emitter/x86emitter.vcxproj | 6 +-- pcsx2/windows/VCprojects/pcsx2.vcxproj | 6 +-- plugins/CDVDiso/src/Windows/CDVDiso.vcxproj | 6 +-- plugins/CDVDnull/Windows/CDVDnull.vcxproj | 4 +- plugins/CDVDolio/CDVDolio.vcxproj | 8 ++-- plugins/FWnull/Windows/FWnull.vcxproj | 4 +- plugins/GSdx/GSdx.vcxproj | 40 +++++++++---------- plugins/GSnull/Windows/GSnull.vcxproj | 4 +- plugins/LilyPad/LilyPad.vcxproj | 10 ++--- plugins/PadNull/Windows/PadNull.vcxproj | 4 +- plugins/SSSPSXPAD/PadSSSPSX.vcxproj | 4 +- plugins/USBnull/Windows/USBnull.vcxproj | 4 +- plugins/USBqemu/Win32/USBqemu.vcxproj | 6 +-- .../src/Windows/cdvdGigaherz.vcxproj | 4 +- plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj | 4 +- plugins/dev9null/Windows/DEV9null.vcxproj | 4 +- plugins/spu2-x/src/Windows/Spu2-X.vcxproj | 8 ++-- plugins/xpad/xpad.vcxproj | 10 ++--- plugins/zerogs/dx/Windows/zerogs.vcxproj | 6 +-- plugins/zerospu2/Windows/ZeroSPU2.vcxproj | 6 +-- .../zzogl-pg/opengl/Win32/zerogsogl.vcxproj | 6 +-- tools/bin2cpp/bin2c.vcxproj | 4 +- 35 files changed, 132 insertions(+), 132 deletions(-) diff --git a/3rdparty/bzip2/bzip2.vcxproj b/3rdparty/bzip2/bzip2.vcxproj index dc21f66c17..05de604a5d 100644 --- a/3rdparty/bzip2/bzip2.vcxproj +++ b/3rdparty/bzip2/bzip2.vcxproj @@ -24,18 +24,18 @@ StaticLibrary MultiByte false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/libjpeg/libjpeg.vcxproj b/3rdparty/libjpeg/libjpeg.vcxproj index 921eb939c9..58d600929c 100644 --- a/3rdparty/libjpeg/libjpeg.vcxproj +++ b/3rdparty/libjpeg/libjpeg.vcxproj @@ -25,18 +25,18 @@ StaticLibrary Unicode false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj index ae29be675f..4060283640 100644 --- a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj @@ -23,19 +23,19 @@ StaticLibrary Unicode false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/opencl/opencl.vcxproj b/3rdparty/opencl/opencl.vcxproj index 8fd86bd5e0..1c5c97e1fe 100644 --- a/3rdparty/opencl/opencl.vcxproj +++ b/3rdparty/opencl/opencl.vcxproj @@ -27,26 +27,26 @@ StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) MultiByte StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) MultiByte StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true MultiByte StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true MultiByte diff --git a/3rdparty/portaudio/build/msvc/portaudio.vcxproj b/3rdparty/portaudio/build/msvc/portaudio.vcxproj index 62aa3eb6ed..fd49303764 100644 --- a/3rdparty/portaudio/build/msvc/portaudio.vcxproj +++ b/3rdparty/portaudio/build/msvc/portaudio.vcxproj @@ -43,51 +43,51 @@ StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode DynamicLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode DynamicLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode DynamicLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode DynamicLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/3rdparty/pthreads4w/build/pthreads4w.vcxproj b/3rdparty/pthreads4w/build/pthreads4w.vcxproj index 85211ae382..317e8f1574 100644 --- a/3rdparty/pthreads4w/build/pthreads4w.vcxproj +++ b/3rdparty/pthreads4w/build/pthreads4w.vcxproj @@ -34,7 +34,7 @@ StaticLibrary - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true false true diff --git a/3rdparty/soundtouch/SoundTouch.vcxproj b/3rdparty/soundtouch/SoundTouch.vcxproj index 9e8a4767b9..9a8a43d862 100644 --- a/3rdparty/soundtouch/SoundTouch.vcxproj +++ b/3rdparty/soundtouch/SoundTouch.vcxproj @@ -34,7 +34,7 @@ StaticLibrary - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true false true diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj index ac275d4fa7..52a810d697 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj @@ -35,41 +35,41 @@ StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj index b0d80249e0..3865282229 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj @@ -35,41 +35,41 @@ StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj index ffe5a52d26..076ca30326 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj @@ -35,37 +35,37 @@ Utility false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Utility false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Utility false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Utility false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Utility false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Utility false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj index bcaa7355c0..58fa536884 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj @@ -35,41 +35,41 @@ StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) true StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/3rdparty/zlib/zlib.vcxproj b/3rdparty/zlib/zlib.vcxproj index 54d9046811..4b386eb148 100644 --- a/3rdparty/zlib/zlib.vcxproj +++ b/3rdparty/zlib/zlib.vcxproj @@ -24,18 +24,18 @@ StaticLibrary MultiByte false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/common/build/Utilities/utilities.vcxproj b/common/build/Utilities/utilities.vcxproj index 91d0c767db..4cbe32d182 100644 --- a/common/build/Utilities/utilities.vcxproj +++ b/common/build/Utilities/utilities.vcxproj @@ -25,18 +25,18 @@ StaticLibrary Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/common/build/x86emitter/x86emitter.vcxproj b/common/build/x86emitter/x86emitter.vcxproj index 61522868cd..ee4b6ec443 100644 --- a/common/build/x86emitter/x86emitter.vcxproj +++ b/common/build/x86emitter/x86emitter.vcxproj @@ -25,18 +25,18 @@ StaticLibrary Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 4306dc26e2..da1b86e1fc 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -25,20 +25,20 @@ false Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false Unicode false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj b/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj index 46eeae0307..6ae647ac79 100644 --- a/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj +++ b/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj @@ -25,20 +25,20 @@ false MultiByte false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/CDVDnull/Windows/CDVDnull.vcxproj b/plugins/CDVDnull/Windows/CDVDnull.vcxproj index 6ddb841baa..c0140d690b 100644 --- a/plugins/CDVDnull/Windows/CDVDnull.vcxproj +++ b/plugins/CDVDnull/Windows/CDVDnull.vcxproj @@ -20,12 +20,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/CDVDolio/CDVDolio.vcxproj b/plugins/CDVDolio/CDVDolio.vcxproj index 810f62bc35..6f8618363a 100644 --- a/plugins/CDVDolio/CDVDolio.vcxproj +++ b/plugins/CDVDolio/CDVDolio.vcxproj @@ -30,26 +30,26 @@ false MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary Static MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary Static MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/FWnull/Windows/FWnull.vcxproj b/plugins/FWnull/Windows/FWnull.vcxproj index 21cbd14acc..f006554a7f 100644 --- a/plugins/FWnull/Windows/FWnull.vcxproj +++ b/plugins/FWnull/Windows/FWnull.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index ee2f82065f..33c82d1617 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -93,112 +93,112 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/GSnull/Windows/GSnull.vcxproj b/plugins/GSnull/Windows/GSnull.vcxproj index fefeb9508f..8af5181cf3 100644 --- a/plugins/GSnull/Windows/GSnull.vcxproj +++ b/plugins/GSnull/Windows/GSnull.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/LilyPad/LilyPad.vcxproj b/plugins/LilyPad/LilyPad.vcxproj index 58b08e4b0e..0868b65c6b 100644 --- a/plugins/LilyPad/LilyPad.vcxproj +++ b/plugins/LilyPad/LilyPad.vcxproj @@ -29,26 +29,26 @@ false Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -342,4 +342,4 @@ - \ No newline at end of file + diff --git a/plugins/PadNull/Windows/PadNull.vcxproj b/plugins/PadNull/Windows/PadNull.vcxproj index a652715639..c767664276 100644 --- a/plugins/PadNull/Windows/PadNull.vcxproj +++ b/plugins/PadNull/Windows/PadNull.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/SSSPSXPAD/PadSSSPSX.vcxproj b/plugins/SSSPSXPAD/PadSSSPSX.vcxproj index b8d18a120b..3b825fe0cd 100644 --- a/plugins/SSSPSXPAD/PadSSSPSX.vcxproj +++ b/plugins/SSSPSXPAD/PadSSSPSX.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/USBnull/Windows/USBnull.vcxproj b/plugins/USBnull/Windows/USBnull.vcxproj index 11b64e955b..dcacadbbbb 100644 --- a/plugins/USBnull/Windows/USBnull.vcxproj +++ b/plugins/USBnull/Windows/USBnull.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/USBqemu/Win32/USBqemu.vcxproj b/plugins/USBqemu/Win32/USBqemu.vcxproj index 3cdbc4323e..cd0f841e3f 100644 --- a/plugins/USBqemu/Win32/USBqemu.vcxproj +++ b/plugins/USBqemu/Win32/USBqemu.vcxproj @@ -25,18 +25,18 @@ DynamicLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj index 006973b177..cebcba6929 100644 --- a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj +++ b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj @@ -20,14 +20,14 @@ DynamicLibrary false MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj index 7cf4a293ca..4258654f42 100644 --- a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj +++ b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/dev9null/Windows/DEV9null.vcxproj b/plugins/dev9null/Windows/DEV9null.vcxproj index a3d1417e61..ec5cf669ba 100644 --- a/plugins/dev9null/Windows/DEV9null.vcxproj +++ b/plugins/dev9null/Windows/DEV9null.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj index 573e914ebe..5a0be3f7f8 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj +++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj @@ -29,7 +29,7 @@ false Static Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary @@ -37,14 +37,14 @@ Static Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Static Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary @@ -52,7 +52,7 @@ Static Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/xpad/xpad.vcxproj b/plugins/xpad/xpad.vcxproj index 270cbf0671..2ee5c83090 100644 --- a/plugins/xpad/xpad.vcxproj +++ b/plugins/xpad/xpad.vcxproj @@ -30,26 +30,26 @@ false Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -175,4 +175,4 @@ - \ No newline at end of file + diff --git a/plugins/zerogs/dx/Windows/zerogs.vcxproj b/plugins/zerogs/dx/Windows/zerogs.vcxproj index 2d1bd65bd5..98cc7b2658 100644 --- a/plugins/zerogs/dx/Windows/zerogs.vcxproj +++ b/plugins/zerogs/dx/Windows/zerogs.vcxproj @@ -25,19 +25,19 @@ false MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false MultiByte false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj index c1c764f3d6..330f639bb9 100644 --- a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj +++ b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj @@ -25,18 +25,18 @@ DynamicLibrary MultiByte false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj index 8c6fe85437..8f63697d4f 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj +++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj @@ -25,18 +25,18 @@ false Unicode true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) DynamicLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/tools/bin2cpp/bin2c.vcxproj b/tools/bin2cpp/bin2c.vcxproj index 59dc4cc1f6..627e86ad9f 100644 --- a/tools/bin2cpp/bin2c.vcxproj +++ b/tools/bin2cpp/bin2c.vcxproj @@ -21,12 +21,12 @@ Application MultiByte true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application MultiByte - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) From b516c1001ac7564293d4b35447093518f16cff6d Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Fri, 26 Feb 2016 11:05:50 +0000 Subject: [PATCH 2/2] windows: Set _WIN32_WINNT to 0x0600 (Windows Vista) --- common/include/PS2Eext.h | 3 ++ common/include/Utilities/RedtapeWindows.h | 7 ++-- plugins/CDVDnull/CDVD.h | 9 ----- plugins/GSdx/targetver.h | 34 +------------------ plugins/GSdx/vsprops/common.props | 1 - plugins/LilyPad/Global.h | 8 +---- plugins/cdvdGigaherz/src/CDVD.h | 1 + plugins/cdvdGigaherz/src/PlainIso.cpp | 2 -- plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp | 2 -- plugins/cdvdGigaherz/src/Windows/PlainIso.cpp | 2 -- plugins/cdvdGigaherz/src/Windows/config.cpp | 7 ++-- plugins/spu2-x/src/Windows/WinConfig.h | 6 ++-- plugins/spu2-x/src/Windows/dsp.cpp | 4 +-- plugins/xpad/stdafx.h | 28 ++------------- plugins/xpad/vsprops/common.props | 2 -- 15 files changed, 17 insertions(+), 99 deletions(-) diff --git a/common/include/PS2Eext.h b/common/include/PS2Eext.h index 2442866e7d..a5f607ae98 100644 --- a/common/include/PS2Eext.h +++ b/common/include/PS2Eext.h @@ -21,6 +21,9 @@ #include #if defined(_MSC_VER) +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#endif #include #include #include diff --git a/common/include/Utilities/RedtapeWindows.h b/common/include/Utilities/RedtapeWindows.h index 4a686052ba..6850e9156e 100644 --- a/common/include/Utilities/RedtapeWindows.h +++ b/common/include/Utilities/RedtapeWindows.h @@ -31,14 +31,13 @@ #ifdef _WIN32 -// Force availability of to WinNT APIs (change to 0x600 to disable XP-specific APIs) -#ifndef WINVER -#define WINVER 0x0501 -#define _WIN32_WINNT 0x0501 +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 #endif #include +// TODO: I think NOMINMAX above takes care of this already. So these can probably be removed. // disable Windows versions of min/max -- we'll use the typesafe STL versions instead. #undef min #undef max diff --git a/plugins/CDVDnull/CDVD.h b/plugins/CDVDnull/CDVD.h index a23f45a9a3..264a9a5b74 100644 --- a/plugins/CDVDnull/CDVD.h +++ b/plugins/CDVDnull/CDVD.h @@ -17,19 +17,10 @@ #ifndef __CDVD_H__ #define __CDVD_H__ -#ifdef _WIN32 -#include -#endif - #define CDVDdefs #include "PS2Edefs.h" #include "PS2Eext.h" -#ifdef _MSC_VER -#include -#include -#endif - /*#ifdef _MSC_VER #define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK #else diff --git a/plugins/GSdx/targetver.h b/plugins/GSdx/targetver.h index 95461871f8..ba3f81934a 100644 --- a/plugins/GSdx/targetver.h +++ b/plugins/GSdx/targetver.h @@ -20,37 +20,5 @@ */ #pragma once -/* -// Including SDKDDKVer.h defines the highest available Windows platform. -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. - -#include -*/ - -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. - -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif - -#include +#define _WIN32_WINNT 0x0600 diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props index 0a13416da1..fa802053ae 100644 --- a/plugins/GSdx/vsprops/common.props +++ b/plugins/GSdx/vsprops/common.props @@ -8,7 +8,6 @@ true - _WINDOWS;_WIN32_WINNT=0x501;%(PreprocessorDefinitions) Fast false Level4 diff --git a/plugins/LilyPad/Global.h b/plugins/LilyPad/Global.h index a2e8512e0e..e3f0df4de7 100644 --- a/plugins/LilyPad/Global.h +++ b/plugins/LilyPad/Global.h @@ -97,13 +97,7 @@ extern Window GSwin; #endif #ifdef _MSC_VER -// Actually works with 0x0400, but need 0x500 to get XBUTTON defines, -// 0x501 to get raw input structures, and 0x0600 to get WM_MOUSEHWHEEL. -#define WINVER 0x0600 -#define _WIN32_WINNT WINVER -#define __MSCW32__ - - +#define _WIN32_WINNT 0x0600 #include #ifdef PCSX2_DEBUG diff --git a/plugins/cdvdGigaherz/src/CDVD.h b/plugins/cdvdGigaherz/src/CDVD.h index 5f80274426..e2d96a6d5f 100644 --- a/plugins/cdvdGigaherz/src/CDVD.h +++ b/plugins/cdvdGigaherz/src/CDVD.h @@ -16,6 +16,7 @@ #ifndef __CDVD_H__ #define __CDVD_H__ +#define _WIN32_WINNT 0x0600 #include #include diff --git a/plugins/cdvdGigaherz/src/PlainIso.cpp b/plugins/cdvdGigaherz/src/PlainIso.cpp index 152b7abd73..451e1583bb 100644 --- a/plugins/cdvdGigaherz/src/PlainIso.cpp +++ b/plugins/cdvdGigaherz/src/PlainIso.cpp @@ -13,8 +13,6 @@ * If not, see . */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include "CDVD.h" #pragma warning(disable:4200) #pragma pack(1) diff --git a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp index 92a7aaf299..2c5ebabb3c 100644 --- a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp +++ b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp @@ -13,8 +13,6 @@ * If not, see . */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include "../CDVD.h" #pragma warning(disable:4200) #pragma pack(1) diff --git a/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp b/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp index 0ec221bb5a..b5c6430810 100644 --- a/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp +++ b/plugins/cdvdGigaherz/src/Windows/PlainIso.cpp @@ -13,8 +13,6 @@ * If not, see . */ -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 #include "../CDVD.h" #pragma warning(disable:4200) #pragma pack(1) diff --git a/plugins/cdvdGigaherz/src/Windows/config.cpp b/plugins/cdvdGigaherz/src/Windows/config.cpp index 272b706eb7..420149321f 100644 --- a/plugins/cdvdGigaherz/src/Windows/config.cpp +++ b/plugins/cdvdGigaherz/src/Windows/config.cpp @@ -15,13 +15,12 @@ //License along with this library; if not, write to the Free Software //Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // -//#include "spu2.h" -#include + +#include "../CDVD.h" +#include #include #include "resource.h" -#include "../cdvd.h" - // Config Vars // DEBUG diff --git a/plugins/spu2-x/src/Windows/WinConfig.h b/plugins/spu2-x/src/Windows/WinConfig.h index 1c2cd5598a..269ff0c465 100644 --- a/plugins/spu2-x/src/Windows/WinConfig.h +++ b/plugins/spu2-x/src/Windows/WinConfig.h @@ -17,11 +17,9 @@ #pragma once -#ifndef WINVER -# define WINVER 0x0501 -# define _WIN32_WINNT 0x0501 +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 #endif - #include #include #include diff --git a/plugins/spu2-x/src/Windows/dsp.cpp b/plugins/spu2-x/src/Windows/dsp.cpp index 075283283c..db8debf23e 100644 --- a/plugins/spu2-x/src/Windows/dsp.cpp +++ b/plugins/spu2-x/src/Windows/dsp.cpp @@ -18,9 +18,7 @@ #include "Global.h" -# define WINVER 0x0501 -# define _WIN32_WINNT 0x0501 - +#define _WIN32_WINNT 0x0600 #include #include diff --git a/plugins/xpad/stdafx.h b/plugins/xpad/stdafx.h index 5576f8097d..79ef23aede 100644 --- a/plugins/xpad/stdafx.h +++ b/plugins/xpad/stdafx.h @@ -4,33 +4,9 @@ #pragma once -#pragma warning(disable: 4996 4995 4324 4100 4101 4201) +#define WIN32_LEAN_AND_MEAN -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. - -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define _WIN32_WINNT 0x0600 #include #include diff --git a/plugins/xpad/vsprops/common.props b/plugins/xpad/vsprops/common.props index a061cc9fef..2698a1f853 100644 --- a/plugins/xpad/vsprops/common.props +++ b/plugins/xpad/vsprops/common.props @@ -8,8 +8,6 @@ true - WIN32;_WINDOWS;_WIN32_WINNT=0x500;%(PreprocessorDefinitions) - Fast false Level4 ProgramDatabase