From 5d6730919de167b58f93571b887679a047ad4087 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Tue, 11 Jan 2011 21:36:13 +0000
Subject: [PATCH] Fix ResPack target not actually building the intended
 resource files.

Originally committed to SVN as r5176.
---
 aegisub/build/msbuild/libresrc/libresrc.vcxproj       | 2 +-
 aegisub/build/msbuild/respack/Aegisub.ResPack.targets | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/aegisub/build/msbuild/libresrc/libresrc.vcxproj b/aegisub/build/msbuild/libresrc/libresrc.vcxproj
index 89250b432..89fd3801c 100644
--- a/aegisub/build/msbuild/libresrc/libresrc.vcxproj
+++ b/aegisub/build/msbuild/libresrc/libresrc.vcxproj
@@ -48,7 +48,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
 	<ResPack>
-		<OutputDir>$(SrcDir)</OutputDir>
+		<OutputDir>$(MSBuildThisFileDirectory)..\..\..\src\libresrc\</OutputDir>
 	</ResPack>
   </ItemDefinitionGroup>
   <PropertyGroup Label="UserMacros" />
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.targets b/aegisub/build/msbuild/respack/Aegisub.ResPack.targets
index 246bfd085..fd0b2abbe 100644
--- a/aegisub/build/msbuild/respack/Aegisub.ResPack.targets
+++ b/aegisub/build/msbuild/respack/Aegisub.ResPack.targets
@@ -45,10 +45,14 @@
 		Inputs="@(ResPack)"
 		Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader')"
 		>
+		<Error
+			Condition="!Exists('$(ResPackExe)')"
+			Text="The respack.exe program was not found, make sure it has been built and is at this location: $(ResPackExe)"
+			/>
 		<Exec
-			Command='$(ResPackExe) "@(ResPack)" "%(ResPack.OutputName)" "%(ResPack.OutputHeader)"'
+			Command="$(ResPackExe) &quot;@(ResPack -> '%(FullPath)')&quot; &quot;%(ResPack.OutputDir)%(ResPack.OutputName)&quot; &quot;%(ResPack.OutputDir)%(ResPack.OutputHeader)&quot;"
 			Outputs="%(ResPack.OutputName);%(ResPack.OutputHeader)"
-			WorkingDirectory="%(ResPack.OutputDir)"
+			WorkingDirectory="@(ResPack -> '%(RootDir)%(Directory)')"
 			/>
 	</Target>