diff options
author | Tom Finegan <tomfinegan@google.com> | 2014-02-20 22:20:58 -0800 |
---|---|---|
committer | Tom Finegan <tomfinegan@google.com> | 2014-02-20 22:20:58 -0800 |
commit | 1d3ca088f669aeee5ed638ba1964d02aaf779974 (patch) | |
tree | 2dc0ec6492e4312aef0e50bf74bdd905b91b87e6 /build/make/gen_msvs_vcxproj.sh | |
parent | 6c714bdbcdc17342a32896d76c0e2c5085963f41 (diff) | |
download | libvpx-1d3ca088f669aeee5ed638ba1964d02aaf779974.tar libvpx-1d3ca088f669aeee5ed638ba1964d02aaf779974.tar.gz libvpx-1d3ca088f669aeee5ed638ba1964d02aaf779974.tar.bz2 libvpx-1d3ca088f669aeee5ed638ba1964d02aaf779974.zip |
obj_int_extract.bat: Pass obj_int_extract.exe path to obj_int_extract.bat.
- Update the vcxproj generator to pass the path to the batch file.
- Update the batch file the take the path to obj_int_extract.exe as arg
2.
Fixes this warning:
warning MSB8012: TargetPath does not match Linker's OutputFile property
value.
Change-Id: I5825f1d1d79f370aeb295bbd2aeb08b22c0e73ab
Diffstat (limited to 'build/make/gen_msvs_vcxproj.sh')
-rwxr-xr-x | build/make/gen_msvs_vcxproj.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index a6315b9ee..ba9e83a7c 100755 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh @@ -438,9 +438,13 @@ generate_vcxproj() { for config in Debug Release; do open_tag ItemDefinitionGroup \ Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" - if [ "$name" = "vpx" ]; then + if [ "$name" == "vpx" ]; then + hostplat=$plat + if [ "$hostplat" == "ARM" ]; then + hostplat=Win32 + fi open_tag PreBuildEvent - tag_content Command "call obj_int_extract.bat $src_path_bare" + tag_content Command "call obj_int_extract.bat $src_path_bare $hostplat\\\$(Configuration)" close_tag PreBuildEvent fi open_tag ClCompile @@ -483,9 +487,7 @@ generate_vcxproj() { case "$proj_kind" in exe) open_tag Link - if [ "$name" = "obj_int_extract" ]; then - tag_content OutputFile "${name}.exe" - else + if [ "$name" != "obj_int_extract" ]; then tag_content AdditionalDependencies "$curlibs" tag_content AdditionalLibraryDirectories "$libdirs;%(AdditionalLibraryDirectories)" fi |