From 36ace8eb52aba1fa88b8e54a7c25c991b0964801 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 17 Aug 2020 12:29:25 -0700 Subject: [PATCH 01/11] prettify some constructs in vcxproj files --- Source/Core/AudioCommon/AudioCommon.vcxproj | 6 +-- Source/Core/Common/Common.vcxproj | 10 ++-- Source/Core/Core/Core.vcxproj | 52 +++++++++---------- Source/Core/DiscIO/DiscIO.vcxproj | 18 +++---- Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj | 26 +++++----- Source/Core/DolphinQt/DolphinQt.vcxproj | 52 +++++++++---------- Source/Core/UICommon/UICommon.vcxproj | 6 +-- .../Core/UpdaterCommon/UpdaterCommon.vcxproj | 6 +-- Source/Core/VideoBackends/D3D/D3D.vcxproj | 6 +-- Source/Core/VideoBackends/D3D12/D3D12.vcxproj | 6 +-- .../VideoBackends/D3DCommon/D3DCommon.vcxproj | 24 +-------- Source/Core/VideoBackends/OGL/OGL.vcxproj | 6 +-- Source/Core/VideoCommon/VideoCommon.vcxproj | 6 +-- Source/Core/WinUpdater/WinUpdater.vcxproj | 4 +- Source/UnitTests/UnitTests.vcxproj | 18 +++---- 15 files changed, 113 insertions(+), 133 deletions(-) diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 9da2eb3df7..dd3a37f852 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -76,15 +76,15 @@ - - {ec082900-b4d8-42e9-9663-77f02f6936ae} - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} {8498f2fa-5ca6-4169-9971-de5b1fe6132c} + + {ec082900-b4d8-42e9-9663-77f02f6936ae} + diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index daa33ec366..0679a09ec5 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -291,17 +291,17 @@ + + {bb00605c-125f-4a21-b33b-7bf418322dcb} + {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - {bb00605c-125f-4a21-b33b-7bf418322dcb} + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} {41279555-f94f-4ebc-99de-af863c10c5c4} diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index ceefd749c9..f264587297 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -140,8 +140,8 @@ - - + + @@ -500,7 +500,7 @@ - + @@ -719,27 +719,6 @@ - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - - {349ee8f9-7d25-4909-aaf5-ff3fade72187} - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - {31643fdb-1bb8-4965-9de7-000fc88d35ae} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} @@ -758,14 +737,35 @@ {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} + + {8ada04d7-6db1-4da4-ab55-64fb12a0997b} + {8ea11166-6512-44fc-b7a5-a4d1ecc81170} + + {cbc76802-c128-4b17-bf6c-23b08c313e5e} + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + + + {ab993f38-c31d-4897-b139-a620c42bc565} + + + {31643fdb-1bb8-4965-9de7-000fc88d35ae} + + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} + + + {23114507-079a-4418-9707-cfa81a03ca99} + {38fee76f-f347-484b-949c-b4649381cffb} - - {23114507-079a-4418-9707-cfa81a03ca99} + + {93d73454-2512-424e-9cda-4bb357fe13dd} diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index f439564e72..b70e8e3a8c 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -106,24 +106,24 @@ - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - {38fee76f-f347-484b-949c-b4649381cffb} - {055a775f-b4f5-4970-9240-f6cf7661f37b} {1d8c51d2-ffa4-418e-b183-9f42b6a6717e} + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} + + + {38fee76f-f347-484b-949c-b4649381cffb} + + + {ff213b23-2c26-4214-9f88-85271e557e87} + {1bea10f3-80ce-4bc4-9331-5769372cdf99} diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 74a14f6d97..c1fbaa34fd 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -54,35 +54,35 @@ - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - - + {e54cf649-140e-4255-81a5-30a673c1fb36} - + {604c8368-f34a-4d55-82c8-cc92a0c13254} - + {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - + + {570215b7-e32f-4438-95ae-c8d955f9fca3} + + {53a5391b-737e-49a8-bc8f-312ada00736f} - + {ec1a314c-5588-4506-9c1e-2e58e5817f75} - + {a4c423aa-f57c-46c7-a172-d1a777017d29} - + {29f29a19-f141-45ad-9679-5a2923b49da3} - + {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - {570215b7-e32f-4438-95ae-c8d955f9fca3} + + {c636d9d1-82fe-42b5-9987-63b7d4836341} diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 5040634451..6761f1f104 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -485,21 +485,6 @@ - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} @@ -518,35 +503,50 @@ {6bbd47cf-91fd-4077-b676-8b76980178a9} + + {604C8368-F34A-4D55-82C8-CC92A0C13254} + {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} + + {570215b7-e32f-4438-95ae-c8d955f9fca3} + + + {53A5391B-737E-49A8-BC8F-312ADA00736F} + {ec1a314c-5588-4506-9c1e-2e58e5817f75} {a4c423aa-f57c-46c7-a172-d1a777017d29} - - {53A5391B-737E-49A8-BC8F-312ADA00736F} + + {29f29a19-f141-45ad-9679-5a2923b49da3} {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - {604C8368-F34A-4D55-82C8-CC92A0C13254} - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - {29f29a19-f141-45ad-9679-5a2923b49da3} + + {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - + {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} - - {570215b7-e32f-4438-95ae-c8d955f9fca3} + + {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} + + + {ab993f38-c31d-4897-b139-a620c42bc565} + + + {93d73454-2512-424e-9cda-4bb357fe13dd} + + + {ff213b23-2c26-4214-9f88-85271e557e87} @@ -567,4 +567,4 @@ - + \ No newline at end of file diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index e39a6c24df..4386fbe602 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -50,12 +50,12 @@ {E54CF649-140E-4255-81A5-30A673C1FB36} - - {2c0d058e-de35-4471-ad99-e68a2caf9e18} - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + + {2c0d058e-de35-4471-ad99-e68a2caf9e18} + {38fee76f-f347-484b-949c-b4649381cffb} diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj index f968ef20a5..02067c225a 100644 --- a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj +++ b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj @@ -51,6 +51,9 @@ {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + {c636d9d1-82fe-42b5-9987-63b7d4836341} + {bb00605c-125f-4a21-b33b-7bf418322dcb} @@ -63,9 +66,6 @@ {ff213b23-2c26-4214-9f88-85271e557e87} - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj index 5622e7d79e..94dc1f1d41 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj @@ -71,12 +71,12 @@ + + {dea96cf2-f237-4a1a-b32f-c916769efb50} + {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - {dea96cf2-f237-4a1a-b32f-c916769efb50} - diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj index c2957fc654..9201593243 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj +++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj @@ -77,12 +77,12 @@ + + {dea96cf2-f237-4a1a-b32f-c916769efb50} + {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - {dea96cf2-f237-4a1a-b32f-c916769efb50} - diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj index 5f07041cf5..47e2bb56e6 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj +++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj @@ -43,30 +43,10 @@ - + NotUsing - - - - - - NotUsing - - - - - - - NotUsing - - - - - - NotUsing - - + diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index fc552200ae..faf54ef72d 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -75,12 +75,12 @@ - - {ff213b23-2c26-4214-9f88-85271e557e87} - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} + + {ff213b23-2c26-4214-9f88-85271e557e87} + diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index 75c215a3ab..890dd61e10 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -200,6 +200,9 @@ + + {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} @@ -212,9 +215,6 @@ {ff213b23-2c26-4214-9f88-85271e557e87} - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj index 89c8553905..93bef66f82 100644 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj +++ b/Source/Core/WinUpdater/WinUpdater.vcxproj @@ -53,10 +53,10 @@ - + {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - + {B001D13E-7EAB-4689-842D-801E5ACFFAC5} diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index 62355aacdc..31f7e3ad38 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -112,27 +112,27 @@ {E54CF649-140E-4255-81A5-30A673C1FB36} + + {604c8368-f34a-4d55-82c8-cc92a0c13254} + {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} + + {570215b7-e32f-4438-95ae-c8d955f9fca3} + + + {53A5391B-737E-49A8-BC8F-312ADA00736F} + {ec1a314c-5588-4506-9c1e-2e58e5817f75} {a4c423aa-f57c-46c7-a172-d1a777017d29} - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - {29F29A19-F141-45AD-9679-5A2923B49DA3} - - {604c8368-f34a-4d55-82c8-cc92a0c13254} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - From 3a0d8c02087617603093f4519f12fdfb8f362f80 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 17 Aug 2020 12:37:35 -0700 Subject: [PATCH 02/11] msbuild: enable D3DCommon to use pch --- Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj index 47e2bb56e6..567710bd25 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj +++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj @@ -43,12 +43,6 @@ - - - NotUsing - - - From 94bf48b67c76e55d54c922a4472b00f9314ba673 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 18 Aug 2020 17:34:06 -0700 Subject: [PATCH 03/11] msbuild: refactor stuff out of project files (for dolphin) --- Languages/Languages.vcxproj | 70 ++++++------------- Source/Core/AudioCommon/AudioCommon.vcxproj | 42 ++--------- Source/Core/Common/Common.vcxproj | 42 ++--------- Source/Core/Core/Core.vcxproj | 42 ++--------- Source/Core/DiscIO/DiscIO.vcxproj | 42 ++--------- Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj | 43 ++---------- Source/Core/DolphinQt/DolphinQt.vcxproj | 47 +++---------- Source/Core/InputCommon/InputCommon.vcxproj | 42 ++--------- Source/Core/UICommon/UICommon.vcxproj | 42 ++--------- .../Core/UpdaterCommon/UpdaterCommon.vcxproj | 52 +++----------- Source/Core/VideoBackends/D3D/D3D.vcxproj | 42 ++--------- Source/Core/VideoBackends/D3D12/D3D12.vcxproj | 42 ++--------- .../VideoBackends/D3DCommon/D3DCommon.vcxproj | 42 ++--------- Source/Core/VideoBackends/Null/Null.vcxproj | 42 ++--------- Source/Core/VideoBackends/OGL/OGL.vcxproj | 42 ++--------- .../VideoBackends/Software/Software.vcxproj | 42 ++--------- .../Core/VideoBackends/Vulkan/Vulkan.vcxproj | 42 ++--------- Source/Core/VideoCommon/VideoCommon.vcxproj | 42 ++--------- Source/Core/WinUpdater/WinUpdater.vcxproj | 43 ++---------- Source/DSPTool/DSPTool.vcxproj | 42 ++--------- Source/PCH/pch.vcxproj | 42 ++--------- Source/UnitTests/UnitTests.vcxproj | 42 ++--------- Source/VSProps/Base.Macros.props | 18 +++++ Source/VSProps/Base.Targets.props | 24 +++++++ Source/VSProps/Base.props | 16 +---- .../VSProps/Configuration.Application.props | 7 ++ Source/VSProps/Configuration.Base.props | 14 ++++ .../VSProps/Configuration.StaticLibrary.props | 7 ++ Source/VSProps/Configuration.Utility.props | 7 ++ 29 files changed, 252 insertions(+), 810 deletions(-) create mode 100644 Source/VSProps/Base.Macros.props create mode 100644 Source/VSProps/Base.Targets.props create mode 100644 Source/VSProps/Configuration.Application.props create mode 100644 Source/VSProps/Configuration.Base.props create mode 100644 Source/VSProps/Configuration.StaticLibrary.props create mode 100644 Source/VSProps/Configuration.Utility.props diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index fc5ad9998a..1027c3c1c2 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -1,23 +1,25 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + + + {0E033BE3-2E08-428E-9AE9-BC673EFA12B5} + + + + + + + + + + + + + + + $(BinaryOutputDir) + @@ -48,36 +50,6 @@ - - {0E033BE3-2E08-428E-9AE9-BC673EFA12B5} - 10.0 - - - - Utility - v142 - - - true - - - false - - - - - - - - - - - - $(BinaryOutputDir) - - - - diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index dd3a37f852..cfb43648b2 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 0679a09ec5..cb027cca2b 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index f264587297..89c294cf08 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -1,46 +1,18 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {E54CF649-140E-4255-81A5-30A673C1FB36} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index b70e8e3a8c..3d35b3ba50 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {160BDC25-5626-4B0D-BDD8-2953D9777FB5} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index c1fbaa34fd..1efaccc17e 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -1,49 +1,20 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {974E563D-23F8-4E8F-9083-F62876B04E08} - 10.0 - - Application - v142 - Unicode - - - true - - - false - + - - + - - + + - avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies) diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 6761f1f104..d749086fbe 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -1,51 +1,22 @@ - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + {FA3FA62B-6F58-4B86-9453-4D149940A066} - 10.0 Dolphin - - Application - v142 - Unicode - - - true - - - false - + - - + - - - + + + - - + @@ -551,7 +522,7 @@ - + diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index b5c9ef0bef..1325ca0eab 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {6BBD47CF-91FD-4077-B676-8B76980178A9} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index 4386fbe602..ba1fe12067 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {604C8368-F34A-4D55-82C8-CC92A0C13254} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj index 02067c225a..b6296570fc 100644 --- a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj +++ b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj @@ -1,52 +1,23 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + - 15.0 {B001D13E-7EAB-4689-842D-801E5ACFFAC5} - UpdaterCommon - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - - - + - + + - + + + {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} @@ -67,9 +38,6 @@ {ff213b23-2c26-4214-9f88-85271e557e87} - - - diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj index 94dc1f1d41..9f2f1b8fe1 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj index 9201593243..3fcbdb67a7 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj +++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {570215B7-E32F-4438-95AE-C8D955F9FCA3} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj index 567710bd25..83b93edd81 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj +++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {DEA96CF2-F237-4A1A-B32F-C916769EFB50} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj index 2c3cac1a43..53ffafa847 100644 --- a/Source/Core/VideoBackends/Null/Null.vcxproj +++ b/Source/Core/VideoBackends/Null/Null.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {53A5391B-737E-49A8-BC8F-312ADA00736F} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index faf54ef72d..70b1e64a22 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {EC1A314C-5588-4506-9C1E-2E58E5817F75} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj index 93e7a6c84a..d447824cf4 100644 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ b/Source/Core/VideoBackends/Software/Software.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {A4C423AA-F57C-46C7-A172-D1A777017D29} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj index 807e2aee31..b472838113 100644 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {29F29A19-F141-45AD-9679-5A2923B49DA3} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index 890dd61e10..f83ef2b4a7 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj index 93bef66f82..a59ef2bedb 100644 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj +++ b/Source/Core/WinUpdater/WinUpdater.vcxproj @@ -1,49 +1,20 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03} - 10.0 - - Application - v142 - Unicode - - - true - - - false - + - - + - - + + - Updater diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 1145e2f231..11cc86948b 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {1970D175-3DE8-4738-942A-4D98D1CDBF64} - 10.0 - - Application - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj index 8ed61f8fcd..daa908b4c5 100644 --- a/Source/PCH/pch.vcxproj +++ b/Source/PCH/pch.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {76563A7F-1011-4EAD-B667-7BB18D09568E} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index 31f7e3ad38..db0c349495 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {474661E7-C73A-43A6-AFEE-EE1EC433D49E} - 10.0 - - Application - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Source/VSProps/Base.Macros.props b/Source/VSProps/Base.Macros.props new file mode 100644 index 0000000000..bd57a5978a --- /dev/null +++ b/Source/VSProps/Base.Macros.props @@ -0,0 +1,18 @@ + + + + false + + D + $(SolutionDir)..\ + $(DolphinRootDir)Build\ + $(DolphinRootDir)Binary\ + $(BinaryRootDir)$(Platform)\ + $(DolphinRootDir)Externals\ + $(SolutionDir)Core\ + $(SolutionDir)VSProps\ + + + true + + \ No newline at end of file diff --git a/Source/VSProps/Base.Targets.props b/Source/VSProps/Base.Targets.props new file mode 100644 index 0000000000..7925a455ec --- /dev/null +++ b/Source/VSProps/Base.Targets.props @@ -0,0 +1,24 @@ + + + + + Debug + ARM64 + + + Debug + x64 + + + Release + ARM64 + + + Release + x64 + + + + 10.0 + + \ No newline at end of file diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 6d95d05cf5..a73f438abf 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -1,18 +1,6 @@ - - - - false - - - D - $(SolutionDir)..\ - $(DolphinRootDir)Build\ - $(DolphinRootDir)Binary\ - $(BinaryRootDir)$(Platform)\ - $(DolphinRootDir)Externals\ - $(SolutionDir)Core\ - + + + + + true + + + false + + \ No newline at end of file diff --git a/Source/VSProps/Configuration.StaticLibrary.props b/Source/VSProps/Configuration.StaticLibrary.props new file mode 100644 index 0000000000..162dd946f2 --- /dev/null +++ b/Source/VSProps/Configuration.StaticLibrary.props @@ -0,0 +1,7 @@ + + + + + StaticLibrary + + \ No newline at end of file diff --git a/Source/VSProps/Configuration.Utility.props b/Source/VSProps/Configuration.Utility.props new file mode 100644 index 0000000000..5897ceda06 --- /dev/null +++ b/Source/VSProps/Configuration.Utility.props @@ -0,0 +1,7 @@ + + + + + Utility + + \ No newline at end of file From 7705f7c1a3b13405da3ac3598466317abe19354b Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 18 Aug 2020 18:07:08 -0700 Subject: [PATCH 04/11] msbuild: refactor stuff out of project files (for externals) --- Externals/Bochs_disasm/Bochs_disasm.vcxproj | 42 ++--------- Externals/FreeSurround/FreeSurround.vcxproj | 42 ++--------- Externals/LZO/LZO.vcxproj | 42 ++--------- .../SFML/build/vc2010/SFML_Network.vcxproj | 42 ++--------- Externals/bzip2/bzip2.vcxproj | 44 ++--------- Externals/cpp-optparse/cpp-optparse.vcxproj | 42 ++--------- Externals/cubeb/msvc/cubeb.vcxproj | 41 ++--------- Externals/curl/curl.vcxproj | 73 ++++++------------- Externals/discord-rpc/src/discord-rpc.vcxproj | 67 ++++------------- Externals/ed25519/ed25519.vcxproj | 42 ++--------- Externals/enet/enet.vcxproj | 61 ++++------------ Externals/glslang/glslang.vcxproj | 42 ++--------- Externals/imgui/imgui.vcxproj | 42 ++--------- Externals/liblzma/liblzma.vcxproj | 44 ++--------- Externals/libpng/png/png.vcxproj | 42 ++--------- Externals/libusb/libusb_static_2013.vcxproj | 44 ++--------- Externals/mbedtls/mbedTLS.vcxproj | 42 ++--------- Externals/miniupnpc/miniupnpc.vcxproj | 42 ++--------- Externals/minizip/minizip.vcxproj | 43 ++--------- Externals/picojson/picojson.vcxproj | 42 ++--------- Externals/pugixml/pugixml.vcxproj | 42 ++--------- Externals/soundtouch/SoundTouch.vcxproj | 42 ++--------- Externals/xxhash/xxhash.vcxproj | 45 ++---------- Externals/zlib/zlib.vcxproj | 45 ++---------- Externals/zstd/zstd.vcxproj | 44 ++--------- 25 files changed, 209 insertions(+), 930 deletions(-) diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj index c614a5f793..77f5d6826d 100644 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/FreeSurround/FreeSurround.vcxproj b/Externals/FreeSurround/FreeSurround.vcxproj index e94b3781e5..cd7ef8e612 100644 --- a/Externals/FreeSurround/FreeSurround.vcxproj +++ b/Externals/FreeSurround/FreeSurround.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {8498F2FA-5CA6-4169-9971-DE5B1FE6132C} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj index 83af621942..ef1b0e6b42 100644 --- a/Externals/LZO/LZO.vcxproj +++ b/Externals/LZO/LZO.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {AB993F38-C31D-4897-B139-A620C42BC565} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj index dedb7a7153..c8f9988907 100644 --- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj +++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {93D73454-2512-424E-9CDA-4BB357FE13DD} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/bzip2/bzip2.vcxproj b/Externals/bzip2/bzip2.vcxproj index 5d123f4edd..703a8b3c28 100644 --- a/Externals/bzip2/bzip2.vcxproj +++ b/Externals/bzip2/bzip2.vcxproj @@ -1,48 +1,18 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + - 16.0 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E} - bzip2 - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj b/Externals/cpp-optparse/cpp-optparse.vcxproj index 2398db0a82..4cc380ea56 100644 --- a/Externals/cpp-optparse/cpp-optparse.vcxproj +++ b/Externals/cpp-optparse/cpp-optparse.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {C636D9D1-82FE-42B5-9987-63B7D4836341} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj index 2875d8ea19..f6605fe5dc 100644 --- a/Externals/cubeb/msvc/cubeb.vcxproj +++ b/Externals/cubeb/msvc/cubeb.vcxproj @@ -1,45 +1,20 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {8EA11166-6512-44FC-B7A5-A4D1ECC81170} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + + - - + + + ..\include;..\src;..\msvc;%(AdditionalIncludeDirectories) diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj index d22b7b5ae3..a6ac5a27e9 100644 --- a/Externals/curl/curl.vcxproj +++ b/Externals/curl/curl.vcxproj @@ -1,23 +1,26 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + + + {BB00605C-125F-4A21-B33B-7BF418322DCB} + + + + + + + + + + + + + + $(ExternalsDir)curl\lib;%(AdditionalIncludeDirectories) + CURL_STATICLIB;CURL_DISABLE_LDAP;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) + + true @@ -362,38 +365,6 @@ {ff213b23-2c26-4214-9f88-85271e557e87} - - {BB00605C-125F-4A21-B33B-7BF418322DCB} - 10.0 - - - - StaticLibrary - v142 - Unicode - - - true - - - false - - - - - - - - - - - - - - $(ExternalsDir)curl\lib;%(AdditionalIncludeDirectories) - CURL_STATICLIB;CURL_DISABLE_LDAP;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) - - diff --git a/Externals/discord-rpc/src/discord-rpc.vcxproj b/Externals/discord-rpc/src/discord-rpc.vcxproj index 18eaf56887..0eace1c339 100644 --- a/Externals/discord-rpc/src/discord-rpc.vcxproj +++ b/Externals/discord-rpc/src/discord-rpc.vcxproj @@ -1,54 +1,29 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} - 10.0 - Win32Proj - x64 - discord-rpc - - StaticLibrary - v142 - Unicode - + - - + - - + + <_ProjectFileVersion>10.0.20506.1 - + ..\include;..\thirdparty\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;DISCORD_WINDOWS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;DISCORD_WINDOWS;%(PreprocessorDefinitions) ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) @@ -61,25 +36,15 @@ - - - ..\include;..\thirdparty\include;%(AdditionalIncludeDirectories) - - - + - WIN32;_WINDOWS;NDEBUG;DISCORD_WINDOWS;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + + + NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - - ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - diff --git a/Externals/ed25519/ed25519.vcxproj b/Externals/ed25519/ed25519.vcxproj index dc9c22b1c7..8c72478ce5 100644 --- a/Externals/ed25519/ed25519.vcxproj +++ b/Externals/ed25519/ed25519.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/enet/enet.vcxproj b/Externals/enet/enet.vcxproj index 087b5a5e44..72223f2acd 100644 --- a/Externals/enet/enet.vcxproj +++ b/Externals/enet/enet.vcxproj @@ -1,23 +1,20 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + + + {CBC76802-C128-4B17-BF6C-23B08C313E5E} + + + + + + + + + + + @@ -47,32 +44,6 @@ - - {CBC76802-C128-4B17-BF6C-23B08C313E5E} - 10.0 - - - - StaticLibrary - v142 - Unicode - - - true - - - false - - - - - - - - - - - diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj index 6e0b810a0a..46f0305aaf 100644 --- a/Externals/glslang/glslang.vcxproj +++ b/Externals/glslang/glslang.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {D178061B-84D3-44F9-BEED-EFD18D9033F0} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/imgui/imgui.vcxproj b/Externals/imgui/imgui.vcxproj index 9b21e287e4..5eb6c9ddf0 100644 --- a/Externals/imgui/imgui.vcxproj +++ b/Externals/imgui/imgui.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/liblzma/liblzma.vcxproj b/Externals/liblzma/liblzma.vcxproj index 1f685a80d1..4726265195 100644 --- a/Externals/liblzma/liblzma.vcxproj +++ b/Externals/liblzma/liblzma.vcxproj @@ -1,48 +1,18 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + - 16.0 {055A775F-B4F5-4970-9240-F6CF7661F37B} - liblzma - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj index e9e63bcf65..20aca64ac5 100644 --- a/Externals/libpng/png/png.vcxproj +++ b/Externals/libpng/png/png.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {4C9F135B-A85E-430C-BAD4-4C67EF5FC12C} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj index d1dd4c0e96..516e5f9c1d 100644 --- a/Externals/libusb/libusb_static_2013.vcxproj +++ b/Externals/libusb/libusb_static_2013.vcxproj @@ -1,50 +1,20 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + - libusb-1.0 {349EE8F9-7D25-4909-AAF5-FF3FADE72187} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + - diff --git a/Externals/mbedtls/mbedTLS.vcxproj b/Externals/mbedtls/mbedTLS.vcxproj index fd515be40b..fc79f6f00f 100644 --- a/Externals/mbedtls/mbedTLS.vcxproj +++ b/Externals/mbedtls/mbedTLS.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {BDB6578B-0691-4E80-A46C-DF21639FD3B8} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj index b409ffed30..a9c2578552 100644 --- a/Externals/miniupnpc/miniupnpc.vcxproj +++ b/Externals/miniupnpc/miniupnpc.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {31643FDB-1BB8-4965-9DE7-000FC88D35AE} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/minizip/minizip.vcxproj b/Externals/minizip/minizip.vcxproj index af620547b7..44b091d1f2 100644 --- a/Externals/minizip/minizip.vcxproj +++ b/Externals/minizip/minizip.vcxproj @@ -1,49 +1,20 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {23114507-079A-4418-9707-CFA81A03CA99} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + - NOUNCRYPT;%(PreprocessorDefinitions) diff --git a/Externals/picojson/picojson.vcxproj b/Externals/picojson/picojson.vcxproj index 30fd095ca8..49a07293f7 100644 --- a/Externals/picojson/picojson.vcxproj +++ b/Externals/picojson/picojson.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {2C0D058E-DE35-4471-AD99-E68A2CAF9E18} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/pugixml/pugixml.vcxproj b/Externals/pugixml/pugixml.vcxproj index 05200bdb3f..7cef0fbc98 100644 --- a/Externals/pugixml/pugixml.vcxproj +++ b/Externals/pugixml/pugixml.vcxproj @@ -1,46 +1,18 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {38FEE76F-F347-484B-949C-B4649381CFFB} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/soundtouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj index bc99698372..e1c8e4f92f 100644 --- a/Externals/soundtouch/SoundTouch.vcxproj +++ b/Externals/soundtouch/SoundTouch.vcxproj @@ -1,46 +1,18 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {EC082900-B4D8-42E9-9663-77F02F6936AE} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + diff --git a/Externals/xxhash/xxhash.vcxproj b/Externals/xxhash/xxhash.vcxproj index 3aed79e621..3677d08919 100644 --- a/Externals/xxhash/xxhash.vcxproj +++ b/Externals/xxhash/xxhash.vcxproj @@ -1,51 +1,20 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {677EA016-1182-440C-9345-DC88D1E98C0C} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + - - - diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj index 0ca8e7e40a..05c667fc35 100644 --- a/Externals/zlib/zlib.vcxproj +++ b/Externals/zlib/zlib.vcxproj @@ -1,51 +1,20 @@  - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + {FF213B23-2C26-4214-9F88-85271E557E87} - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + - - - diff --git a/Externals/zstd/zstd.vcxproj b/Externals/zstd/zstd.vcxproj index a56dfa20a0..a7485fe28d 100644 --- a/Externals/zstd/zstd.vcxproj +++ b/Externals/zstd/zstd.vcxproj @@ -1,48 +1,18 @@ - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - + + + - 16.0 {1BEA10F3-80CE-4BC4-9331-5769372CDF99} - zstd - 10.0 - - StaticLibrary - v142 - Unicode - - - true - - - false - + - - + - - + + From 390f509bbf7689c737cb8c6a5859839236449092 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 20 Aug 2020 13:52:54 -0700 Subject: [PATCH 05/11] windows: disable C4200 directly in libusb.h --- Externals/libusb/libusb/libusb.h | 7 +++++++ Source/Core/Core/Core.vcxproj | 16 ++++------------ Source/Core/InputCommon/InputCommon.vcxproj | 8 +------- Source/Core/UICommon/UICommon.vcxproj | 4 +--- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Externals/libusb/libusb/libusb.h b/Externals/libusb/libusb/libusb.h index 8a6b0bfa9f..777250e47f 100644 --- a/Externals/libusb/libusb/libusb.h +++ b/Externals/libusb/libusb/libusb.h @@ -25,6 +25,9 @@ #define LIBUSB_H #ifdef _MSC_VER +#pragma warning(push) +/* Disable: warning C4200: nonstandard extension used : zero-sized array in struct/union */ +#pragma warning(disable:4200) /* on MS environments, the inline keyword is available in C++ only */ #if !defined(__cplusplus) #define inline __inline @@ -2059,6 +2062,10 @@ enum libusb_option { int LIBUSB_CALL libusb_set_option(libusb_context *ctx, enum libusb_option option, ...); +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 89c294cf08..4880f03e47 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -211,15 +211,9 @@ - - 4200;%(DisableSpecificWarnings) - - - 4200;%(DisableSpecificWarnings) - - - 4200;%(DisableSpecificWarnings) - + + + @@ -232,9 +226,7 @@ - - 4200;%(DisableSpecificWarnings) - + diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 1325ca0eab..51bf5e9661 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -50,13 +50,7 @@ - - - 4200;%(DisableSpecificWarnings) - + diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index ba1fe12067..1536f9b894 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -42,9 +42,7 @@ - - 4200;%(DisableSpecificWarnings) - + From 1f8cda62817fd0b80c1ea74fe239154ef0b48083 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 20 Aug 2020 16:26:26 -0700 Subject: [PATCH 06/11] DolphinQt: sort the files in vcxproj --- Source/Core/DolphinQt/DolphinQt.vcxproj | 182 ++++++++++++------------ 1 file changed, 89 insertions(+), 93 deletions(-) diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index d749086fbe..a43669fd5e 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -21,18 +21,14 @@ 5054;%(DisableSpecificWarnings) + $(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)Config\ControllerInterface;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories) - - avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies) $(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories) opengl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) $(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories) - - $(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)Config\ControllerInterface;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories) - DolphinQt.manifest;%(AdditionalManifestFiles) @@ -45,15 +41,35 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -79,69 +95,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + + + + + - - - - - - @@ -167,49 +151,53 @@ + + + + + + + + + + + + - + - + - - - + + - - - - - - - - + @@ -218,6 +206,13 @@ + + + + + + + @@ -241,72 +236,73 @@ - - + + - + - + - - + + - + + - - + + - + + - @@ -316,7 +312,6 @@ - @@ -325,9 +320,12 @@ + + + @@ -354,49 +352,38 @@ - - + - + - - - - - - - - - - - - - - - + - - + + + + - + + + @@ -407,6 +394,7 @@ + @@ -417,8 +405,10 @@ + + @@ -428,8 +418,14 @@ - + + + + + + + From 2f47f486af31e1d1b9447e5967fdfd3b715d31c1 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 20 Aug 2020 20:27:07 -0700 Subject: [PATCH 07/11] msbuild: re-enable standalone vcxproj processing --- Externals/Bochs_disasm/Bochs_disasm.vcxproj | 2 +- Externals/FreeSurround/FreeSurround.vcxproj | 2 +- Externals/LZO/LZO.vcxproj | 2 +- Externals/SFML/build/vc2010/SFML_Network.vcxproj | 2 +- Externals/bzip2/bzip2.vcxproj | 2 +- Externals/cpp-optparse/cpp-optparse.vcxproj | 2 +- Externals/cubeb/msvc/cubeb.vcxproj | 2 +- Externals/curl/curl.vcxproj | 2 +- Externals/discord-rpc/src/discord-rpc.vcxproj | 2 +- Externals/ed25519/ed25519.vcxproj | 2 +- Externals/enet/enet.vcxproj | 2 +- Externals/glslang/glslang.vcxproj | 2 +- Externals/imgui/imgui.vcxproj | 2 +- Externals/liblzma/liblzma.vcxproj | 2 +- Externals/libpng/png/png.vcxproj | 2 +- Externals/libusb/libusb_static_2013.vcxproj | 2 +- Externals/mbedtls/mbedTLS.vcxproj | 2 +- Externals/miniupnpc/miniupnpc.vcxproj | 2 +- Externals/minizip/minizip.vcxproj | 2 +- Externals/picojson/picojson.vcxproj | 2 +- Externals/pugixml/pugixml.vcxproj | 2 +- Externals/soundtouch/SoundTouch.vcxproj | 2 +- Externals/xxhash/xxhash.vcxproj | 2 +- Externals/zlib/zlib.vcxproj | 2 +- Externals/zstd/zstd.vcxproj | 2 +- Languages/Languages.vcxproj | 2 +- Source/Core/AudioCommon/AudioCommon.vcxproj | 2 +- Source/Core/Common/Common.vcxproj | 2 +- Source/Core/Core/Core.vcxproj | 2 +- Source/Core/DiscIO/DiscIO.vcxproj | 2 +- Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj | 2 +- Source/Core/DolphinQt/DolphinQt.vcxproj | 2 +- Source/Core/InputCommon/InputCommon.vcxproj | 2 +- Source/Core/UICommon/UICommon.vcxproj | 2 +- Source/Core/UpdaterCommon/UpdaterCommon.vcxproj | 2 +- Source/Core/VideoBackends/D3D/D3D.vcxproj | 2 +- Source/Core/VideoBackends/D3D12/D3D12.vcxproj | 2 +- Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj | 2 +- Source/Core/VideoBackends/Null/Null.vcxproj | 2 +- Source/Core/VideoBackends/OGL/OGL.vcxproj | 2 +- Source/Core/VideoBackends/Software/Software.vcxproj | 2 +- Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj | 2 +- Source/Core/VideoCommon/VideoCommon.vcxproj | 2 +- Source/Core/WinUpdater/WinUpdater.vcxproj | 2 +- Source/DSPTool/DSPTool.vcxproj | 2 +- Source/PCH/pch.vcxproj | 2 +- Source/UnitTests/UnitTests.vcxproj | 2 +- Source/VSProps/Base.Macros.props | 7 ++++--- Source/VSProps/PCHUse.props | 3 ++- 49 files changed, 53 insertions(+), 51 deletions(-) diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj index 77f5d6826d..436efa8500 100644 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj @@ -1,6 +1,6 @@  - + {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} diff --git a/Externals/FreeSurround/FreeSurround.vcxproj b/Externals/FreeSurround/FreeSurround.vcxproj index cd7ef8e612..cfc29e5dc2 100644 --- a/Externals/FreeSurround/FreeSurround.vcxproj +++ b/Externals/FreeSurround/FreeSurround.vcxproj @@ -1,6 +1,6 @@  - + {8498F2FA-5CA6-4169-9971-DE5B1FE6132C} diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj index ef1b0e6b42..fd30576fe3 100644 --- a/Externals/LZO/LZO.vcxproj +++ b/Externals/LZO/LZO.vcxproj @@ -1,6 +1,6 @@  - + {AB993F38-C31D-4897-B139-A620C42BC565} diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj index c8f9988907..e5d944b714 100644 --- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj +++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj @@ -1,6 +1,6 @@  - + {93D73454-2512-424E-9CDA-4BB357FE13DD} diff --git a/Externals/bzip2/bzip2.vcxproj b/Externals/bzip2/bzip2.vcxproj index 703a8b3c28..cd3c043b2d 100644 --- a/Externals/bzip2/bzip2.vcxproj +++ b/Externals/bzip2/bzip2.vcxproj @@ -1,6 +1,6 @@ - + {1D8C51D2-FFA4-418E-B183-9F42B6A6717E} diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj b/Externals/cpp-optparse/cpp-optparse.vcxproj index 4cc380ea56..7c7d89099a 100644 --- a/Externals/cpp-optparse/cpp-optparse.vcxproj +++ b/Externals/cpp-optparse/cpp-optparse.vcxproj @@ -1,6 +1,6 @@  - + {C636D9D1-82FE-42B5-9987-63B7D4836341} diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj index f6605fe5dc..cc2a52cea1 100644 --- a/Externals/cubeb/msvc/cubeb.vcxproj +++ b/Externals/cubeb/msvc/cubeb.vcxproj @@ -1,6 +1,6 @@  - + {8EA11166-6512-44FC-B7A5-A4D1ECC81170} diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj index a6ac5a27e9..35c0056786 100644 --- a/Externals/curl/curl.vcxproj +++ b/Externals/curl/curl.vcxproj @@ -1,6 +1,6 @@  - + {BB00605C-125F-4A21-B33B-7BF418322DCB} diff --git a/Externals/discord-rpc/src/discord-rpc.vcxproj b/Externals/discord-rpc/src/discord-rpc.vcxproj index 0eace1c339..b1774add0c 100644 --- a/Externals/discord-rpc/src/discord-rpc.vcxproj +++ b/Externals/discord-rpc/src/discord-rpc.vcxproj @@ -1,6 +1,6 @@  - + {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} diff --git a/Externals/ed25519/ed25519.vcxproj b/Externals/ed25519/ed25519.vcxproj index 8c72478ce5..2aa00291d7 100644 --- a/Externals/ed25519/ed25519.vcxproj +++ b/Externals/ed25519/ed25519.vcxproj @@ -1,6 +1,6 @@  - + {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3} diff --git a/Externals/enet/enet.vcxproj b/Externals/enet/enet.vcxproj index 72223f2acd..75e3b4a7f6 100644 --- a/Externals/enet/enet.vcxproj +++ b/Externals/enet/enet.vcxproj @@ -1,6 +1,6 @@  - + {CBC76802-C128-4B17-BF6C-23B08C313E5E} diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj index 46f0305aaf..16c3f5a575 100644 --- a/Externals/glslang/glslang.vcxproj +++ b/Externals/glslang/glslang.vcxproj @@ -1,6 +1,6 @@  - + {D178061B-84D3-44F9-BEED-EFD18D9033F0} diff --git a/Externals/imgui/imgui.vcxproj b/Externals/imgui/imgui.vcxproj index 5eb6c9ddf0..5080cdb770 100644 --- a/Externals/imgui/imgui.vcxproj +++ b/Externals/imgui/imgui.vcxproj @@ -1,6 +1,6 @@  - + {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB} diff --git a/Externals/liblzma/liblzma.vcxproj b/Externals/liblzma/liblzma.vcxproj index 4726265195..f5a34f1bf3 100644 --- a/Externals/liblzma/liblzma.vcxproj +++ b/Externals/liblzma/liblzma.vcxproj @@ -1,6 +1,6 @@ - + {055A775F-B4F5-4970-9240-F6CF7661F37B} diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj index 20aca64ac5..d1d649b4e0 100644 --- a/Externals/libpng/png/png.vcxproj +++ b/Externals/libpng/png/png.vcxproj @@ -1,6 +1,6 @@  - + {4C9F135B-A85E-430C-BAD4-4C67EF5FC12C} diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj index 516e5f9c1d..82c22ad98f 100644 --- a/Externals/libusb/libusb_static_2013.vcxproj +++ b/Externals/libusb/libusb_static_2013.vcxproj @@ -1,6 +1,6 @@  - + {349EE8F9-7D25-4909-AAF5-FF3FADE72187} diff --git a/Externals/mbedtls/mbedTLS.vcxproj b/Externals/mbedtls/mbedTLS.vcxproj index fc79f6f00f..aedf6d434e 100644 --- a/Externals/mbedtls/mbedTLS.vcxproj +++ b/Externals/mbedtls/mbedTLS.vcxproj @@ -1,6 +1,6 @@  - + {BDB6578B-0691-4E80-A46C-DF21639FD3B8} diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj index a9c2578552..fa89c4477e 100644 --- a/Externals/miniupnpc/miniupnpc.vcxproj +++ b/Externals/miniupnpc/miniupnpc.vcxproj @@ -1,6 +1,6 @@  - + {31643FDB-1BB8-4965-9DE7-000FC88D35AE} diff --git a/Externals/minizip/minizip.vcxproj b/Externals/minizip/minizip.vcxproj index 44b091d1f2..fe499a0825 100644 --- a/Externals/minizip/minizip.vcxproj +++ b/Externals/minizip/minizip.vcxproj @@ -1,6 +1,6 @@  - + {23114507-079A-4418-9707-CFA81A03CA99} diff --git a/Externals/picojson/picojson.vcxproj b/Externals/picojson/picojson.vcxproj index 49a07293f7..bec09f7595 100644 --- a/Externals/picojson/picojson.vcxproj +++ b/Externals/picojson/picojson.vcxproj @@ -1,6 +1,6 @@  - + {2C0D058E-DE35-4471-AD99-E68A2CAF9E18} diff --git a/Externals/pugixml/pugixml.vcxproj b/Externals/pugixml/pugixml.vcxproj index 7cef0fbc98..acab84d8ed 100644 --- a/Externals/pugixml/pugixml.vcxproj +++ b/Externals/pugixml/pugixml.vcxproj @@ -1,6 +1,6 @@ - + {38FEE76F-F347-484B-949C-B4649381CFFB} diff --git a/Externals/soundtouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj index e1c8e4f92f..c29234fada 100644 --- a/Externals/soundtouch/SoundTouch.vcxproj +++ b/Externals/soundtouch/SoundTouch.vcxproj @@ -1,6 +1,6 @@  - + {EC082900-B4D8-42E9-9663-77F02F6936AE} diff --git a/Externals/xxhash/xxhash.vcxproj b/Externals/xxhash/xxhash.vcxproj index 3677d08919..838bf38020 100644 --- a/Externals/xxhash/xxhash.vcxproj +++ b/Externals/xxhash/xxhash.vcxproj @@ -1,6 +1,6 @@  - + {677EA016-1182-440C-9345-DC88D1E98C0C} diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj index 05c667fc35..258c80ff6b 100644 --- a/Externals/zlib/zlib.vcxproj +++ b/Externals/zlib/zlib.vcxproj @@ -1,6 +1,6 @@  - + {FF213B23-2C26-4214-9F88-85271E557E87} diff --git a/Externals/zstd/zstd.vcxproj b/Externals/zstd/zstd.vcxproj index a7485fe28d..c2a3d2f775 100644 --- a/Externals/zstd/zstd.vcxproj +++ b/Externals/zstd/zstd.vcxproj @@ -1,6 +1,6 @@ - + {1BEA10F3-80CE-4BC4-9331-5769372CDF99} diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 1027c3c1c2..f8b4c7a10a 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -1,6 +1,6 @@  - + {0E033BE3-2E08-428E-9AE9-BC673EFA12B5} diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index cfb43648b2..270997ef92 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -1,6 +1,6 @@  - + {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index cb027cca2b..47e8957fe4 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -1,6 +1,6 @@  - + {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 4880f03e47..16e58c7ca3 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -1,6 +1,6 @@ - + {E54CF649-140E-4255-81A5-30A673C1FB36} diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index 3d35b3ba50..16a6a41aa0 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -1,6 +1,6 @@  - + {160BDC25-5626-4B0D-BDD8-2953D9777FB5} diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 1efaccc17e..47e6d9d5eb 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -1,6 +1,6 @@ - + {974E563D-23F8-4E8F-9083-F62876B04E08} diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index a43669fd5e..b0ec97938c 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -1,6 +1,6 @@ - + {FA3FA62B-6F58-4B86-9453-4D149940A066} diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 51bf5e9661..b451760354 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -1,6 +1,6 @@  - + {6BBD47CF-91FD-4077-B676-8B76980178A9} diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index 1536f9b894..f39896f4a1 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -1,6 +1,6 @@  - + {604C8368-F34A-4D55-82C8-CC92A0C13254} diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj index b6296570fc..e707486a3d 100644 --- a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj +++ b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj @@ -1,6 +1,6 @@ - + {B001D13E-7EAB-4689-842D-801E5ACFFAC5} diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj index 9f2f1b8fe1..a549474bdd 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj @@ -1,6 +1,6 @@  - + {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj index 3fcbdb67a7..3c297763f7 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj +++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj @@ -1,6 +1,6 @@  - + {570215B7-E32F-4438-95AE-C8D955F9FCA3} diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj index 83b93edd81..18c92fe5aa 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj +++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj @@ -1,6 +1,6 @@  - + {DEA96CF2-F237-4A1A-B32F-C916769EFB50} diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj index 53ffafa847..b9001c2718 100644 --- a/Source/Core/VideoBackends/Null/Null.vcxproj +++ b/Source/Core/VideoBackends/Null/Null.vcxproj @@ -1,6 +1,6 @@  - + {53A5391B-737E-49A8-BC8F-312ADA00736F} diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index 70b1e64a22..28f7152a06 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -1,6 +1,6 @@  - + {EC1A314C-5588-4506-9C1E-2E58E5817F75} diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj index d447824cf4..68c9e2132e 100644 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ b/Source/Core/VideoBackends/Software/Software.vcxproj @@ -1,6 +1,6 @@  - + {A4C423AA-F57C-46C7-A172-D1A777017D29} diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj index b472838113..f92f3678a9 100644 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj @@ -1,6 +1,6 @@  - + {29F29A19-F141-45AD-9679-5A2923B49DA3} diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index f83ef2b4a7..53842ece7d 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -1,6 +1,6 @@  - + {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj index a59ef2bedb..772239e360 100644 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj +++ b/Source/Core/WinUpdater/WinUpdater.vcxproj @@ -1,6 +1,6 @@ - + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03} diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 11cc86948b..2256a856aa 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -1,6 +1,6 @@  - + {1970D175-3DE8-4738-942A-4D98D1CDBF64} diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj index daa908b4c5..1c3d0203bf 100644 --- a/Source/PCH/pch.vcxproj +++ b/Source/PCH/pch.vcxproj @@ -1,6 +1,6 @@  - + {76563A7F-1011-4EAD-B667-7BB18D09568E} diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index db0c349495..3d3d0f4baf 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -1,6 +1,6 @@  - + {474661E7-C73A-43A6-AFEE-EE1EC433D49E} diff --git a/Source/VSProps/Base.Macros.props b/Source/VSProps/Base.Macros.props index bd57a5978a..2ad93b1009 100644 --- a/Source/VSProps/Base.Macros.props +++ b/Source/VSProps/Base.Macros.props @@ -4,13 +4,14 @@ false D - $(SolutionDir)..\ + $(MSBuildThisFileDirectory)..\..\ $(DolphinRootDir)Build\ $(DolphinRootDir)Binary\ $(BinaryRootDir)$(Platform)\ $(DolphinRootDir)Externals\ - $(SolutionDir)Core\ - $(SolutionDir)VSProps\ + $(DolphinRootDir)Source\ + $(SourceDir)Core\ + $(SourceDir)VSProps\ true diff --git a/Source/VSProps/PCHUse.props b/Source/VSProps/PCHUse.props index 43e0aaf435..9a837e3ba2 100644 --- a/Source/VSProps/PCHUse.props +++ b/Source/VSProps/PCHUse.props @@ -1,6 +1,7 @@ + @@ -11,7 +12,7 @@ - + {76563A7F-1011-4EAD-B667-7BB18D09568E} false true From 03a263db204161fdbd1a37aef89b4ea5197c0c30 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 21 Aug 2020 00:11:24 -0700 Subject: [PATCH 08/11] msbuild: fixup linking of discord-rpc --- Externals/discord-rpc/src/discord-rpc.vcxproj | 22 ------------------- Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj | 6 +++-- Source/Core/DolphinQt/DolphinQt.vcxproj | 20 ++++++++++++++--- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/Externals/discord-rpc/src/discord-rpc.vcxproj b/Externals/discord-rpc/src/discord-rpc.vcxproj index b1774add0c..41c1cc2d04 100644 --- a/Externals/discord-rpc/src/discord-rpc.vcxproj +++ b/Externals/discord-rpc/src/discord-rpc.vcxproj @@ -15,9 +15,6 @@ - - <_ProjectFileVersion>10.0.20506.1 - ..\include;..\thirdparty\include;%(AdditionalIncludeDirectories) @@ -26,25 +23,6 @@ WIN32;_WINDOWS;DISCORD_WINDOWS;%(PreprocessorDefinitions) ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) - - ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - - - _DEBUG;%(PreprocessorDefinitions) - - - - - NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 47e6d9d5eb..1acb1d5291 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -17,8 +17,7 @@ - avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies) - $(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories) + avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) opengl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) $(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories) Console @@ -55,6 +54,9 @@ {c636d9d1-82fe-42b5-9987-63b7d4836341} + + {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index b0ec97938c..8e29973648 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -21,11 +21,22 @@ 5054;%(DisableSpecificWarnings) - $(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)Config\ControllerInterface;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories) + + ($ProjectDir)Config\Graphics;%(AdditionalIncludeDirectories) + $(ProjectDir)Config;%(AdditionalIncludeDirectories) + $(ProjectDir)Config\ControllerInterface;%(AdditionalIncludeDirectories) + $(ProjectDir)Config\Mapping;%(AdditionalIncludeDirectories) + $(ProjectDir)Debugger;%(AdditionalIncludeDirectories) + $(ProjectDir)FIFO;%(AdditionalIncludeDirectories) + $(ProjectDir)GameList;%(AdditionalIncludeDirectories) + $(ProjectDir)NetPlay;%(AdditionalIncludeDirectories) + $(ProjectDir)QtUtils;%(AdditionalIncludeDirectories) + $(ProjectDir)Settings;%(AdditionalIncludeDirectories) + $(ProjectDir)TAS;%(AdditionalIncludeDirectories) + $(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories) - avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies) - $(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories) + avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) opengl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) $(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories) @@ -500,6 +511,9 @@ {8ada04d7-6db1-4da4-ab55-64fb12a0997b} + + {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} From af559385380dfe2a5dc1f2d9f11d5c6deab2555b Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 21 Aug 2020 01:18:14 -0700 Subject: [PATCH 09/11] msbuild: use the moc dispatcher from Qt's vstools The new method supports build parallelism and cleaner integration into msbuild dependency flows. --- Source/Core/DolphinQt/DolphinQt.vcxproj | 399 +++----- Source/VSProps/QtCompile.props | 60 +- Source/VSProps/QtCompile.targets | 10 - Source/VSProps/qt_globals.targets | 558 ++++++++++++ Source/VSProps/qt_tasks.targets | 1110 +++++++++++++++++++++++ Source/VSProps/qtmoc.props | 83 ++ Source/VSProps/qtmoc.targets | 510 +++++++++++ Source/VSProps/qtmoc_cl.targets | 49 + 8 files changed, 2465 insertions(+), 314 deletions(-) delete mode 100644 Source/VSProps/QtCompile.targets create mode 100644 Source/VSProps/qt_globals.targets create mode 100644 Source/VSProps/qt_tasks.targets create mode 100644 Source/VSProps/qtmoc.props create mode 100644 Source/VSProps/qtmoc.targets create mode 100644 Source/VSProps/qtmoc_cl.targets diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 8e29973648..89ecbafd2e 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -21,7 +21,6 @@ 5054;%(DisableSpecificWarnings) - ($ProjectDir)Config\Graphics;%(AdditionalIncludeDirectories) $(ProjectDir)Config;%(AdditionalIncludeDirectories) $(ProjectDir)Config\ControllerInterface;%(AdditionalIncludeDirectories) @@ -44,268 +43,7 @@ DolphinQt.manifest;%(AdditionalManifestFiles) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -442,7 +180,11 @@ - + @@ -455,6 +197,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -531,9 +400,7 @@ - - - + diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index 6ee1546228..107f176795 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -1,5 +1,5 @@ - + $(ExternalsDir)Qt\Qt5.15.0\msvc2019_64\ $(ExternalsDir)Qt\Qt5.15.0\msvc2019_arm64\ @@ -12,7 +12,6 @@ $(QTDIR)bin\ $(QTDIR)plugins\ $(IntDir) - $(QtToolOutDir)moc_ d $(QtDebugSuffix) QtPlugins @@ -22,7 +21,6 @@ QT_NO_DEBUG;%(PreprocessorDefinitions) QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) QT_USE_QSTRINGBUILDER;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_TO_ASCII;%(PreprocessorDefinitions) - $(ProjectDir);%(AdditionalIncludeDirectories) $(QtToolOutDir);%(AdditionalIncludeDirectories) $(QtIncludeDir);%(AdditionalIncludeDirectories) $(QtIncludeDir)QtCore;%(AdditionalIncludeDirectories) @@ -45,46 +43,32 @@ - - - - -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -D_SECURE_SCL=0 -D_ARCH_64=1 -D_M_X86_64=1 -D_M_X86=1 -DUSE_UPNP -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_UNICODE -DUNICODE - -DQT_NO_DEBUG -DNDEBUG $(MocDefines) - - "-I$(QtIncludeDir)QtWidgets" "-I$(QtIncludeDir)QtGui" "-I$(QtIncludeDir)QtCore" "-I$(QtIncludeDir) " "-I$(QtToolOutDir) " -I. - "-I$(ExternalsDir)xxhash" "-I$(ExternalsDir)zlib" "-I$(ExternalsDir)SFML\include" "-I$(ExternalsDir)mbedtls\include" "-I$(ExternalsDir)miniupnpc\src" "-I$(ExternalsDir)LZO" "-I$(ExternalsDir)libusbx\libusb" "-I$(ExternalsDir)libpng" "-I$(ExternalsDir)GL" "-I$(ExternalsDir)Bochs_disasm" "-I$(CoreDir) " $(MocIncludes) - - - - - - - - - - - - - + + + + + $(QtToolOutDir)moc_%(Filename).cpp + $(QtToolOutDir) + + + + + + + - - QtMoc - diff --git a/Source/VSProps/QtCompile.targets b/Source/VSProps/QtCompile.targets deleted file mode 100644 index bd437e7c34..0000000000 --- a/Source/VSProps/QtCompile.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - QtMocClean;$(CleanDependsOn) - - - \ No newline at end of file diff --git a/Source/VSProps/qt_globals.targets b/Source/VSProps/qt_globals.targets new file mode 100644 index 0000000000..8b6eb23dbc --- /dev/null +++ b/Source/VSProps/qt_globals.targets @@ -0,0 +1,558 @@ + + + + + + + + + + QtVersion; + $(BuildDependsOn); + Qt + + + $(CleanDependsOn); + QtClean + + + $(DesignTimeBuildInitTargets); + Qt + + + $(ComputeCompileInputsTargets); + Qt + + + $(BeforeClCompileTargets); + Qt + + + $(ComputeLinkInputsTargets); + Qt + + + + + + + $(QtVSToolsVersion) + false + $([System.IO.Path]::Combine($(ProjectDir),$(IntDir)qt_work.log)) + $([System.Environment]::ProcessorCount) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $([System.String]::Copy('%(QtLogData.Identity)').Split('|')[1]) + + + + + + + + + + + + + + + + + @(QtWork->'%(WorkType)(%(Identity))') + @(QtWork->'%(DependenciesChanged)') + @(QtWork->'%(InputChanged)') + true + + + + + + + + @(log_entry->'%(Hash)') + + + + + true + true + + + + + + 0 + true + + + + + + + + + $(work_hash) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + InputPath + %(QtWork.Identity) + %(QtWork.Identity) + + + InputPath + @(ResourceFiles->'%(Value)') + @(ResourceFiles->'%(Value)') + + + OutputPath + %(QtWork.OutputFile) + %(QtWork.OutputFile) + + + + + + + + + + + + + + + + + + 0 + + + + + + + %(QtWorkResult.WorkType) + + + %(Identity) + $([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','%(Identity)')) + + + + + + + + + %(QtWorkResult.WorkType) + + + %(Identity) + $([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','%(Identity)')) + + + + + + + + + @(QtWorkResult, '|') + + + + + + + + + + + + + + + + + + + $(IntDir)%(Filename).o + + + + + + + + + + + + $(ProjectDir);%(AdditionalIncludeDirectories) + %(PrecompiledHeaderFile) + + + + + + + + + + + + + @(QtWorkResult->'%(ClCompile)') + + + $(SelectedFiles);$(SelectedClCompile) + + + + + + + + @(QtIncludePath->Distinct()) + + + + $(QtIncludePath);%(ClCompile.AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(QtOuterBuildPrepare);QtOuterBuild;$(QtOuterBuildFinalize) + $(MSBuildProjectFullPath) + $([System.IO.Path]::GetRandomFileName()) + + + + + $(QtOuterBuildPrepare);$(QtOuterBuildFinalize) + + + diff --git a/Source/VSProps/qt_tasks.targets b/Source/VSProps/qt_tasks.targets new file mode 100644 index 0000000000..7f4a8e155e --- /dev/null +++ b/Source/VSProps/qt_tasks.targets @@ -0,0 +1,1110 @@ + + + + + + + + + + + + + + + + + + files = qrc + .Element("RCC") + .Elements("qresource") + .Elements("file"); + Uri QrcPath = new Uri(QrcFilePath); + Result = files + .Select(x => new Uri(QrcPath, x.Value).LocalPath) + .ToArray(); + ]]> + + + + + + + + + + + + + + + + + + x) + .Select(x => string.Format("[{0}={1}]", x, Item.GetMetadata(x)))) + .ToUpper()); + using (var dataZipped = new MemoryStream()) { + using (var zip = new DeflateStream(dataZipped, CompressionLevel.Fastest)) + zip.Write(data, 0, data.Length); + Hash = Convert.ToBase64String(dataZipped.ToArray()); + } + ]]> + + + + + + + + + +