shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/build/make/gen_msvs_vcxproj.sh

+++ b/build/make/gen_msvs_vcxproj.sh

@@ -156,6 +156,10 @@

                 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

-- 

⑨