msbuild: refactor to reduce rebuild events

* moves dolphin-specific settings out of Base.props * creates exports.props for externals, allowing to easily import individual Externals * corrects some cruft that accumulated and probably contributed to msbuild overbuilding
2025-07-23 06:09:50 -06:00 · 2022-07-31 00:39:35 -07:00
parent 7d2d5d914b
commit c5da2877cc
54 changed files with 596 additions and 256 deletions
--- a/Externals/Bochs_disasm/exports.props
+++ b/Externals/Bochs_disasm/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/ExternalsReferenceAll.props
+++ b/Externals/ExternalsReferenceAll.props
@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
-      <Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
-      <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(DolphinRootDir)Languages\Languages.vcxproj">
-      <Project>{0e033be3-2e08-428e-9ae9-bc673efa12b5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)bzip2\bzip2.vcxproj">
-      <Project>{1d8c51d2-ffa4-418e-b183-9f42b6a6717e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)cpp-optparse\cpp-optparse.vcxproj">
-      <Project>{c636d9d1-82fe-42b5-9987-63b7d4836341}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)cubeb\msvc\cubeb.vcxproj">
-      <Project>{8ea11166-6512-44fc-b7a5-a4d1ecc81170}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)curl\curl.vcxproj">
-      <Project>{bb00605c-125f-4a21-b33b-7bf418322dcb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)discord-rpc\src\discord-rpc.vcxproj">
-      <Project>{4482fd2a-ec43-3ffb-ac20-2e5c54b05ead}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)ed25519\ed25519.vcxproj">
-      <Project>{5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj">
-      <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)FatFs\FatFs.vcxproj">
-      <Project>{3F17D282-A77D-4931-B844-903AD0809A5E}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)fmt\fmt.vcxproj">
-      <Project>{4BC5A148-0AB3-440F-A980-A29B4B999190}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)FreeSurround\FreeSurround.vcxproj">
-      <Project>{8498f2fa-5ca6-4169-9971-de5b1fe6132c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)glslang\glslang.vcxproj">
-      <Project>{d178061b-84d3-44f9-beed-efd18d9033f0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)imgui\imgui.vcxproj">
-      <Project>{4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)liblzma\liblzma.vcxproj">
-      <Project>{055a775f-b4f5-4970-9240-f6cf7661f37b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)libspng\spng.vcxproj">
-      <Project>{447B7B1E-1D74-4AEF-B2B9-6EB41C5D5313}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)libusb\libusb-1.0.vcxproj">
-      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
-      <Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)mbedtls\mbedTLS.vcxproj">
-      <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)mGBA\mgba.vcxproj">
-      <Project>{864C4C8E-296D-3DBC-AD83-F1D5CB6E8EC6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)miniupnpc\miniupnpc.vcxproj">
-      <Project>{31643fdb-1bb8-4965-9de7-000fc88d35ae}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)minizip\minizip.vcxproj">
-      <Project>{23114507-079a-4418-9707-cfa81a03ca99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)picojson\picojson.vcxproj">
-      <Project>{2c0d058e-de35-4471-ad99-e68a2caf9e18}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)pugixml\pugixml.vcxproj">
-      <Project>{38fee76f-f347-484b-949c-b4649381cffb}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
-      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)soundtouch\SoundTouch.vcxproj">
-      <Project>{ec082900-b4d8-42e9-9663-77f02f6936ae}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)spirv_cross\spirv_cross.vcxproj">
-      <Project>{3d780617-ec8c-4721-b9fd-dfc9bb658c7c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)xxhash\xxhash.vcxproj">
-      <Project>{677ea016-1182-440c-9345-dc88d1e98c0c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)zlib-ng\zlib-ng.vcxproj">
-      <Project>{F6EA7144-8D64-4EBB-A13E-76DFBD911EAE}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)zstd\zstd.vcxproj">
-      <Project>{1bea10f3-80ce-4bc4-9331-5769372cdf99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(ExternalsDir)SDL\SDL2.vcxproj">
-      <Project>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</Project>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
--- a/Externals/FatFs/exports.props
+++ b/Externals/FatFs/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)FatFs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)FatFs\FatFs.vcxproj">
+      <Project>{3F17D282-A77D-4931-B844-903AD0809A5E}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/FreeSurround/FreeSurround.vcxproj
+++ b/Externals/FreeSurround/FreeSurround.vcxproj
@ -15,6 +15,11 @@
    <Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="include\FreeSurround\ChannelMaps.h" />
    <ClInclude Include="include\FreeSurround\FreeSurroundDecoder.h" />
