summaryrefslogtreecommitdiffstats
path: root/libvpx/build/make/gen_msvs_proj.sh
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2014-03-26 15:13:32 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2014-03-26 15:13:32 -0700
commit2ec72e65689c948e92b826ae1e867bf369e72f13 (patch)
tree09d08252ba727c6c2e090222ea15ccc3b143301a /libvpx/build/make/gen_msvs_proj.sh
parent9b35249446b07f40ac5fcc3205f2c048616efacc (diff)
downloadandroid_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.tar.gz
android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.tar.bz2
android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.zip
libvpx: Roll latest libvpx
Pulling changes related to fixing a rare bitstream issue on video upscaling. Also enables VP9 encoder. This is exactly the same as the roll that is already in master. Upstream Hash: 8e9c9f118cda45013f14cce7961dcc8df78ffebf Change-Id: Iba9bb1c1804462014deab20fa6f4c5e4c55a778e
Diffstat (limited to 'libvpx/build/make/gen_msvs_proj.sh')
-rwxr-xr-xlibvpx/build/make/gen_msvs_proj.sh12
1 files changed, 5 insertions, 7 deletions
diff --git a/libvpx/build/make/gen_msvs_proj.sh b/libvpx/build/make/gen_msvs_proj.sh
index fc5011b..5936370 100755
--- a/libvpx/build/make/gen_msvs_proj.sh
+++ b/libvpx/build/make/gen_msvs_proj.sh
@@ -155,8 +155,8 @@ generate_filter() {
tag Tool \
Name="VCCustomBuildTool" \
Description="Assembling \$(InputFileName)" \
- CommandLine="$(eval echo \$asm_${cfg}_cmdline) -o \$(IntDir)$objf" \
- Outputs="\$(IntDir)$objf" \
+ CommandLine="$(eval echo \$asm_${cfg}_cmdline) -o \$(IntDir)\\$objf" \
+ Outputs="\$(IntDir)\\$objf" \
close_tag FileConfiguration
done
@@ -170,7 +170,7 @@ generate_filter() {
tag Tool \
Name="VCCLCompilerTool" \
- ObjectFile="\$(IntDir)$objf" \
+ ObjectFile="\$(IntDir)\\$objf" \
close_tag FileConfiguration
done
@@ -371,7 +371,7 @@ generate_vcproj() {
vpx)
tag Tool \
Name="VCPreBuildEventTool" \
- CommandLine="call obj_int_extract.bat $src_path_bare" \
+ CommandLine="call obj_int_extract.bat $src_path_bare $plat_no_ws\\\$(ConfigurationName)" \
tag Tool \
Name="VCCLCompilerTool" \
@@ -412,7 +412,6 @@ generate_vcproj() {
obj_int_extract)
tag Tool \
Name="VCLinkerTool" \
- OutputFile="${name}.exe" \
GenerateDebugInformation="true" \
;;
*)
@@ -479,7 +478,7 @@ generate_vcproj() {
vpx)
tag Tool \
Name="VCPreBuildEventTool" \
- CommandLine="call obj_int_extract.bat $src_path_bare" \
+ CommandLine="call obj_int_extract.bat $src_path_bare $plat_no_ws\\\$(ConfigurationName)" \
tag Tool \
Name="VCCLCompilerTool" \
@@ -522,7 +521,6 @@ generate_vcproj() {
obj_int_extract)
tag Tool \
Name="VCLinkerTool" \
- OutputFile="${name}.exe" \
GenerateDebugInformation="true" \
;;
*)