From c43d9146a98c9499031b84a6dae1c81300a018f2 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 6 Jan 2020 16:19:36 +0000
Subject: [PATCH] Use globbing to get dependencies for swig builds

* Fixes a warning in VS2019 from stale warnings and should mean rebuilds are
  more accurate too.
---
 .../Code/pyrenderdoc/pyrenderdoc_module.vcxproj | 13 ++++++++++++-
 .../Code/pyrenderdoc/qrenderdoc_module.vcxproj  | 17 +++++++++++++++--
 qrenderdoc/qrenderdoc_local.vcxproj             | 17 +++++++++++++++--
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj b/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
index c0b249057..79874e0ad 100644
--- a/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
+++ b/qrenderdoc/Code/pyrenderdoc/pyrenderdoc_module.vcxproj
@@ -125,11 +125,22 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <!-- use globbing to find conservative dependency list -->
+  <ItemGroup>
+    <SwigInterfaces Include="Code\pyrenderdoc\*.i" />
+    <SwigHeaders Include="Code\pyrenderdoc\*.h" />
+    <CoreReplayHeaders Include="$(SolutionDir)renderdoc\api\replay\*.h" />
+  </ItemGroup>
+  <PropertyGroup>
+    <SwigInterfaces>@(SwigInterfaces)</SwigInterfaces>
+    <SwigHeaders>@(SwigHeaders)</SwigHeaders>
+    <CoreReplayHeaders>@(CoreReplayHeaders)</CoreReplayHeaders>
+  </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="pyrenderdoc_stub.cpp" />
     <CustomBuild Include="renderdoc.i">
       <FileType>Document</FileType>
-      <AdditionalInputs>%(Fullpath);container_handling.i;pyconversion.i;cosmetics.i;$(SolutionDir)renderdoc\api\replay\basic_types.h;$(SolutionDir)renderdoc\api\replay\capture_options.h;$(SolutionDir)renderdoc\api\replay\control_types.h;$(SolutionDir)renderdoc\api\replay\d3d11_pipestate.h;$(SolutionDir)renderdoc\api\replay\d3d12_pipestate.h;$(SolutionDir)renderdoc\api\replay\data_types.h;$(SolutionDir)renderdoc\api\replay\gl_pipestate.h;$(SolutionDir)renderdoc\api\replay\renderdoc_replay.h;$(SolutionDir)renderdoc\api\replay\replay_enums.h;$(SolutionDir)renderdoc\api\replay\shader_types.h;$(SolutionDir)renderdoc\api\replay\version.h;$(SolutionDir)renderdoc\api\replay\stringise.h;$(SolutionDir)renderdoc\api\replay\structured_data.h;$(SolutionDir)renderdoc\api\replay\vk_pipestate.h;$(SolutionDir)renderdoc\api\replay\pipestate.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs>%(Fullpath);$(SwigInterfaces);$(SwigHeaders);$(CoreReplayHeaders);%(AdditionalInputs)</AdditionalInputs>
       <Command>"$(ProjectDir)..\..\3rdparty\swig\swig.exe" -v -Wextra -Werror -O -c++ -interface %(Filename) -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I"$(SolutionDir)renderdoc\api\replay" -outdir "$(IntDir)generated" -o "$(IntDir)generated\%(Filename)_module_python.cxx" "%(FullPath)"</Command>
       <Message>Compiling SWIG interface</Message>
       <Outputs>$(IntDir)generated\%(Filename).py;$(IntDir)generated\%(Filename)_module_python.cxx;%(Outputs)</Outputs>
diff --git a/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj b/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
index ae3c7ffa6..5f9f37eae 100644
--- a/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
+++ b/qrenderdoc/Code/pyrenderdoc/qrenderdoc_module.vcxproj
@@ -106,12 +106,25 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <!-- use globbing to find conservative dependency list -->
+  <ItemGroup>
+    <SwigInterfaces Include="Code\pyrenderdoc\*.i" />
+    <SwigHeaders Include="Code\pyrenderdoc\*.h" />
+    <QRDHeaders Include="Code\Interface\*.h" />
+    <CoreReplayHeaders Include="$(SolutionDir)renderdoc\api\replay\*.h" />
+  </ItemGroup>
+  <PropertyGroup>
+    <SwigInterfaces>@(SwigInterfaces)</SwigInterfaces>
+    <SwigHeaders>@(SwigHeaders)</SwigHeaders>
+    <CoreReplayHeaders>@(CoreReplayHeaders)</CoreReplayHeaders>
+    <QRDHeaders>@(QRDHeaders)</QRDHeaders>
+  </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="pyrenderdoc_stub.cpp" />
     <ClCompile Include="qrenderdoc_stub.cpp" />
     <CustomBuild Include="qrenderdoc.i">
       <FileType>Document</FileType>