--- a/Externals/FreeSurround/exports.props
+++ b/Externals/FreeSurround/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)FreeSurround\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)FreeSurround\FreeSurround.vcxproj">
+      <Project>{8498f2fa-5ca6-4169-9971-de5b1fe6132c}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/LZO/exports.props
+++ b/Externals/LZO/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)LZO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
+      <Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/SDL/exports.props
+++ b/Externals/SDL/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)SDL\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)SDL\SDL2.vcxproj">
+      <Project>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj
+++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj
@ -17,7 +17,8 @@
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SFML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Externals/SFML/exports.props
+++ b/Externals/SFML/exports.props
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SFML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
+      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/bzip2/exports.props
+++ b/Externals/bzip2/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)bzip2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)bzip2\bzip2.vcxproj">
+      <Project>{1d8c51d2-ffa4-418e-b183-9f42b6a6717e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/cpp-optparse/exports.props
+++ b/Externals/cpp-optparse/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)cpp-optparse\cpp-optparse.vcxproj">
+      <Project>{c636d9d1-82fe-42b5-9987-63b7d4836341}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/cubeb/exports.props
+++ b/Externals/cubeb/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)cubeb\include;$(ExternalsDir)cubeb\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)cubeb\msvc\cubeb.vcxproj">
+      <Project>{8ea11166-6512-44fc-b7a5-a4d1ecc81170}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/curl/curl.vcxproj
+++ b/Externals/curl/curl.vcxproj
@ -17,7 +17,7 @@
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)curl\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>include;lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>CURL_STATICLIB;CURL_DISABLE_LDAP;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/Externals/curl/exports.props
+++ b/Externals/curl/exports.props
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)curl\curl.vcxproj">
+      <Project>{bb00605c-125f-4a21-b33b-7bf418322dcb}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/discord-rpc/exports.props
+++ b/Externals/discord-rpc/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)discord-rpc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)discord-rpc\src\discord-rpc.vcxproj">
+      <Project>{4482fd2a-ec43-3ffb-ac20-2e5c54b05ead}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/ed25519/exports.props
+++ b/Externals/ed25519/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)ed25519;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)ed25519\ed25519.vcxproj">
+      <Project>{5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/enet/enet.vcxproj
+++ b/Externals/enet/enet.vcxproj
@ -15,6 +15,11 @@
    <Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="include\enet\callbacks.h" />
    <ClInclude Include="include\enet\enet.h" />
--- a/Externals/enet/exports.props
+++ b/Externals/enet/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj">
+      <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/fmt/exports.props
+++ b/Externals/fmt/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)fmt\fmt.vcxproj">
+      <Project>{4BC5A148-0AB3-440F-A980-A29B4B999190}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/fmt/fmt.vcxproj
+++ b/Externals/fmt/fmt.vcxproj
@ -15,6 +15,11 @@
    <Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="src/format.cc" />
    <ClCompile Include="src/os.cc" />
--- a/Externals/glslang/exports.props
+++ b/Externals/glslang/exports.props
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)glslang\StandAlone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)glslang\SPIRV;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)glslang\glslang.vcxproj">
+      <Project>{d178061b-84d3-44f9-beed-efd18d9033f0}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/glslang/glslang.vcxproj
+++ b/Externals/glslang/glslang.vcxproj
@ -15,6 +15,11 @@
    <Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="glslang\GenericCodeGen\CodeGen.cpp" />
    <ClCompile Include="glslang\GenericCodeGen\Link.cpp" />
--- a/Externals/imgui/exports.props
+++ b/Externals/imgui/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)imgui\imgui.vcxproj">
+      <Project>{4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/imgui/imgui.vcxproj
+++ b/Externals/imgui/imgui.vcxproj
@ -15,6 +15,12 @@
    <Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
+      <AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="imgui.cpp" />
    <ClCompile Include="imgui_draw.cpp" />
@ -29,6 +35,7 @@
    <ClInclude Include="imstb_textedit.h" />
    <ClInclude Include="imstb_truetype.h" />
  </ItemGroup>
+  <Import Project="$(ExternalsDir)fmt\exports.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/Externals/liblzma/exports.props
+++ b/Externals/liblzma/exports.props
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)liblzma\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)liblzma\liblzma.vcxproj">
+      <Project>{055a775f-b4f5-4970-9240-f6cf7661f37b}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/liblzma/liblzma.vcxproj
+++ b/Externals/liblzma/liblzma.vcxproj
@ -17,7 +17,7 @@
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>.;check;common;delta;lz;lzma;rangecoder;simple;tuklib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;api;check;common;delta;lz;lzma;rangecoder;simple;tuklib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>LZMA_API_STATIC;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/Externals/libspng/exports.props
+++ b/Externals/libspng/exports.props
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)libspng\libspng\spng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SPNG_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)libspng\spng.vcxproj">
+      <Project>{447B7B1E-1D74-4AEF-B2B9-6EB41C5D5313}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/libspng/spng.vcxproj
+++ b/Externals/libspng/spng.vcxproj
@ -29,6 +29,7 @@
  <ItemGroup>
    <ClInclude Include="libspng\spng\spng.h" />
  </ItemGroup>
