generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "gen_msvs_vcxproj.sh: Avoid object name collisions."

Browse Source
This commit is contained in:
James Zern 2014-02-26 23:41:57 -08:00 committed by Gerrit Code Review
commit f0a6a604fc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/make/gen_msvs_vcxproj.sh
View File

@ -156,6 +156,10 @@ generate_filter() {
objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,/,_,g') objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,/,_,g')
if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then 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 \ open_tag CustomBuild \
Include=".\\$f" Include=".\\$f"
for plat in "${platforms[@]}"; do for plat in "${platforms[@]}"; do