-      <AdditionalInputs>%(Fullpath);$(ProjectDir)renderdoc.i;$(SolutionDir)renderdoc\api\replay\basic_types.h;$(SolutionDir)renderdoc\api\replay\capture_options.h;$(SolutionDir)renderdoc\api\replay\control_types.h;$(SolutionDir)renderdoc\api\replay\d3d11_pipestate.h;$(SolutionDir)renderdoc\api\replay\d3d12_pipestate.h;$(SolutionDir)renderdoc\api\replay\data_types.h;$(SolutionDir)renderdoc\api\replay\gl_pipestate.h;$(SolutionDir)renderdoc\api\replay\renderdoc_replay.h;$(SolutionDir)renderdoc\api\replay\replay_enums.h;$(SolutionDir)renderdoc\api\replay\shader_types.h;$(SolutionDir)renderdoc\api\replay\version.h;$(SolutionDir)renderdoc\api\replay\vk_pipestate.h;$(SolutionDir)renderdoc\api\replay\pipestate.h;$(ProjectDir)..\Interface\PersistantConfig.h;$(ProjectDir)..\Interface\RemoteHost.h;$(ProjectDir)..\Interface\Extensions.h;$(ProjectDir)..\Interface\QRDInterface.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs>%(Fullpath);$(SwigInterfaces);$(SwigHeaders);$(QRDHeaders);%(AdditionalInputs)</AdditionalInputs>
       <Command>"$(ProjectDir)..\..\3rdparty\swig\swig.exe" -v -Wextra -Werror -O -interface %(Filename) -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I"$(ProjectDir)..\.." -I"$(SolutionDir)renderdoc\api\replay" -outdir "$(IntDir)generated" -o "$(IntDir)generated\%(Filename)_module_python.cxx" "%(FullPath)"</Command>
       <Message>Compiling SWIG interface</Message>
       <Outputs>$(IntDir)generated\%(Filename).py;$(IntDir)generated\%(Filename)_module_python.cxx;%(Outputs)</Outputs>
@@ -123,7 +136,7 @@
     </ClCompile>
     <CustomBuild Include="renderdoc.i">
       <FileType>Document</FileType>
-      <AdditionalInputs>%(Fullpath);container_handling.i;pyconversion.i;cosmetics.i;$(SolutionDir)renderdoc\api\replay\basic_types.h;$(SolutionDir)renderdoc\api\replay\capture_options.h;$(SolutionDir)renderdoc\api\replay\control_types.h;$(SolutionDir)renderdoc\api\replay\d3d11_pipestate.h;$(SolutionDir)renderdoc\api\replay\d3d12_pipestate.h;$(SolutionDir)renderdoc\api\replay\data_types.h;$(SolutionDir)renderdoc\api\replay\gl_pipestate.h;$(SolutionDir)renderdoc\api\replay\renderdoc_replay.h;$(SolutionDir)renderdoc\api\replay\replay_enums.h;$(SolutionDir)renderdoc\api\replay\shader_types.h;$(SolutionDir)renderdoc\api\replay\version.h;$(SolutionDir)renderdoc\api\replay\stringise.h;$(SolutionDir)renderdoc\api\replay\structured_data.h;$(SolutionDir)renderdoc\api\replay\vk_pipestate.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs>%(Fullpath);$(SwigInterfaces);$(SwigHeaders);$(CoreReplayHeaders);%(AdditionalInputs)</AdditionalInputs>
       <Command>"$(ProjectDir)..\..\3rdparty\swig\swig.exe" -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I"$(SolutionDir)renderdoc\api\replay" -outdir "$(IntDir)generated" -o "$(IntDir)generated\%(Filename)_module_python.cxx" "%(FullPath)"</Command>
       <Message>Compiling SWIG interface</Message>
       <Outputs>$(IntDir)generated\%(Filename).py;$(IntDir)generated\%(Filename)_module_python.cxx;%(Outputs)</Outputs>
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index 21d2f94f2..9b264316c 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -1353,10 +1353,23 @@
       <Outputs>$(IntDir)generated\moc_%(Filename).cpp</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <!-- use globbing to find conservative dependency list -->
