libvpx: Pull from upstream

source/libvpx/build/make/gen_msvs_vcxproj.sh

 #!/bin/bash
 ##
 ##  Copyright (c) 2013 The WebM project authors. All Rights Reserved.
 ##
 ##  Use of this source code is governed by a BSD-style license
 ##  that can be found in the LICENSE file in the root of the source
 ##  tree. An additional intellectual property rights grant can be found
 ##  in the file PATENTS.  All contributing project authors may
 ##  be found in the AUTHORS file in the root of the source tree.
 ##
@@ skipping 60 matching lines @@
     echo "generating filter '$name' from ${#file_list[@]} files" >&2
     IFS=*
 
     file_list_sz=${#file_list[@]}
     for i in ${!file_list[@]}; do
         f=${file_list[i]}
         for pat in ${pats//;/$IFS}; do
             if [ "${f##*.}" == "$pat" ]; then
                 unset file_list[i]
 
-                objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/],_,g')
+                objf=$(echo ${f%.*}.obj \
+                       | sed -e "s,$src_path_bare,," \
+                             -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
                         for cfg in Debug Release; do
@@ skipping 56 matching lines @@
         --proj-guid=*) guid="${optval}"
         ;;
         --module-def=*) module_def="${optval}"
         ;;
         --exe) proj_kind="exe"
         ;;
         --dll) proj_kind="dll"
         ;;
         --lib) proj_kind="lib"
         ;;
-        --src-path-bare=*) src_path_bare=$(fix_path "$optval")
+        --src-path-bare=*)
+            src_path_bare=$(fix_path "$optval")
+            src_path_bare=${src_path_bare%/}
         ;;
         --static-crt) use_static_runtime=true
         ;;
         --enable-werror) werror=true
         ;;
         --ver=*)
             vs_ver="$optval"
             case "$optval" in
                 10|11|12)
                 ;;
                 *) die Unrecognized Visual Studio Version in $opt
                 ;;
             esac
         ;;
         -I*)
-            opt="${opt%/}"
             opt=${opt##-I}
             opt=$(fix_path "$opt")
+            opt="${opt%/}"
             incs="${incs}${incs:+;}"${opt}""
-            yasmincs="${yasmincs} -I${opt}"
+            yasmincs="${yasmincs} -I"${opt}""
         ;;
         -D*) defines="${defines}${defines:+;}${opt##-D}"
         ;;
         -L*) # fudge . to $(OutDir)
             if [ "${opt##-L}" == "." ]; then
                 libdirs="${libdirs}${libdirs:+;}"\$(OutDir)""
             else
                  # Also try directories for this platform/configuration
                  opt=${opt##-L}
                  opt=$(fix_path "$opt")
                  libdirs="${libdirs}${libdirs:+;}"${opt}""
                  libdirs="${libdirs}${libdirs:+;}"${opt}/\$(PlatformName)/\$(Configuration)""
                  libdirs="${libdirs}${libdirs:+;}"${opt}/\$(PlatformName)""
             fi
         ;;
         -l*) libs="${libs}${libs:+ }${opt##-l}.lib"
         ;;
         -*) die_unknown $opt
         ;;
         *)
-            file_list[${#file_list[@]}]="$(fix_path $opt)"
+            # The paths in file_list are fixed outside of the loop.
+            file_list[${#file_list[@]}]="$opt"
             case "$opt" in
                  *.asm|*.s) uses_asm=true
                  ;;
             esac
         ;;
     esac
 done
+
+# Make one call to fix_path for file_list to improve performance.
+fix_file_list
+
 outfile=${outfile:-/dev/stdout}
 guid=${guid:-`generate_uuid`}
 asm_use_custom_step=false
 uses_asm=${uses_asm:-false}
 case "${vs_ver:-11}" in
     10|11|12)
        asm_use_custom_step=$uses_asm
     ;;
 esac
 
@@ skipping 168 matching lines @@
     for plat in "${platforms[@]}"; do
         for config in Debug Release; do
             open_tag ItemDefinitionGroup \
                 Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
             if [ "$name" == "vpx" ]; then
                 hostplat=$plat
                 if [ "$hostplat" == "ARM" ]; then
                     hostplat=Win32
                 fi
                 open_tag PreBuildEvent
-                tag_content Command "call obj_int_extract.bat $src_path_bare $hostplat\\\$(Configuration)"
+                tag_content Command "call obj_int_extract.bat "$src_path_bare" $hostplat\\\$(Configuration)"
                 close_tag PreBuildEvent
             fi
             open_tag ClCompile
             if [ "$config" = "Debug" ]; then
                 opt=Disabled
                 runtime=$debug_runtime
                 curlibs=$debug_libs
                 case "$name" in
                 obj_int_extract)
                     debug=DEBUG
@@ skipping 90 matching lines @@
 }
 
 # This regexp doesn't catch most of the strings in the vcxproj format,
 # since they're like <tag>path</tag> instead of <tag attr="path" />
 # as previously. It still seems to work ok despite this.
 generate_vcxproj |
     sed  -e '/"/s;\([^ "]\)/;\1\\;g' |
     sed  -e '/xmlns/s;\\;/;g' > ${outfile}
 
 exit