summaryrefslogtreecommitdiff
path: root/build/make/gen_msvs_vcxproj.sh
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-06-12 20:51:39 -0700
committerJames Zern <jzern@google.com>2014-06-16 14:32:06 -0700
commit0a0492611c26cbe4c863e8611e5b7fe76ed57b83 (patch)
treeca50dc4efef8ea10df41f0d3dafb4e5ca59fc4f1 /build/make/gen_msvs_vcxproj.sh
parent7336903545091a8bf29d7f341e3681f45ab35fc2 (diff)
downloadlibvpx-0a0492611c26cbe4c863e8611e5b7fe76ed57b83.tar
libvpx-0a0492611c26cbe4c863e8611e5b7fe76ed57b83.tar.gz
libvpx-0a0492611c26cbe4c863e8611e5b7fe76ed57b83.tar.bz2
libvpx-0a0492611c26cbe4c863e8611e5b7fe76ed57b83.zip
gen_msvs_proj: fix in tree configure under cygwin
strip trailing '/' from paths, this is later converted to '\' which causes execution errors for obj_int_extract/yasm. vs10+ wasn't affected by this issue, but make the same change for consistency. gen_msvs_proj: + add missing '&quot;' to obj_int_extract call unlike gen_msvs_vcproj, the block is duplicated missed in: 1e3d9b9 build/msvs: fix builds in source dirs with spaces Change-Id: I76208e6cdc66dc5a0a7ffa8aa1edbefe31e4b130
Diffstat (limited to 'build/make/gen_msvs_vcxproj.sh')
-rwxr-xr-xbuild/make/gen_msvs_vcxproj.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index eee354dc7..23ef6a320 100755
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -157,7 +157,9 @@ for opt in "$@"; do
;;
--lib) proj_kind="lib"
;;
- --src-path-bare=*) src_path_bare=$(fix_path "$optval")
+ --src-path-bare=*)
+ src_path_bare=$(fix_path "$optval")
+ src_path_bare=${src_path_bare%/}
;;
--static-crt) use_static_runtime=true
;;
@@ -173,9 +175,9 @@ for opt in "$@"; do
esac
;;
-I*)
- opt="${opt%/}"
opt=${opt##-I}
opt=$(fix_path "$opt")
+ opt="${opt%/}"
incs="${incs}${incs:+;}&quot;${opt}&quot;"
yasmincs="${yasmincs} -I&quot;${opt}&quot;"
;;