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 10 matching lines @@
 
 This script generates a Visual Studio project file from a list of source
 code files.
 
 Options:
     --help                      Print this message
     --exe                       Generate a project for building an Application
     --lib                       Generate a project for creating a static library
     --dll                       Generate a project for creating a dll
     --static-crt                Use the static C runtime (/MT)
+    --enable-werror             Treat warnings as errors (/WX)
     --target=isa-os-cc          Target specifier (required)
     --out=filename              Write output to a file [stdout]
     --name=project_name         Name of the project (required)
     --proj-guid=GUID            GUID to use for the project
     --module-def=filename       File containing export definitions (for DLLs)
     --ver=version               Version (10,11,12) of visual studio to generate for
     --src-path-bare=dir         Path to root of source tree
     -Ipath/to/include           Additional include directories
     -DFLAG[=value]              Preprocessor macros to define
     -Lpath/to/lib               Additional library search paths
@@ skipping 125 matching lines @@
                         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'"
                         done
                     done
                     close_tag CustomBuild
-                elif [ "$pat" == "c" ] || [ "$pat" == "cc" ] ; then
+                elif [ "$pat" == "c" ] || \
+                     [ "$pat" == "cc" ] || [ "$pat" == "cpp" ]; then
                     open_tag ClCompile \
                         Include=".\\$f"
                     # Separate file names with Condition?
                     tag_content ObjectFileName "\$(IntDir)$objf"
                     # Check for AVX and turn it on to avoid warnings.
                     if [[ $f =~ avx.?\.c$ ]]; then
                         tag_content AdditionalOptions "/arch:AVX"
                     fi
                     close_tag ClCompile
                 elif [ "$pat" == "h" ] ; then
@@ skipping 39 matching lines @@
         --exe) proj_kind="exe"
         ;;
         --dll) proj_kind="dll"
         ;;
         --lib) proj_kind="lib"
         ;;
         --src-path-bare=*) src_path_bare="$optval"
         ;;
         --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*)
@@ skipping 239 matching lines @@
                 ;;
             *)
                 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
+            if ${werror:-false}; then
+                tag_content TreatWarningAsError true
+            fi
             close_tag ClCompile
             case "$proj_kind" in
             exe)
                 open_tag Link
                 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)
                 ;;
             esac
             close_tag ItemDefinitionGroup
         done
 
     done
 
     open_tag ItemGroup
-    generate_filter "Source Files"   "c;cc;def;odl;idl;hpj;bat;asm;asmx;s"
+    generate_filter "Source Files"   "c;cc;cpp;def;odl;idl;hpj;bat;asm;asmx;s"
     close_tag ItemGroup
     open_tag ItemGroup
     generate_filter "Header Files"   "h;hm;inl;inc;xsd"
     close_tag ItemGroup
     open_tag ItemGroup
     generate_filter "Build Files"    "mk"
     close_tag ItemGroup
     open_tag ItemGroup
     generate_filter "References"     "vcxproj"
     close_tag ItemGroup
@@ skipping 15 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