diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-04-10 18:54:26 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-04-10 18:54:26 +0200 |
| commit | 82b19b3adb117abad75c3b07da6addd8450e2a9b (patch) | |
| tree | 07bb00796dc0ec80cab5fe7508194c99ef09c917 | |
| parent | 615a86e5ff7719324325c9bfac906284f9931877 (diff) | |
Add support for specifying additional dependencies in VC custom builds
| -rw-r--r-- | build/meta/vc10proj.m4 | 7 | ||||
| -rw-r--r-- | build/meta/vc9proj.m4 | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/build/meta/vc10proj.m4 b/build/meta/vc10proj.m4 index db1bf83..b151f78 100644 --- a/build/meta/vc10proj.m4 +++ b/build/meta/vc10proj.m4 @@ -109,14 +109,15 @@ m4_foreach([__c], [ __custom_build_entry_tag_impl__([Message], __c, [$2]) __custom_build_entry_tag_impl__([Command], __c, [$3]) -__custom_build_entry_tag_impl__([Outputs], __c, [$4];%(Outputs))]) +__custom_build_entry_tag_impl__([Outputs], __c, [$4];%(Outputs))m4_ifelse([$5], [], [], [ +__custom_build_entry_tag_impl__([AdditionalInputs], __c, [$5])])]) </CustomBuild>]) -# (file, cmd-description, cmd, output;output) +# (file, cmd-description, cmd, output;output[, add-dep;add-dep]) # m4_define([__custom_build_entry__], [m4_equote()__custom_build_entry_impl__([$1], -[$2], [$3], [$4])[]m4_dquote()]) +[$2], [$3], [$4], [$5])[]m4_dquote()]) # Disable comments and quoting. # diff --git a/build/meta/vc9proj.m4 b/build/meta/vc9proj.m4 index fb79e1b..e8d56b4 100644 --- a/build/meta/vc9proj.m4 +++ b/build/meta/vc9proj.m4 @@ -35,7 +35,8 @@ m4_define([__custom_build_entry_impl__],[ <Tool Name="VCCustomBuildTool" Description="[$2]" - CommandLine="[$3]" + CommandLine="[$3]"m4_ifelse([$5], [], [], [ + AdditionalDependencies="$5"]) Outputs="[$4]" /> </FileConfiguration>]) @@ -46,14 +47,14 @@ m4_define([__file_entry_custom_build_impl__],[ >m4_dnl m4_foreach([__c], [__value_impl__([configurations])], -[__custom_build_entry_impl__(__c, [$2], [$3], [$4])]) +[__custom_build_entry_impl__(__c, [$2], [$3], [$4], [$5])]) </File>]) -# (file, cmd-description, cmd, output;output) +# (file, cmd-description, cmd, output;output[, add-dep;add-dep]) # m4_define([__file_entry_custom_build__], [m4_equote()__file_entry_custom_build_impl__([$1], -[$2], [$3], [$4])[]m4_dquote()]) +[$2], [$3], [$4], [$5])[]m4_dquote()]) # source |