+  <ItemGroup>
+    <SwigInterfaces Include="Code\pyrenderdoc\*.i" />
+    <SwigHeaders Include="Code\pyrenderdoc\*.h" />
+    <QRDHeaders Include="Code\Interface\*.h" />
+    <CoreReplayHeaders Include="$(SolutionDir)renderdoc\api\replay\*.h" />
+  </ItemGroup>
+  <PropertyGroup>
+    <SwigInterfaces>@(SwigInterfaces)</SwigInterfaces>
+    <SwigHeaders>@(SwigHeaders)</SwigHeaders>
+    <CoreReplayHeaders>@(CoreReplayHeaders)</CoreReplayHeaders>
+    <QRDHeaders>@(QRDHeaders)</QRDHeaders>
+  </PropertyGroup>
   <ItemGroup>
     <CustomBuild Include="Code\pyrenderdoc\renderdoc.i">
       <FileType>Document</FileType>
-      <AdditionalInputs>%(Fullpath);container_handling.i;pyconversion.i;cosmetics.i;interface_check.h;$(SolutionDir)renderdoc\api\replay\basic_types.h;$(SolutionDir)renderdoc\api\replay\capture_options.h;$(SolutionDir)renderdoc\api\replay\control_types.h;$(SolutionDir)renderdoc\api\replay\d3d11_pipestate.h;$(SolutionDir)renderdoc\api\replay\d3d12_pipestate.h;$(SolutionDir)renderdoc\api\replay\data_types.h;$(SolutionDir)renderdoc\api\replay\gl_pipestate.h;$(SolutionDir)renderdoc\api\replay\renderdoc_replay.h;$(SolutionDir)renderdoc\api\replay\replay_enums.h;$(SolutionDir)renderdoc\api\replay\shader_types.h;$(SolutionDir)renderdoc\api\replay\stringise.h;$(SolutionDir)renderdoc\api\replay\structured_data.h;$(SolutionDir)renderdoc\api\replay\vk_pipestate.h;$(SolutionDir)renderdoc\api\replay\pipestate.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs>%(Fullpath);$(SwigInterfaces);$(SwigHeaders);$(CoreReplayHeaders);%(AdditionalInputs)</AdditionalInputs>
       <Command>"$(ProjectDir)3rdparty\swig\swig.exe" -v -Wextra -Werror -O -interface %(Filename) -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I"$(SolutionDir)renderdoc\api\replay" -outdir "$(IntDir)generated" -o "$(IntDir)generated\%(Filename)_python.cxx" "%(FullPath)"</Command>
       <Message>Compiling SWIG interface</Message>
       <Outputs>$(IntDir)generated\%(Filename)_python.cxx;%(Outputs)</Outputs>
@@ -1364,7 +1377,7 @@
     </CustomBuild>
     <CustomBuild Include="Code\pyrenderdoc\qrenderdoc.i">
       <FileType>Document</FileType>
-      <AdditionalInputs>%(Fullpath);Code\Interface\QRDInterface.h;Code\Interface\PersistantConfig.h;Code\Interface\RemoteHost.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs>%(Fullpath);$(SwigInterfaces);$(SwigHeaders);$(QRDHeaders);%(AdditionalInputs)</AdditionalInputs>
       <Command>"$(ProjectDir)3rdparty\swig\swig.exe" -v -Wextra -Werror -O -interface %(Filename) -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I"$(SolutionDir)renderdoc\api\replay" -I"$(ProjectDir)." -outdir "$(IntDir)generated" -o "$(IntDir)generated\%(Filename)_python.cxx" "%(FullPath)"</Command>
       <Message>Compiling SWIG interface</Message>
       <Outputs>$(IntDir)generated\%(Filename)_python.cxx;%(Outputs)</Outputs>