+  <Import Project="$(ExternalsDir)zlib-ng\exports.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/Externals/libusb/exports.props
+++ b/Externals/libusb/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)libusb\libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)libusb\libusb-1.0.vcxproj">
+      <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/libusb/libusb-1.0.vcxproj
+++ b/Externals/libusb/libusb-1.0.vcxproj
@ -18,7 +18,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <!-- Ensure libusb sees it's own config.h first... -->
-      <AdditionalIncludeDirectories>.\libusb\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>libusb\msvc;libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Externals/mGBA/exports.props
+++ b/Externals/mGBA/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)mGBA\mgba\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)mGBA\mgba.vcxproj">
+      <Project>{864C4C8E-296D-3DBC-AD83-F1D5CB6E8EC6}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/mGBA/mgba.vcxproj
+++ b/Externals/mGBA/mgba.vcxproj
@ -205,6 +205,7 @@
    <ClCompile Include="mgba\src\feature\thread-proxy.c" />
    <ClCompile Include="mgba\src\feature\video-logger.c" />
  </ItemGroup>
+  <Import Project="$(ExternalsDir)zlib-ng\exports.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/Externals/mbedtls/exports.props
+++ b/Externals/mbedtls/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)mbedtls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)mbedtls\mbedTLS.vcxproj">
+      <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/mbedtls/mbedTLS.vcxproj
+++ b/Externals/mbedtls/mbedTLS.vcxproj
@ -17,7 +17,7 @@
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>.\library;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>include;library;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Externals/miniupnpc/exports.props
+++ b/Externals/miniupnpc/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)miniupnpc\miniupnpc.vcxproj">
+      <Project>{31643fdb-1bb8-4965-9de7-000fc88d35ae}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/minizip/exports.props
+++ b/Externals/minizip/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)minizip\minizip.vcxproj">
+      <Project>{23114507-079a-4418-9707-cfa81a03ca99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/minizip/minizip.vcxproj
+++ b/Externals/minizip/minizip.vcxproj
@ -57,6 +57,7 @@
    <None Include="LICENSE" />
    <None Include="README" />
  </ItemGroup>
+  <Import Project="$(ExternalsDir)zlib-ng\exports.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/Externals/picojson/exports.props
+++ b/Externals/picojson/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)picojson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)picojson\picojson.vcxproj">
+      <Project>{2c0d058e-de35-4471-ad99-e68a2caf9e18}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/pugixml/exports.props
+++ b/Externals/pugixml/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)pugixml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)pugixml\pugixml.vcxproj">
+      <Project>{38fee76f-f347-484b-949c-b4649381cffb}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/soundtouch/exports.props
+++ b/Externals/soundtouch/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)soundtouch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)soundtouch\SoundTouch.vcxproj">
+      <Project>{ec082900-b4d8-42e9-9663-77f02f6936ae}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/spirv_cross/exports.props
+++ b/Externals/spirv_cross/exports.props
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)spirv_cross\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)spirv_cross\spirv_cross.vcxproj">
+      <Project>{3d780617-ec8c-4721-b9fd-dfc9bb658c7c}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/xxhash/exports.props
+++ b/Externals/xxhash/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)xxhash\xxhash.vcxproj">
+      <Project>{677ea016-1182-440c-9345-dc88d1e98c0c}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/zlib-ng/exports.props
+++ b/Externals/zlib-ng/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)zlib-ng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)zlib-ng\zlib-ng.vcxproj">
+      <Project>{F6EA7144-8D64-4EBB-A13E-76DFBD911EAE}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
--- a/Externals/zstd/exports.props
+++ b/Externals/zstd/exports.props
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ExternalsDir)zstd\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)zstd\zstd.vcxproj">
+      <Project>{1bea10f3-80ce-4bc4-9331-5769372cdf99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+</Project>