From dbbb73651d90bd6cc1d215430b2ca1debe8f6500 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 12 Nov 2012 16:20:27 -0800
Subject: [PATCH] Replace the post-build events with a new target with dep
 tracking and such

---
 aegisub/build/aegisub.props                 |  4 ++++
 aegisub/build/ffms2/ffms2.vcxproj           | 12 ++++--------
 aegisub/build/fftw/fftw.vcxproj             |  9 +++------
 aegisub/build/fontconfig/fontconfig.vcxproj | 11 +++++------
 aegisub/build/freetype2/freetype.vcxproj    | 21 +++++++++++++++------
 aegisub/build/install.targets               | 15 +++++++++++++++
 6 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 aegisub/build/install.targets

diff --git a/aegisub/build/aegisub.props b/aegisub/build/aegisub.props
index 754c0f503..ca71c8289 100644
--- a/aegisub/build/aegisub.props
+++ b/aegisub/build/aegisub.props
@@ -43,4 +43,8 @@
          AdditionalLibraryDirectories value gets cleared (but nothing else).
          I'm not sure why. -->
     <Import Project="$(MSBuildThisFileDirectory)wx.props" Condition="'$(AegisubUseWxWidgets)' == 'true'" />
+
+    <ImportGroup Label="Targets">
+      <Import Project="$(MSBuildThisFileDirectory)install.targets" />
+    </ImportGroup>
 </Project>
diff --git a/aegisub/build/ffms2/ffms2.vcxproj b/aegisub/build/ffms2/ffms2.vcxproj
index 7d92afb67..5cb0f3968 100644
--- a/aegisub/build/ffms2/ffms2.vcxproj
+++ b/aegisub/build/ffms2/ffms2.vcxproj
@@ -68,15 +68,11 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <Target Name="CopyHeaders" AfterTargets="ClCompile">
-    <Copy
-      SourceFiles="$(FfmsSrcDir)\include\ffms.h;$(FfmsSrcDir)\include\ffmscompat.h"
-      DestinationFolder="$(AegisubSourceBase)include"
-      SkipUnchangedFiles="true"
-      />
-  </Target>
-
   <!-- Source files -->
+  <ItemGroup>
+    <InstallHeader Include="$(FfmsSrcDir)\include\ffms.h" />
+    <InstallHeader Include="$(FfmsSrcDir)\include\ffmscompat.h" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="$(FfmsSrcDir)\src\avisynth\*.cpp" />
     <None Include="$(FfmsSrcDir)\src\avisynth\*.h" />
diff --git a/aegisub/build/fftw/fftw.vcxproj b/aegisub/build/fftw/fftw.vcxproj
index 9a903fa02..bb6f108a8 100644
--- a/aegisub/build/fftw/fftw.vcxproj
+++ b/aegisub/build/fftw/fftw.vcxproj
@@ -54,15 +54,12 @@
       <OpenMPSupport>true</OpenMPSupport>
       <StructMemberAlignment>Default</StructMemberAlignment>
     </ClCompile>
-    <PostBuildEvent>
-      <Command>
-        md $(AegisubSourceBase)\include 2&gt; NUL
-        copy $(FftwSrcDir)\api\fftw3.h $(AegisubSourceBase)\include
-      </Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
 
   <!-- Source files -->
+  <ItemGroup>
+    <InstallHeader Include="$(FftwSrcDir)\api\fftw3.h" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="config.h" />
   </ItemGroup>
diff --git a/aegisub/build/fontconfig/fontconfig.vcxproj b/aegisub/build/fontconfig/fontconfig.vcxproj
index f9b416145..aca7f5e5c 100644
--- a/aegisub/build/fontconfig/fontconfig.vcxproj
+++ b/aegisub/build/fontconfig/fontconfig.vcxproj
@@ -46,15 +46,14 @@
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>
     </ClCompile>
-    <PostBuildEvent>
-      <Command>
-        md $(AegisubSourceBase)\include\fontconfig 2&gt; NUL
-        copy $(FontconfigSrcDir)\fontconfig\*.h $(AegisubSourceBase)\include\fontconfig
-      </Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
 
   <!-- Source files -->
+  <ItemGroup>
+    <InstallHeader Include="$(FontconfigSrcDir)\fontconfig\*.h">
+      <Destination>fontconfig\</Destination>
+    </InstallHeader>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c" />
diff --git a/aegisub/build/freetype2/freetype.vcxproj b/aegisub/build/freetype2/freetype.vcxproj
index 8a18f0362..d3b432905 100644
--- a/aegisub/build/freetype2/freetype.vcxproj
+++ b/aegisub/build/freetype2/freetype.vcxproj
@@ -45,15 +45,24 @@
     <ResourceCompile>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <PostBuildEvent>
-      <Command>
-        md $(AegisubSourceBase)\include 2&gt; NUL
-        xcopy /s /q /y $(Freetype2SrcDir)\include $(AegisubSourceBase)\include
-      </Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
 
   <!-- Source files -->
+  <ItemGroup>
+    <InstallHeader Include="$(Freetype2SrcDir)\include\ft2build.h" />
+    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\*.h">
+      <Destination>freetype\</Destination>
+    </InstallHeader>
+    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\config\*.h">
+      <Destination>freetype\config\</Destination>
+    </InstallHeader>
+    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\internal\*.h">
+      <Destination>freetype\internal\</Destination>
+    </InstallHeader>
+    <InstallHeader Include="$(Freetype2SrcDir)\include\freetype\internal\services*.h">
+      <Destination>freetype\internal\services\</Destination>
+    </InstallHeader>
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(Freetype2SrcDir)\builds\win32\ftdebug.c" />
     <ClCompile Include="$(Freetype2SrcDir)\src\autofit\autofit.c" />
diff --git a/aegisub/build/install.targets b/aegisub/build/install.targets
new file mode 100644
index 000000000..525480f9b
--- /dev/null
+++ b/aegisub/build/install.targets
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target
+    Name="InstallHeaders"
+    AfterTargets="ClCompile"
+    Inputs="@(InstallHeader)"
+    Outputs="$(AegisubSourceBase)include\%(InstallHeader.Destination)%(Filename)%(Extension)"
+    >
+    <Copy
+      SourceFiles="@(InstallHeader)"
+      DestinationFiles="$(AegisubSourceBase)include\%(InstallHeader.Destination)%(Filename)%(Extension)"
+      SkipUnchangedFiles="true"
+      />
+  </Target>
+</Project>