From 92b09ea7c6adef29e9db70752ab33b1203d1bd9b Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 17 Nov 2012 07:57:52 -0800
Subject: [PATCH] Fix gratuitous rebuilding of libresrc

---
 Aegisub.sln                                   |  1 +
 aegisub/build/Aegisub/Aegisub.vcxproj         |  5 +---
 aegisub/build/libresrc/libresrc.vcxproj       | 23 +++++++++----------
 aegisub/build/respack/Aegisub.ResPack.targets |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Aegisub.sln b/Aegisub.sln
index 9208962f3..c51d63646 100644
--- a/Aegisub.sln
+++ b/Aegisub.sln
@@ -16,6 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "aegisub\build\l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "aegisub\build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} = {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}
 		{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}
 	EndProjectSection
 EndProject
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index 1dcd680ed..98b3f421c 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -56,7 +56,7 @@
     <ProjectReference Include="..\csrihelper\csrihelper.vcxproj">
       <Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\ffms2\ffms2.vcxproj">
+    <ProjectReference Include="..\ffms2\ffms2.vcxproj" Condition="Exists('$(FfmsSrcDir)')">
       <Project>{aa137613-96a1-4388-8905-71345b4f8f87}</Project>
     </ProjectReference>
     <ProjectReference Include="..\fftw\fftw.vcxproj" Condition="Exists('$(FftwSrcDir)')">
@@ -86,9 +86,6 @@
     <ProjectReference Include="..\universalchardet\universalchardet.vcxproj">
       <Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\wx\wxWidgets.vcxproj">
-      <Project>{0518d6c0-7bf6-4fd1-91fb-191bd10db2ac}</Project>
-    </ProjectReference>
   </ItemGroup>
   <!-- Source files -->
   <ItemGroup>
diff --git a/aegisub/build/libresrc/libresrc.vcxproj b/aegisub/build/libresrc/libresrc.vcxproj
index c0689e8dd..72a08ff56 100644
--- a/aegisub/build/libresrc/libresrc.vcxproj
+++ b/aegisub/build/libresrc/libresrc.vcxproj
@@ -41,13 +41,19 @@
     <ResPack>
       <OutputDir>$(MSBuildThisFileDirectory)..\..\src\libresrc\</OutputDir>
     </ResPack>
-    <PreBuildEvent>
-      <Command>copy "$(SrcDir)default_config_win.json" "$(SrcDir)default_config_platform.json"</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(MSBuildThisFileDirectory)..\respack\Aegisub.ResPack.targets" />
   </ImportGroup>
+
+  <Target Name="DefaultConfig" BeforeTargets="ClCompile">
+    <Copy
+      SourceFiles="$(SrcDir)default_config_win.json"
+      DestinationFiles="$(SrcDir)default_config_platform.json"
+      SkipUnchangedFiles="true"
+      />
+  </Target>
+
   <!-- Source files -->
   <ItemGroup>
     <ResPack Include="..\..\src\libresrc\manifest.respack">
@@ -59,18 +65,11 @@
       <OutputHeader>bitmap.h</OutputHeader>
     </ResPack>
   </ItemGroup>
+
   <ItemGroup>
     <ClCompile Include="$(SrcDir)libresrc.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(SrcDir)libresrc.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\respack\respack.vcxproj">
-      <Project>{08af2bcc-fcdd-4f0e-8b41-59a6e634f2e8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\wx\wxWidgets.vcxproj">
-      <Project>{0518d6c0-7bf6-4fd1-91fb-191bd10db2ac}</Project>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/aegisub/build/respack/Aegisub.ResPack.targets b/aegisub/build/respack/Aegisub.ResPack.targets
index a9adb02b1..f109bbe35 100644
--- a/aegisub/build/respack/Aegisub.ResPack.targets
+++ b/aegisub/build/respack/Aegisub.ResPack.targets
@@ -42,7 +42,7 @@
 		DependsOnTargets="PrepareForBuild"
 		Condition="'@(ResPack)' != ''"
 		Inputs="@(ResPack)"
-		Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader')"
+		Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader)"
 		>
 		<Error
 			Condition="!Exists('$(ResPackExe)')"