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