From b20433c0bee6926c698a155e47d5e88e371f548a Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sat, 28 May 2016 21:13:13 +0100 Subject: [PATCH] windows: Remove user.props references from all projects find . -name *.vcxproj -exec sed -i -e '/user.props/d' {} \; Microsoft recommends against using .user files. From https://msdn.microsoft.com/en-us/library/669zx6zc.aspx : "The best practice is to delete the reference to them in Property Manager to ensure that your projects operate independently of any per-user, per-computer settings. This is important to ensure correct behaviour in a SCC (source code control) environment." If you cannot compile SPU2-X after this commit (since that still relies on the old DirectX SDK), you'll need to fix your build environment. --- 3rdparty/bzip2/bzip2.vcxproj | 3 --- 3rdparty/libjpeg/libjpeg.vcxproj | 3 --- .../projects/vstudio/libpng/libpng.vcxproj | 3 --- .../vstudio/pnglibconf/pnglibconf.vcxproj | 1 - .../vstudio/pngstest/pngstest.vcxproj | 4 ---- .../projects/vstudio/pngtest/pngtest.vcxproj | 4 ---- .../vstudio/pngunknown/pngunknown.vcxproj | 4 ---- .../vstudio/pngvalid/pngvalid.vcxproj | 4 ---- .../libpng/projects/vstudio/zlib/zlib.vcxproj | 4 ---- 3rdparty/opencl/opencl.vcxproj | 4 ---- .../portaudio/build/msvc/portaudio.vcxproj | 8 -------- 3rdparty/pthreads4w/build/pthreads4w.vcxproj | 1 - 3rdparty/soundtouch/SoundTouch.vcxproj | 1 - .../wxwidgets3.0/build/msw/wx30_adv.vcxproj | 6 ------ .../wxwidgets3.0/build/msw/wx30_base.vcxproj | 6 ------ .../build/msw/wx30_config.vcxproj | 6 ------ .../wxwidgets3.0/build/msw/wx30_core.vcxproj | 6 ------ 3rdparty/zlib/zlib.vcxproj | 3 --- common/build/Utilities/utilities.vcxproj | 3 --- common/build/x86emitter/x86emitter.vcxproj | 3 --- pcsx2/windows/VCprojects/pcsx2.vcxproj | 3 --- plugins/CDVDiso/src/Windows/CDVDiso.vcxproj | 3 --- plugins/CDVDnull/Windows/CDVDnull.vcxproj | 2 -- plugins/CDVDolio/CDVDolio.vcxproj | 4 ---- plugins/FWnull/Windows/FWnull.vcxproj | 2 -- plugins/GSdx/GSdx.vcxproj | 20 ------------------- plugins/GSdx_legacy/GSdx.vcxproj | 20 ------------------- plugins/GSnull/Windows/GSnull.vcxproj | 2 -- plugins/LilyPad/LilyPad.vcxproj | 4 ---- plugins/PadNull/Windows/PadNull.vcxproj | 2 -- plugins/SSSPSXPAD/PadSSSPSX.vcxproj | 2 -- plugins/USBnull/Windows/USBnull.vcxproj | 2 -- plugins/USBqemu/Win32/USBqemu.vcxproj | 3 --- .../src/Windows/cdvdGigaherz.vcxproj | 2 -- plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj | 2 -- plugins/dev9null/Windows/DEV9null.vcxproj | 2 -- plugins/spu2-x/src/Windows/Spu2-X.vcxproj | 4 ---- plugins/xpad/xpad.vcxproj | 4 ---- plugins/zerogs/dx/Windows/zerogs.vcxproj | 3 --- plugins/zerospu2/Windows/ZeroSPU2.vcxproj | 3 --- .../zzogl-pg/opengl/Win32/zerogsogl.vcxproj | 3 --- tools/bin2cpp/bin2c.vcxproj | 2 -- unfree/baseclasses/baseclasses.vcxproj | 4 ---- 43 files changed, 175 deletions(-) diff --git a/3rdparty/bzip2/bzip2.vcxproj b/3rdparty/bzip2/bzip2.vcxproj index 05de604a5d..5c6dc55ffb 100644 --- a/3rdparty/bzip2/bzip2.vcxproj +++ b/3rdparty/bzip2/bzip2.vcxproj @@ -41,20 +41,17 @@ - - - diff --git a/3rdparty/libjpeg/libjpeg.vcxproj b/3rdparty/libjpeg/libjpeg.vcxproj index 58d600929c..3734ee1bb6 100644 --- a/3rdparty/libjpeg/libjpeg.vcxproj +++ b/3rdparty/libjpeg/libjpeg.vcxproj @@ -43,20 +43,17 @@ - - - diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj index 4060283640..06ea773fa3 100644 --- a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj @@ -41,18 +41,15 @@ - - - diff --git a/3rdparty/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/3rdparty/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj index e2a232cb63..b63b9c5de3 100644 --- a/3rdparty/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/3rdparty/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -22,7 +22,6 @@ - diff --git a/3rdparty/libpng/projects/vstudio/pngstest/pngstest.vcxproj b/3rdparty/libpng/projects/vstudio/pngstest/pngstest.vcxproj index 0d2980dd8a..e08534a351 100644 --- a/3rdparty/libpng/projects/vstudio/pngstest/pngstest.vcxproj +++ b/3rdparty/libpng/projects/vstudio/pngstest/pngstest.vcxproj @@ -45,16 +45,12 @@ - - - - diff --git a/3rdparty/libpng/projects/vstudio/pngtest/pngtest.vcxproj b/3rdparty/libpng/projects/vstudio/pngtest/pngtest.vcxproj index bf9266f758..f304dbb169 100644 --- a/3rdparty/libpng/projects/vstudio/pngtest/pngtest.vcxproj +++ b/3rdparty/libpng/projects/vstudio/pngtest/pngtest.vcxproj @@ -45,16 +45,12 @@ - - - - diff --git a/3rdparty/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj b/3rdparty/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj index a30cc7a21a..d6d675e646 100644 --- a/3rdparty/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/3rdparty/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -45,16 +45,12 @@ - - - - diff --git a/3rdparty/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj b/3rdparty/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj index 07cf241193..32f2c85a40 100644 --- a/3rdparty/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/3rdparty/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -45,16 +45,12 @@ - - - - diff --git a/3rdparty/libpng/projects/vstudio/zlib/zlib.vcxproj b/3rdparty/libpng/projects/vstudio/zlib/zlib.vcxproj index 6e5b94a61c..38e5dea419 100644 --- a/3rdparty/libpng/projects/vstudio/zlib/zlib.vcxproj +++ b/3rdparty/libpng/projects/vstudio/zlib/zlib.vcxproj @@ -57,16 +57,12 @@ - - - - diff --git a/3rdparty/opencl/opencl.vcxproj b/3rdparty/opencl/opencl.vcxproj index 1c5c97e1fe..b8da9268d7 100644 --- a/3rdparty/opencl/opencl.vcxproj +++ b/3rdparty/opencl/opencl.vcxproj @@ -54,22 +54,18 @@ - - - - diff --git a/3rdparty/portaudio/build/msvc/portaudio.vcxproj b/3rdparty/portaudio/build/msvc/portaudio.vcxproj index fd49303764..91e1214e6c 100644 --- a/3rdparty/portaudio/build/msvc/portaudio.vcxproj +++ b/3rdparty/portaudio/build/msvc/portaudio.vcxproj @@ -94,45 +94,37 @@ - - - - - - - - diff --git a/3rdparty/pthreads4w/build/pthreads4w.vcxproj b/3rdparty/pthreads4w/build/pthreads4w.vcxproj index 317e8f1574..cdbf472e57 100644 --- a/3rdparty/pthreads4w/build/pthreads4w.vcxproj +++ b/3rdparty/pthreads4w/build/pthreads4w.vcxproj @@ -41,7 +41,6 @@ - diff --git a/3rdparty/soundtouch/SoundTouch.vcxproj b/3rdparty/soundtouch/SoundTouch.vcxproj index 9a8a43d862..444fe5a411 100644 --- a/3rdparty/soundtouch/SoundTouch.vcxproj +++ b/3rdparty/soundtouch/SoundTouch.vcxproj @@ -41,7 +41,6 @@ - diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj index 52a810d697..dd4114b883 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj @@ -75,35 +75,29 @@ - - - - - - diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj index 3865282229..4b15f43fdc 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj @@ -75,35 +75,29 @@ - - - - - - diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj index 076ca30326..3c97c4d914 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj @@ -71,27 +71,21 @@ - - - - - - diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj index 58fa536884..083f1c7d53 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj @@ -75,35 +75,29 @@ - - - - - - diff --git a/3rdparty/zlib/zlib.vcxproj b/3rdparty/zlib/zlib.vcxproj index 4b386eb148..59229f5316 100644 --- a/3rdparty/zlib/zlib.vcxproj +++ b/3rdparty/zlib/zlib.vcxproj @@ -41,20 +41,17 @@ - - - diff --git a/common/build/Utilities/utilities.vcxproj b/common/build/Utilities/utilities.vcxproj index a6c8193e9e..fafaa6ee73 100644 --- a/common/build/Utilities/utilities.vcxproj +++ b/common/build/Utilities/utilities.vcxproj @@ -42,20 +42,17 @@ - - - diff --git a/common/build/x86emitter/x86emitter.vcxproj b/common/build/x86emitter/x86emitter.vcxproj index ee4b6ec443..2550012d0f 100644 --- a/common/build/x86emitter/x86emitter.vcxproj +++ b/common/build/x86emitter/x86emitter.vcxproj @@ -42,20 +42,17 @@ - - - diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 70899545ee..d19ecee56d 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -45,7 +45,6 @@ - @@ -53,7 +52,6 @@ - @@ -63,7 +61,6 @@ - diff --git a/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj b/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj index 6ae647ac79..8c1774b65c 100644 --- a/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj +++ b/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj @@ -44,21 +44,18 @@ - - - diff --git a/plugins/CDVDnull/Windows/CDVDnull.vcxproj b/plugins/CDVDnull/Windows/CDVDnull.vcxproj index c0140d690b..a1970b5f10 100644 --- a/plugins/CDVDnull/Windows/CDVDnull.vcxproj +++ b/plugins/CDVDnull/Windows/CDVDnull.vcxproj @@ -31,14 +31,12 @@ - - diff --git a/plugins/CDVDolio/CDVDolio.vcxproj b/plugins/CDVDolio/CDVDolio.vcxproj index 6f8618363a..667ac5211a 100644 --- a/plugins/CDVDolio/CDVDolio.vcxproj +++ b/plugins/CDVDolio/CDVDolio.vcxproj @@ -55,28 +55,24 @@ - - - - diff --git a/plugins/FWnull/Windows/FWnull.vcxproj b/plugins/FWnull/Windows/FWnull.vcxproj index f006554a7f..9c22eccd5f 100644 --- a/plugins/FWnull/Windows/FWnull.vcxproj +++ b/plugins/FWnull/Windows/FWnull.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index d107375d9d..147ddcb6e5 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -204,7 +204,6 @@ - @@ -212,7 +211,6 @@ - @@ -220,7 +218,6 @@ - @@ -228,7 +225,6 @@ - @@ -236,7 +232,6 @@ - @@ -244,7 +239,6 @@ - @@ -252,7 +246,6 @@ - @@ -260,7 +253,6 @@ - @@ -268,7 +260,6 @@ - @@ -276,7 +267,6 @@ - @@ -284,7 +274,6 @@ - @@ -292,7 +281,6 @@ - @@ -300,7 +288,6 @@ - @@ -308,7 +295,6 @@ - @@ -316,7 +302,6 @@ - @@ -324,7 +309,6 @@ - @@ -332,7 +316,6 @@ - @@ -340,7 +323,6 @@ - @@ -348,7 +330,6 @@ - @@ -356,7 +337,6 @@ - diff --git a/plugins/GSdx_legacy/GSdx.vcxproj b/plugins/GSdx_legacy/GSdx.vcxproj index 33c82d1617..044f9046be 100644 --- a/plugins/GSdx_legacy/GSdx.vcxproj +++ b/plugins/GSdx_legacy/GSdx.vcxproj @@ -204,7 +204,6 @@ - @@ -212,7 +211,6 @@ - @@ -220,7 +218,6 @@ - @@ -228,7 +225,6 @@ - @@ -236,7 +232,6 @@ - @@ -244,7 +239,6 @@ - @@ -252,7 +246,6 @@ - @@ -260,7 +253,6 @@ - @@ -268,7 +260,6 @@ - @@ -276,7 +267,6 @@ - @@ -284,7 +274,6 @@ - @@ -292,7 +281,6 @@ - @@ -300,7 +288,6 @@ - @@ -308,7 +295,6 @@ - @@ -316,7 +302,6 @@ - @@ -324,7 +309,6 @@ - @@ -332,7 +316,6 @@ - @@ -340,7 +323,6 @@ - @@ -348,7 +330,6 @@ - @@ -356,7 +337,6 @@ - diff --git a/plugins/GSnull/Windows/GSnull.vcxproj b/plugins/GSnull/Windows/GSnull.vcxproj index 8af5181cf3..f0b7316cbe 100644 --- a/plugins/GSnull/Windows/GSnull.vcxproj +++ b/plugins/GSnull/Windows/GSnull.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/LilyPad/LilyPad.vcxproj b/plugins/LilyPad/LilyPad.vcxproj index 7b1e88e86a..d023a353aa 100644 --- a/plugins/LilyPad/LilyPad.vcxproj +++ b/plugins/LilyPad/LilyPad.vcxproj @@ -54,26 +54,22 @@ - - - - diff --git a/plugins/PadNull/Windows/PadNull.vcxproj b/plugins/PadNull/Windows/PadNull.vcxproj index c767664276..5f6545127d 100644 --- a/plugins/PadNull/Windows/PadNull.vcxproj +++ b/plugins/PadNull/Windows/PadNull.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/SSSPSXPAD/PadSSSPSX.vcxproj b/plugins/SSSPSXPAD/PadSSSPSX.vcxproj index 3b825fe0cd..69b0118857 100644 --- a/plugins/SSSPSXPAD/PadSSSPSX.vcxproj +++ b/plugins/SSSPSXPAD/PadSSSPSX.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/USBnull/Windows/USBnull.vcxproj b/plugins/USBnull/Windows/USBnull.vcxproj index dcacadbbbb..16699c3b4a 100644 --- a/plugins/USBnull/Windows/USBnull.vcxproj +++ b/plugins/USBnull/Windows/USBnull.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/USBqemu/Win32/USBqemu.vcxproj b/plugins/USBqemu/Win32/USBqemu.vcxproj index cd0f841e3f..440bfd32e2 100644 --- a/plugins/USBqemu/Win32/USBqemu.vcxproj +++ b/plugins/USBqemu/Win32/USBqemu.vcxproj @@ -42,7 +42,6 @@ - @@ -51,7 +50,6 @@ - @@ -59,7 +57,6 @@ - diff --git a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj index 542cdd401a..7629668134 100644 --- a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj +++ b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj @@ -33,14 +33,12 @@ - - diff --git a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj index 4258654f42..26b487daed 100644 --- a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj +++ b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/dev9null/Windows/DEV9null.vcxproj b/plugins/dev9null/Windows/DEV9null.vcxproj index ec5cf669ba..b14a370c12 100644 --- a/plugins/dev9null/Windows/DEV9null.vcxproj +++ b/plugins/dev9null/Windows/DEV9null.vcxproj @@ -32,14 +32,12 @@ - - diff --git a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj index 542dee61ab..900911bdac 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj +++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj @@ -58,7 +58,6 @@ - @@ -67,7 +66,6 @@ - @@ -75,7 +73,6 @@ - @@ -84,7 +81,6 @@ - diff --git a/plugins/xpad/xpad.vcxproj b/plugins/xpad/xpad.vcxproj index 2ee5c83090..a6d71e77f9 100644 --- a/plugins/xpad/xpad.vcxproj +++ b/plugins/xpad/xpad.vcxproj @@ -55,28 +55,24 @@ - - - - diff --git a/plugins/zerogs/dx/Windows/zerogs.vcxproj b/plugins/zerogs/dx/Windows/zerogs.vcxproj index 98cc7b2658..d1521d5ac7 100644 --- a/plugins/zerogs/dx/Windows/zerogs.vcxproj +++ b/plugins/zerogs/dx/Windows/zerogs.vcxproj @@ -43,14 +43,12 @@ - - @@ -58,7 +56,6 @@ - diff --git a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj index 330f639bb9..6b891d32a1 100644 --- a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj +++ b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj @@ -42,7 +42,6 @@ - @@ -51,7 +50,6 @@ - @@ -59,7 +57,6 @@ - diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj index 8f63697d4f..8f3599fb3f 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj +++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl.vcxproj @@ -42,14 +42,12 @@ - - @@ -57,7 +55,6 @@ - diff --git a/tools/bin2cpp/bin2c.vcxproj b/tools/bin2cpp/bin2c.vcxproj index 627e86ad9f..b6065d6d31 100644 --- a/tools/bin2cpp/bin2c.vcxproj +++ b/tools/bin2cpp/bin2c.vcxproj @@ -32,10 +32,8 @@ - - diff --git a/unfree/baseclasses/baseclasses.vcxproj b/unfree/baseclasses/baseclasses.vcxproj index 38dfccdb88..aa0f1eaced 100644 --- a/unfree/baseclasses/baseclasses.vcxproj +++ b/unfree/baseclasses/baseclasses.vcxproj @@ -56,25 +56,21 @@ - - - -