libvpx: Pull from upstream

source/libvpx/build/make/gen_msvs_sln.sh

 #!/bin/bash
 ##
 ##  Copyright (c) 2010 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 54 matching lines @@
 
     # save the project GUID to a varaible, normalizing to the basename of the
     # vcproj file without the extension
     local var
     var=${file##*/}
     var=${var%%.${sfx}}
     eval "${var}_file=\"$1\""
     eval "${var}_name=$name"
     eval "${var}_guid=$guid"
 
-    # assume that all projects have the same list of possible configurations,
-    # so overwriting old config_lists is not a problem
     if [ "$sfx" = "vcproj" ]; then
-        config_list=`grep -A1 '<Configuration' $file |
+        cur_config_list=`grep -A1 '<Configuration' $file |
             grep Name | cut -d\" -f2`
     else
-        config_list=`grep -B1 'Label="Configuration"' $file |
+        cur_config_list=`grep -B1 'Label="Configuration"' $file |
             grep Condition | cut -d\' -f4`
     fi
+    new_config_list=$(for i in $config_list $cur_config_list; do
+        echo $i
+    done | sort | uniq)
+    if [ "$config_list" != "" ] && [ "$config_list" != "$new_config_list" ]; then
+        mixed_platforms=1
+    fi
+    config_list="$new_config_list"
+    eval "${var}_config_list=\"$cur_config_list\""
     proj_list="${proj_list} ${var}"
 }
 
 process_project() {
     eval "local file=\${$1_file}"
     eval "local name=\${$1_name}"
     eval "local guid=\${$1_guid}"
 
     # save the project GUID to a varaible, normalizing to the basename of the
     # vcproj file without the extension
@@ skipping 29 matching lines @@
     echo "Global"
     indent_push
 
     #
     # Solution Configuration Platforms
     #
     echo "${indent}GlobalSection(SolutionConfigurationPlatforms) = preSolution"
     indent_push
     IFS_bak=${IFS}
     IFS=$'\r'$'\n'
+    if [ "$mixed_platforms" != "" ]; then
+        config_list="
+Release|Mixed Platforms
+Debug|Mixed Platforms"
+    fi
     for config in ${config_list}; do
         echo "${indent}$config = $config"
     done
     IFS=${IFS_bak}
     indent_pop
     echo "${indent}EndGlobalSection"
 
     #
     # Project Configuration Platforms
     #
     echo "${indent}GlobalSection(ProjectConfigurationPlatforms) = postSolution"
     indent_push
     for proj in ${proj_list}; do
         eval "local proj_guid=\${${proj}_guid}"
+        eval "local proj_config_list=\${${proj}_config_list}"
         IFS=$'\r'$'\n'
-        for config in ${config_list}; do
-            echo "${indent}${proj_guid}.${config}.ActiveCfg = ${config}"
-            echo "${indent}${proj_guid}.${config}.Build.0 = ${config}"
+        for config in ${proj_config_list}; do
+            if [ "$mixed_platforms" != "" ]; then
+                local c=${config%%|*}
+                echo "${indent}${proj_guid}.${c}|Mixed Platforms.ActiveCfg = ${config}"
+                echo "${indent}${proj_guid}.${c}|Mixed Platforms.Build.0 = ${config}"
+            else
+                echo "${indent}${proj_guid}.${config}.ActiveCfg = ${config}"
+                echo "${indent}${proj_guid}.${config}.Build.0 = ${config}"
+            fi
 
         done
         IFS=${IFS_bak}
     done
     indent_pop
     echo "${indent}EndGlobalSection"
 
     #
     # Solution Properties
     #
@@ skipping 133 matching lines @@
 done
 cat  >${outfile} <<EOF
 Microsoft Visual Studio Solution File, Format Version $sln_vers${EOLDOS}
 # $sln_vers_str${EOLDOS}
 EOF
 for proj in ${proj_list}; do
     process_project $proj >>${outfile}
 done
 process_global >>${outfile}
 process_makefile >${mkoutfile}