shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I0e4d807f,Ia5ff575c,Ie4a1f313

* changes:
  gen_msvs_*proj.sh: strip SRC_PATH_BARE from obj names
  *.mk: pass SRC_PATH_BARE to all GEN_VCPROJ invocations
  build/msvs: fix builds in source dirs with spaces

--- a/build/arm-msvs/obj_int_extract.bat

+++ b/build/arm-msvs/obj_int_extract.bat

@@ -11,8 +11,8 @@

 REM   %1 - Relative path to the directory containing the vp8 and vpx_scale

 REM        source directories.

 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"

-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"

--- a/build/make/gen_msvs_proj.sh

+++ b/build/make/gen_msvs_proj.sh

@@ -67,7 +67,9 @@

             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

@@ -153,7 +155,7 @@

             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}"

         ;;

@@ -300,7 +302,7 @@

                     vpx)

                         tag Tool \

                             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 \

                             Name="VCCLCompilerTool" \

--- a/build/make/gen_msvs_vcxproj.sh

+++ b/build/make/gen_msvs_vcxproj.sh

@@ -78,7 +78,9 @@

             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 @@

             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 @@

                     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

--- a/build/x86-msvs/obj_int_extract.bat

+++ b/build/x86-msvs/obj_int_extract.bat

@@ -10,6 +10,6 @@

 REM Arguments:

 REM   %1 - Relative path to the directory containing the vp8 source directory.

 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"

--- a/examples.mk

+++ b/examples.mk

@@ -306,6 +306,7 @@

             --name=$$(@:.$(VCPROJ_SFX)=)\

             --ver=$$(CONFIG_VS_VERSION)\

             --proj-guid=$$($$(@:.$(VCPROJ_SFX)=).GUID)\

+            --src-path-bare="$(SRC_PATH_BARE)" \

             $$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \

             --out=$$@ $$(INTERNAL_CFLAGS) $$(CFLAGS) \

             $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -l$$(CODEC_LIB) $$^

--- a/libs.mk

+++ b/libs.mk

@@ -222,6 +222,7 @@

     --name=obj_int_extract \

     --ver=$(CONFIG_VS_VERSION) \

     --proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2 \

+    --src-path-bare="$(SRC_PATH_BARE)" \

     $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \

     --out=$@ $^ \

     -I. \

@@ -253,6 +254,7 @@

             --proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \

             --module-def=vpx.def \

             --ver=$(CONFIG_VS_VERSION) \

+            --src-path-bare="$(SRC_PATH_BARE)" \

             --out=$@ $(CFLAGS) \

             $(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \

             --src-path-bare="$(SRC_PATH_BARE)" \

@@ -447,6 +449,7 @@

             -D_VARIADIC_MAX=10 \

             --proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \

             --ver=$(CONFIG_VS_VERSION) \

+            --src-path-bare="$(SRC_PATH_BARE)" \

             $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \

             --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \

             -I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \

-- 

⑨