From e0f416ce23a899055bf23cd81435f08aed83a8a4 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 2 Jun 2014 17:07:13 -0700 Subject: [PATCH] gen_msvs_*proj.sh: strip SRC_PATH_BARE from obj names reduces the risk of exceeding msbuild command line length limits Change-Id: I0e4d807f42c090a709a3dc365a02b929a3071688 --- build/make/gen_msvs_proj.sh | 4 +++- build/make/gen_msvs_vcxproj.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh index c6fef0d99..660436d3a 100755 --- a/build/make/gen_msvs_proj.sh +++ b/build/make/gen_msvs_proj.sh @@ -67,7 +67,9 @@ generate_filter() { if [ "${f##*.}" == "$pat" ]; then unset file_list[i] - objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') + objf=$(echo ${f%.*}.obj \ + | sed -e "s,$src_path_bare,," \ + -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') open_tag File RelativePath="$f" if [ "$pat" == "asm" ] && $asm_use_custom_step; then diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index 60a56c95e..4ae511e54 100755 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh @@ -78,7 +78,9 @@ generate_filter() { if [ "${f##*.}" == "$pat" ]; then unset file_list[i] - objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') + objf=$(echo ${f%.*}.obj \ + | sed -e "s,$src_path_bare,," \ + -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then # Avoid object file name collisions, i.e. vpx_config.c and -- 2.40.0