Use a timestamp file rather than trying to track FFmpeg's dependencies

This commit is contained in:
Thomas Goyne 2012-11-17 07:50:21 -08:00
parent 39e642d20e
commit d98bd816a6

View file

@ -72,21 +72,6 @@
<ConfigureOutput Include="$(AegisubObjectDir)config.*" /> <ConfigureOutput Include="$(AegisubObjectDir)config.*" />
<ConfigureOutput Include="$(AegisubObjectDir)Makefile" /> <ConfigureOutput Include="$(AegisubObjectDir)Makefile" />
<ConfigureOutput Include="$(AegisubObjectDir)libavutil\avconfig.h" /> <ConfigureOutput Include="$(AegisubObjectDir)libavutil\avconfig.h" />
<CompileInput Include="$(AbsSrcDir)\*.mak" />
<CompileInput Include="$(AbsSrcDir)\**\*.c" />
<CompileInput Include="$(AbsSrcDir)\**\*.asm" />
<CompileInput Include="$(AbsSrcDir)\**\Makefile" />
<CompileOutput Include="$(AegisubObjectDir)libavcodec\libavcodec.a" />
<CompileOutput Include="$(AegisubObjectDir)libavformat\libavformat.a" />
<CompileOutput Include="$(AegisubObjectDir)libavutil\libavutil.a" />
<CompileOutput Include="$(AegisubObjectDir)libswscale\libswscale.a" />
<InstallOutput Include="$(AegisubLibraryDir)libavcodec.a" />
<InstallOutput Include="$(AegisubLibraryDir)libavformat.a" />
<InstallOutput Include="$(AegisubLibraryDir)libavutil.a" />
<InstallOutput Include="$(AegisubLibraryDir)libswscale.a" />
</ItemGroup> </ItemGroup>
<Target Name="Configure" <Target Name="Configure"
@ -105,6 +90,8 @@
<Output TaskParameter="Result" PropertyName="CfgLibPrefix" /> <Output TaskParameter="Result" PropertyName="CfgLibPrefix" />
</MsysPath> </MsysPath>
<Delete Files="$(AegisubObjectDir)build.timestamp" />
<ExecShellScript <ExecShellScript
Command="$(AbsSrcDir)\configure" Command="$(AbsSrcDir)\configure"
Arguments="$(CfgArgs) --prefix=$(CfgPrefix) --libdir=$(CfgLibPrefix) --incdir=$(CfgIncludePrefix)" Arguments="$(CfgArgs) --prefix=$(CfgPrefix) --libdir=$(CfgLibPrefix) --incdir=$(CfgIncludePrefix)"
@ -118,8 +105,8 @@
</Target> </Target>
<Target Name="Compile" <Target Name="Compile"
Inputs="@(ConfigureOutput);@(CompileInput)" Inputs="$(FfmpegSrcDir)"
Outputs="@(CompileOutput)" Outputs="$(AegisubObjectDir)build.timestamp"
> >
<ExecShellScript <ExecShellScript
Command="make" Command="make"
@ -127,17 +114,14 @@
WorkingDirectory="$(AegisubObjectDir)" WorkingDirectory="$(AegisubObjectDir)"
Configuration="@(ExecShellScript)" Configuration="@(ExecShellScript)"
/> />
</Target>
<Target Name="Install"
Inputs="@(CompileOutput)"
Outputs="@(InstallOutput)"
>
<ExecShellScript <ExecShellScript
Command="make install" Command="make install"
WorkingDirectory="$(AegisubObjectDir)" WorkingDirectory="$(AegisubObjectDir)"
Configuration="@(ExecShellScript)" Configuration="@(ExecShellScript)"
/> />
<Touch Files="$(AegisubObjectDir)build.timestamp" AlwaysCreate="true" />
</Target> </Target>
<Target Name="Build"> <Target Name="Build">
@ -145,7 +129,6 @@
<CallTarget Targets="Configure" /> <CallTarget Targets="Configure" />
<CallTarget Targets="Compile" /> <CallTarget Targets="Compile" />
<CallTarget Targets="Install" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">