mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix gratuitous rebuilding of libresrc

Browse source
This commit is contained in:
Thomas Goyne 2012-11-17 07:57:52 -08:00
parent d98bd816a6
commit 92b09ea7c6
4 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Aegisub.sln
View file

@ -16,6 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "aegisub\build\l
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "aegisub\build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "aegisub\build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} = {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}
{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}
EndProjectSection EndProjectSection
EndProject EndProject

5
aegisub/build/Aegisub/Aegisub.vcxproj
View file

@ -56,7 +56,7 @@
<ProjectReference Include="..\csrihelper\csrihelper.vcxproj"> <ProjectReference Include="..\csrihelper\csrihelper.vcxproj">
<Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project> <Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\ffms2\ffms2.vcxproj"> <ProjectReference Include="..\ffms2\ffms2.vcxproj" Condition="Exists('$(FfmsSrcDir)')">
<Project>{aa137613-96a1-4388-8905-71345b4f8f87}</Project> <Project>{aa137613-96a1-4388-8905-71345b4f8f87}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\fftw\fftw.vcxproj" Condition="Exists('$(FftwSrcDir)')"> <ProjectReference Include="..\fftw\fftw.vcxproj" Condition="Exists('$(FftwSrcDir)')">
@ -86,9 +86,6 @@
<ProjectReference Include="..\universalchardet\universalchardet.vcxproj"> <ProjectReference Include="..\universalchardet\universalchardet.vcxproj">
<Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project> <Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\wx\wxWidgets.vcxproj">
<Project>{0518d6c0-7bf6-4fd1-91fb-191bd10db2ac}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>

21
aegisub/build/libresrc/libresrc.vcxproj
View file

@ -41,13 +41,19 @@
<ResPack> <ResPack>
<OutputDir>$(MSBuildThisFileDirectory)..\..\src\libresrc\</OutputDir> <OutputDir>$(MSBuildThisFileDirectory)..\..\src\libresrc\</OutputDir>
</ResPack> </ResPack>
<PreBuildEvent>
<Command>copy "$(SrcDir)default_config_win.json" "$(SrcDir)default_config_platform.json"</Command>
</PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="$(MSBuildThisFileDirectory)..\respack\Aegisub.ResPack.targets" /> <Import Project="$(MSBuildThisFileDirectory)..\respack\Aegisub.ResPack.targets" />
</ImportGroup> </ImportGroup>
<Target Name="DefaultConfig" BeforeTargets="ClCompile">
<Copy
SourceFiles="$(SrcDir)default_config_win.json"
DestinationFiles="$(SrcDir)default_config_platform.json"
SkipUnchangedFiles="true"
/>
</Target>
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>
<ResPack Include="..\..\src\libresrc\manifest.respack"> <ResPack Include="..\..\src\libresrc\manifest.respack">
@ -59,18 +65,11 @@
<OutputHeader>bitmap.h</OutputHeader> <OutputHeader>bitmap.h</OutputHeader>
</ResPack> </ResPack>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SrcDir)libresrc.cpp" /> <ClCompile Include="$(SrcDir)libresrc.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SrcDir)libresrc.h" /> <ClInclude Include="$(SrcDir)libresrc.h" />
</ItemGroup> </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> </Project>

2
aegisub/build/respack/Aegisub.ResPack.targets
View file

@ -42,7 +42,7 @@
DependsOnTargets="PrepareForBuild" DependsOnTargets="PrepareForBuild"
Condition="'@(ResPack)' != ''" Condition="'@(ResPack)' != ''"
Inputs="@(ResPack)" Inputs="@(ResPack)"
Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader')" Outputs="%(ResPack.OutputDir)%(ResPack.OutputName);%(ResPack.OutputDir)%(Respack.OutputHeader)"
> >
<Error <Error
Condition="!Exists('$(ResPackExe)')" Condition="!Exists('$(ResPackExe)')"