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 244 matching lines @@
         platforms[0]="x64"
         asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "%(FullPath)""
         asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "%(FullPath)""
     ;;
     x86*)
         platforms[0]="Win32"
         asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)""
         asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)""
     ;;
     arm*)
+        platforms[0]="ARM"
         asm_Debug_cmdline="armasm -nologo "%(FullPath)""
         asm_Release_cmdline="armasm -nologo "%(FullPath)""
-        if [ "$name" = "obj_int_extract" ]; then
-            # We don't want to build this tool for the target architecture,
-            # but for an architecture we can run locally during the build.
-            platforms[0]="Win32"
-        else
-            platforms[0]="ARM"
-        fi
     ;;
     *) die "Unsupported target $target!"
     ;;
 esac
 
 generate_vcxproj() {
     echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
     open_tag Project \
         DefaultTargets="Build" \
         ToolsVersion="4.0" \
@@ skipping 109 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 &quot;$src_path_bare&quot; $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
-                    ;;
-                *)
-                    debug=_DEBUG
-                    ;;
-                esac
+                debug=_DEBUG
             else
                 opt=MaxSpeed
                 runtime=$release_runtime
                 curlibs=$libs
                 tag_content FavorSizeOrSpeed Speed
                 debug=NDEBUG
             fi
-            case "$name" in
-            obj_int_extract)
-                extradefines=";_CONSOLE"
-                ;;
-            *)
-                extradefines=";$defines"
-                ;;
-            esac
+            extradefines=";$defines"
             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
             if ${werror:-false}; then
                 tag_content TreatWarningAsError true
             fi
             if [ $vs_ver -ge 11 ]; then
                 # We need to override the defaults for these settings
                 # if AppContainerApplication is set.
                 tag_content CompileAsWinRT false
                 tag_content PrecompiledHeader NotUsing
                 tag_content SDLCheck false
             fi
             close_tag ClCompile
             case "$proj_kind" in
             exe)
                 open_tag Link
-                if [ "$name" != "obj_int_extract" ]; then
-                    tag_content AdditionalDependencies "$curlibs;%(AdditionalDependencies)"
-                    tag_content AdditionalLibraryDirectories "$libdirs;%(AdditionalLibraryDirectories)"
-                fi
                 tag_content GenerateDebugInformation true
                 # Console is the default normally, but if
                 # AppContainerApplication is set, we need to override it.
                 tag_content SubSystem Console
                 close_tag Link
                 ;;
             dll)
                 open_tag Link
                 tag_content GenerateDebugInformation true
                 tag_content ModuleDefinitionFile $module_def
@@ skipping 37 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