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 138 matching lines @@
     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')
 
                 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
                             tag_content Message "Assembling %(Filename)%(Extension)" \
                                 Condition="'\$(Configuration)|\$(Platform)'=='$cfg|$plat'"
                             tag_content Command "$(eval echo \$asm_${cfg}_cmdline) -o \$(IntDir)$objf" \
                                 Condition="'\$(Configuration)|\$(Platform)'=='$cfg|$plat'"
                             tag_content Outputs "\$(IntDir)$objf" \
                                 Condition="'\$(Configuration)|\$(Platform)'=='$cfg|$plat'"
@@ skipping 254 matching lines @@
     tag PropertyGroup \
         Label="UserMacros"
 
     for plat in "${platforms[@]}"; do
         plat_no_ws=`echo $plat | sed 's/[^A-Za-z0-9_]/_/g'`
         for config in Debug Release; do
             open_tag PropertyGroup \
                 Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
             tag_content OutDir "\$(SolutionDir)$plat_no_ws\\\$(Configuration)\\"
             tag_content IntDir "$plat_no_ws\\\$(Configuration)\\${name}\\"
+            if [ "$proj_kind" == "lib" ]; then
+              if [ "$config" == "Debug" ]; then
+                config_suffix=d
+              else
+                config_suffix=""
+              fi
+              tag_content TargetName "${name}${lib_sfx}${config_suffix}"
+            fi
             close_tag PropertyGroup
         done
     done
 
     for plat in "${platforms[@]}"; do
         for config in Debug Release; do
             open_tag ItemDefinitionGroup \
                 Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
-            if [ "$name" = "vpx" ]; then
+            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"
+                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
-                confsuffix=d
                 case "$name" in
                 obj_int_extract)
                     debug=DEBUG
                     ;;
                 *)
                     debug=_DEBUG
                     ;;
                 esac
             else
                 opt=MaxSpeed
                 runtime=$release_runtime
                 curlibs=$libs
-                confsuffix=""
                 tag_content FavorSizeOrSpeed Speed
                 debug=NDEBUG
             fi
             case "$name" in
             obj_int_extract)
                 extradefines=";_CONSOLE"
                 ;;
             *)
                 extradefines=";$defines"
                 ;;
             esac
             tag_content Optimization $opt
             tag_content AdditionalIncludeDirectories "$incs;%(AdditionalIncludeDirectories)"
             tag_content PreprocessorDefinitions "WIN32;$debug;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE$extradefines;%(PreprocessorDefinitions)"
             tag_content RuntimeLibrary $runtime
             tag_content WarningLevel Level3
             # DebugInformationFormat
             close_tag ClCompile
             case "$proj_kind" in
             exe)
                 open_tag Link
-                if [ "$name" = "obj_int_extract" ]; then
-                    tag_content OutputFile "${name}.exe"
-                else
+                if [ "$name" != "obj_int_extract" ]; then
                     tag_content AdditionalDependencies "$curlibs"
                     tag_content AdditionalLibraryDirectories "$libdirs;%(AdditionalLibraryDirectories)"
                 fi
                 tag_content GenerateDebugInformation true
                 close_tag Link
                 ;;
             dll)
                 open_tag Link
                 tag_content GenerateDebugInformation true
                 tag_content ModuleDefinitionFile $module_def
                 close_tag Link
                 ;;
             lib)
-                open_tag Lib
-                tag_content OutputFile "\$(OutDir)${name}${lib_sfx}${confsuffix}.lib"
-                close_tag Lib
                 ;;
             esac
             close_tag ItemDefinitionGroup
         done
 
     done
 
     open_tag ItemGroup
     generate_filter "Source Files"   "c;cc;def;odl;idl;hpj;bat;asm;asmx;s"
     close_tag ItemGroup
@@ skipping 24 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