diff options
Diffstat (limited to 'build/make/gen_msvs_vcxproj.sh')
-rwxr-xr-x | build/make/gen_msvs_vcxproj.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index 8529eed24..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 @@ -175,7 +177,7 @@ for opt in "$@"; do opt=${opt##-I} opt=$(fix_path "$opt") incs="${incs}${incs:+;}"${opt}"" - yasmincs="${yasmincs} -I${opt}" + yasmincs="${yasmincs} -I"${opt}"" ;; -D*) defines="${defines}${defines:+;}${opt##-D}" ;; @@ -392,7 +394,7 @@ generate_vcxproj() { hostplat=Win32 fi open_tag PreBuildEvent - tag_content Command "call obj_int_extract.bat $src_path_bare $hostplat\\\$(Configuration)" + tag_content Command "call obj_int_extract.bat "$src_path_bare" $hostplat\\\$(Configuration)" close_tag PreBuildEvent fi open_tag ClCompile |