Skip to content
GitLab
Commit 74ec6fbe authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "gen_msvs_proj: fix in tree configure under cygwin"

parents bf46feb3 0a049261
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 sandbox/Jingning/experimental sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 5 deletions
build/make/gen_msvs_proj.sh
+ 5
− 3
View file @ 74ec6fbe
...@@ -137,7 +137,9 @@ for opt in "$@"; do ...@@ -137,7 +137,9 @@ for opt in "$@"; do
;; ;;
--lib) proj_kind="lib" --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 --static-crt) use_static_runtime=true
;; ;;
...@@ -151,9 +153,9 @@ for opt in "$@"; do ...@@ -151,9 +153,9 @@ for opt in "$@"; do
esac esac
;; ;;
-I*) -I*)
opt="${opt%/}"
opt=${opt##-I} opt=${opt##-I}
opt=$(fix_path "$opt") opt=$(fix_path "$opt")
opt="${opt%/}"
incs="${incs}${incs:+;}"${opt}"" incs="${incs}${incs:+;}"${opt}""
yasmincs="${yasmincs} -I"${opt}"" yasmincs="${yasmincs} -I"${opt}""
;; ;;
...@@ -414,7 +416,7 @@ generate_vcproj() { ...@@ -414,7 +416,7 @@ generate_vcproj() {
vpx) vpx)
tag Tool \ tag Tool \
Name="VCPreBuildEventTool" \ Name="VCPreBuildEventTool" \
CommandLine="call obj_int_extract.bat $src_path_bare $plat_no_ws\\\$(ConfigurationName)" \ CommandLine="call obj_int_extract.bat "$src_path_bare" $plat_no_ws\\\$(ConfigurationName)" \
tag Tool \ tag Tool \
Name="VCCLCompilerTool" \ Name="VCCLCompilerTool" \
......
build/make/gen_msvs_vcxproj.sh
+ 4
− 2
View file @ 74ec6fbe
...@@ -157,7 +157,9 @@ for opt in "$@"; do ...@@ -157,7 +157,9 @@ for opt in "$@"; do
;; ;;
--lib) proj_kind="lib" --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 --static-crt) use_static_runtime=true
;; ;;
...@@ -173,9 +175,9 @@ for opt in "$@"; do ...@@ -173,9 +175,9 @@ for opt in "$@"; do
esac esac
;; ;;
-I*) -I*)
opt="${opt%/}"
opt=${opt##-I} opt=${opt##-I}
opt=$(fix_path "$opt") opt=$(fix_path "$opt")
opt="${opt%/}"
incs="${incs}${incs:+;}"${opt}"" incs="${incs}${incs:+;}"${opt}""
yasmincs="${yasmincs} -I"${opt}"" yasmincs="${yasmincs} -I"${opt}""
;; ;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment