shithub: libvpx

Info  •  Files  •  Log  •  Branches

gen_msvs_proj: fix in tree configure under cygwin

strip trailing '/' from paths, this is later converted to '\' which
causes execution errors for obj_int_extract/yasm. vs10+ wasn't affected
by this issue, but make the same change for consistency.

gen_msvs_proj:
+ add missing '"' to obj_int_extract call
  unlike gen_msvs_vcproj, the block is duplicated
  missed in: 1e3d9b9 build/msvs: fix builds in source dirs with spaces

Change-Id: I76208e6cdc66dc5a0a7ffa8aa1edbefe31e4b130

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

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

@@ -137,7 +137,9 @@

         ;;

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

         ;;

@@ -151,9 +153,9 @@

             esac

         ;;

         -I*)

-            opt="${opt%/}"

             opt=${opt##-I}

             opt=$(fix_path "$opt")

+            opt="${opt%/}"

             incs="${incs}${incs:+;}"${opt}""

             yasmincs="${yasmincs} -I"${opt}""

         ;;

@@ -414,7 +416,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

@@ -157,7 +157,9 @@

         ;;

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

         ;;

@@ -173,9 +175,9 @@

             esac

         ;;

         -I*)

-            opt="${opt%/}"

             opt=${opt##-I}

             opt=$(fix_path "$opt")

+            opt="${opt%/}"

             incs="${incs}${incs:+;}"${opt}""

             yasmincs="${yasmincs} -I"${opt}""

         ;;