]> granicus.if.org Git - libvpx/commitdiff
gen_msvs_vcxproj.sh: Avoid object name collisions.
authorTom Finegan <tomfinegan@google.com>
Thu, 20 Feb 2014 03:37:36 +0000 (19:37 -0800)
committerTom Finegan <tomfinegan@google.com>
Thu, 20 Feb 2014 03:39:47 +0000 (19:39 -0800)
Fixes the following warning:
warning LNK4042: object specified more than once; extras ignored

Change-Id: Icee24073be774e7f7902587449fb90a42ab16b6f

build/make/gen_msvs_vcxproj.sh

index a6315b9ee479a2432180b099a486fc623a7fb490..6b4e8cb93df14aacfa4c2f1689704d260698f6af 100755 (executable)
@@ -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