From: Tom Finegan <tomfinegan@google.com>
Date: Thu, 20 Feb 2014 03:37:36 +0000 (-0800)
Subject: gen_msvs_vcxproj.sh: Avoid object name collisions.
X-Git-Tag: v1.4.0~2245^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbf6e3f3c846bf1631af830838d7e120ba4ecb3c;p=libvpx

gen_msvs_vcxproj.sh: Avoid object name collisions.

Fixes the following warning:
warning LNK4042: object specified more than once; extras ignored

Change-Id: Icee24073be774e7f7902587449fb90a42ab16b6f
---

diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index a6315b9ee..6b4e8cb93 100755
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -156,6 +156,10 @@ generate_filter() {
                 objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,/,_,g')
 
                 if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then
+                    # Avoid object file name collisions, i.e. vpx_config.c and
+                    # vpx_config.asm produce the same object file without
+                    # this additional suffix.
+                    objf=${objf%.obj}_asm.obj
                     open_tag CustomBuild \
                         Include=".\\$f"
                     for plat in "${platforms[@]}"; do