Commit 1e3d9b9e authored by James Zern's avatar James Zern
Browse files

build/msvs: fix builds in source dirs with spaces

...when configured below the path containing spaces. configuring outside
the path containing spaces still won't work due to issues with the
makefiles, e.g.,
/path with spaces/git
/path with spaces/build1
/build2
configure/make in build1 will work, build2 will not

Change-Id: Ie4a1f313596d7457cadd67476ac1dbd3273ad46e
parent f5628853
...@@ -11,8 +11,8 @@ REM Arguments: ...@@ -11,8 +11,8 @@ REM Arguments:
REM %1 - Relative path to the directory containing the vp8 and vpx_scale REM %1 - Relative path to the directory containing the vp8 and vpx_scale
REM source directories. REM source directories.
REM %2 - Path to obj_int_extract.exe. REM %2 - Path to obj_int_extract.exe.
cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vp8/encoder/vp8_asm_enc_offsets.c" cl /I. /I%1 /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%~1/vp8/encoder/vp8_asm_enc_offsets.c"
%2\obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm" %2\obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm"
cl /I "./" /I "%1" /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%1/vpx_scale/vpx_scale_asm_offsets.c" cl /I. /I%1 /nologo /c /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP "%~1/vpx_scale/vpx_scale_asm_offsets.c"
%2\obj_int_extract.exe rvds "vpx_scale_asm_offsets.obj" > "vpx_scale_asm_offsets.asm" %2\obj_int_extract.exe rvds "vpx_scale_asm_offsets.obj" > "vpx_scale_asm_offsets.asm"
...@@ -67,7 +67,7 @@ generate_filter() { ...@@ -67,7 +67,7 @@ generate_filter() {
if [ "${f##*.}" == "$pat" ]; then if [ "${f##*.}" == "$pat" ]; then
unset file_list[i] unset file_list[i]
objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/],_,g') objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
open_tag File RelativePath="$f" open_tag File RelativePath="$f"
if [ "$pat" == "asm" ] && $asm_use_custom_step; then if [ "$pat" == "asm" ] && $asm_use_custom_step; then
...@@ -153,7 +153,7 @@ for opt in "$@"; do ...@@ -153,7 +153,7 @@ for opt in "$@"; do
opt=${opt##-I} opt=${opt##-I}
opt=$(fix_path "$opt") opt=$(fix_path "$opt")
incs="${incs}${incs:+;}"${opt}"" incs="${incs}${incs:+;}"${opt}""
yasmincs="${yasmincs} -I${opt}" yasmincs="${yasmincs} -I"${opt}""
;; ;;
-D*) defines="${defines}${defines:+;}${opt##-D}" -D*) defines="${defines}${defines:+;}${opt##-D}"
;; ;;
...@@ -300,7 +300,7 @@ generate_vcproj() { ...@@ -300,7 +300,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" \
......
...@@ -78,7 +78,7 @@ generate_filter() { ...@@ -78,7 +78,7 @@ generate_filter() {
if [ "${f##*.}" == "$pat" ]; then if [ "${f##*.}" == "$pat" ]; then
unset file_list[i] unset file_list[i]
objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/],_,g') objf=$(echo ${f%.*}.obj | sed -e 's/^[\./]\+//g' -e 's,[:/ ],_,g')
if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then
# Avoid object file name collisions, i.e. vpx_config.c and # Avoid object file name collisions, i.e. vpx_config.c and
...@@ -175,7 +175,7 @@ for opt in "$@"; do ...@@ -175,7 +175,7 @@ for opt in "$@"; do
opt=${opt##-I} opt=${opt##-I}
opt=$(fix_path "$opt") opt=$(fix_path "$opt")
incs="${incs}${incs:+;}"${opt}"" incs="${incs}${incs:+;}"${opt}""
yasmincs="${yasmincs} -I${opt}" yasmincs="${yasmincs} -I"${opt}""
;; ;;
-D*) defines="${defines}${defines:+;}${opt##-D}" -D*) defines="${defines}${defines:+;}${opt##-D}"
;; ;;
...@@ -392,7 +392,7 @@ generate_vcxproj() { ...@@ -392,7 +392,7 @@ generate_vcxproj() {
hostplat=Win32 hostplat=Win32
fi fi
open_tag PreBuildEvent 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 close_tag PreBuildEvent
fi fi
open_tag ClCompile open_tag ClCompile
......
...@@ -10,6 +10,6 @@ echo on ...@@ -10,6 +10,6 @@ echo on
REM Arguments: REM Arguments:
REM %1 - Relative path to the directory containing the vp8 source directory. REM %1 - Relative path to the directory containing the vp8 source directory.
REM %2 - Path to obj_int_extract.exe. REM %2 - Path to obj_int_extract.exe.
cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/vp8_asm_enc_offsets.c" cl /I. /I%1 /nologo /c "%~1/vp8/encoder/vp8_asm_enc_offsets.c"
%2\obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm" %2\obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm"
Markdown is supported
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