From: James Zern <jzern@google.com>
Date: Mon, 3 Aug 2015 23:22:21 +0000 (-0700)
Subject: gen_msvs_proj.sh: avoid asm object name collisions
X-Git-Tag: v1.5.0~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d01180877741e422d246c4255e678b98ed021a1b;p=libvpx

gen_msvs_proj.sh: avoid asm object name collisions

fixes link under vs9; this is the same change as:
dbf6e3f gen_msvs_vcxproj.sh: Avoid object name collisions.

Change-Id: I2a188c9024d0605e60e5e03ddcef1a25e7e53585
---

diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh
index dcce78255..0cf335b3d 100755
--- a/build/make/gen_msvs_proj.sh
+++ b/build/make/gen_msvs_proj.sh
@@ -73,6 +73,10 @@ generate_filter() {
                 open_tag File RelativePath="$f"
 
                 if [ "$pat" == "asm" ] && $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
                     for plat in "${platforms[@]}"; do
                         for cfg in Debug Release; do
                             open_tag FileConfiguration \