fixed windows patch

NetherGamesMC · Sep 1, 2017 · 016cf1e · 016cf1e
1 parent 697956d
commit 016cf1e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 *.sh  text eol=lf
 *.bat text eol=crlf
-*.ps1 text eol=crlf
+*.ps1 text eol=crlf
+*.patch binary
diff --git a/win32/copy-static-deps.patch b/win32/copy-static-deps.patch
@@ -1,8 +1,8 @@
 diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
-index b8c6af9d27..4b013fcefe 100644
+index f97c49c9..e6853387 100644
 --- a/win32/build/mkdist.php
 +++ b/win32/build/mkdist.php
-@@ -204,7 +204,8 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
+@@ -210,7 +210,8 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
 
  /* the core dll */
  copy("$build_dir/php.exe", "$dist_dir/php.exe");

diff --git a/windows-compile-vs.bat b/windows-compile-vs.bat
@@ -49,7 +49,7 @@ cd php-src
 
 REM TODO: remove this (won't be needed as of RC2)
 call :pm-echo "Applying mkdist patch..."
-git apply "%script_path%\win32\copy-static-deps.patch"
+git apply --ignore-space-change --ignore-whitespace "%script_path%\win32\copy-static-deps.patch"
 cd ..
 
 call :pm-echo "Getting dependencies..."