From 280f7fec397866ce4b982ac344c0cb8cf628b6a1 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Thu, 25 Apr 2019 23:45:25 +0200 Subject: [PATCH] Fix VS2019 builds and remove _xp dependency (drops Win XP support, allows latest SDK etc.) --- Common/Common.vcxproj | 13 +++++----- Core/Core.vcxproj | 11 ++++----- GPU/GPU.vcxproj | 29 +++++++++++------------ UI/UI.vcxproj | 11 ++++----- Windows/PPSSPP.vcxproj | 29 +++++++++++------------ ext/SPIRV-Cross.vcxproj | 11 ++++----- ext/discord-rpc-build/discord-rpc.vcxproj | 11 ++++----- ext/glslang.vcxproj | 10 ++++---- ext/libarmips.vcxproj | 15 ++++++------ ext/libkirk/libkirk.vcxproj | 13 +++++----- ext/native/native.vcxproj | 13 +++++----- ext/zlib/zlib.vcxproj | 13 +++++----- headless/Headless.vcxproj | 29 +++++++++++------------ unittest/UnitTests.vcxproj | 19 +++++++-------- 14 files changed, 107 insertions(+), 120 deletions(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 6200675522..343f4c8e83 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -22,33 +22,32 @@ {3FCDBAE2-5103-4350-9A8E-848CE9C73195} Win32Proj Common - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -331,4 +330,4 @@ - + \ No newline at end of file diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 51af34e22f..307121db06 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -21,34 +21,33 @@ {533F1D30-D04D-47CC-AD71-20F658907E36} Core - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 9354e28bc5..7f305cd305 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -21,34 +21,33 @@ {457F45D2-556F-47BC-A31D-AFF0D15BEAED} GPU - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -67,20 +66,20 @@ - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -390,4 +389,4 @@ - + \ No newline at end of file diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 935362f6b6..05114fd522 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -93,33 +93,32 @@ {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F} Win32Proj UI - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 27a423df46..64d26f8afd 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -23,30 +23,29 @@ DaSh Win32Proj PPSSPPWindows - - + 10.0 Application Unicode false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -98,25 +97,25 @@ ..\ PPSSPPDebug false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); PPSSPPDebug64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); PPSSPPWindows64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -587,4 +586,4 @@ - + \ No newline at end of file diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj index 3e1003593c..3caf3bb8d6 100644 --- a/ext/SPIRV-Cross.vcxproj +++ b/ext/SPIRV-Cross.vcxproj @@ -22,32 +22,31 @@ {4328A62C-F1E9-47ED-B816-A1A81DAF4363} Win32Proj SPIRVCross - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj b/ext/discord-rpc-build/discord-rpc.vcxproj index 0ef8d3d62a..0eaa3fb2f6 100644 --- a/ext/discord-rpc-build/discord-rpc.vcxproj +++ b/ext/discord-rpc-build/discord-rpc.vcxproj @@ -41,32 +41,31 @@ {BEB0A821-3C7F-410F-A525-63AFBC69BF8F} Win32Proj discordrpc - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj index 2d3af8be1d..d0287c12de 100644 --- a/ext/glslang.vcxproj +++ b/ext/glslang.vcxproj @@ -22,31 +22,31 @@ {EDFA2E87-8AC1-4853-95D4-D7594FF81947} Win32Proj glslang - 7.0 + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index 411af13881..f9aee07e19 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -30,45 +30,44 @@ {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25} Win32Proj libarmips - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj index c26a53464b..768034b8cb 100644 --- a/ext/libkirk/libkirk.vcxproj +++ b/ext/libkirk/libkirk.vcxproj @@ -21,33 +21,32 @@ {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE} libkirk - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode @@ -160,4 +159,4 @@ - + \ No newline at end of file diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index ba5a926d8b..ff2f8b9a50 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -22,34 +22,33 @@ {C4DF647E-80EA-4111-A0A8-218B1B711E18} Win32Proj native - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -773,4 +772,4 @@ - + \ No newline at end of file diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj index 6595864711..4f6f13cddc 100644 --- a/ext/zlib/zlib.vcxproj +++ b/ext/zlib/zlib.vcxproj @@ -52,34 +52,33 @@ {F761046E-6C38-4428-A5F1-38391A37BB34} Win32Proj zlib - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -196,4 +195,4 @@ - + \ No newline at end of file diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index f2c47e75ad..258dc0056d 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -23,34 +23,33 @@ Win32Proj Headless PPSSPPHeadless - - + 10.0 Application true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -70,23 +69,23 @@ true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); @@ -281,4 +280,4 @@ - + \ No newline at end of file diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index fa377805f9..adac87cddc 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -23,33 +23,32 @@ Win32Proj UnitTests UnitTest - - + 10.0 Application true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode Application true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode Application false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode Application false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode @@ -70,19 +69,19 @@ true - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); true - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); false - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64);