summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-08-03 16:22:21 -0700
committerJames Zern <jzern@google.com>2015-08-03 16:22:21 -0700
commitd01180877741e422d246c4255e678b98ed021a1b (patch)
tree717b7735c11f465cdb2239f8348b48c1b941e601 /build
parent7723b8df6a4be00625258f6177df7d898ba6c33e (diff)
downloadlibvpx-d01180877741e422d246c4255e678b98ed021a1b.tar
libvpx-d01180877741e422d246c4255e678b98ed021a1b.tar.gz
libvpx-d01180877741e422d246c4255e678b98ed021a1b.tar.bz2
libvpx-d01180877741e422d246c4255e678b98ed021a1b.zip
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
Diffstat (limited to 'build')
-rwxr-xr-xbuild/make/gen_msvs_proj.sh4
1 files changed, 4 insertions, 0 deletions
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 \