diff options
| author | Tobias Kühne <unknown> | 2018-02-22 08:13:37 +1100 |
|---|---|---|
| committer | Tobias Kühne <unknown> | 2018-02-22 08:13:37 +1100 |
| commit | 62eda0dd434cae09f22f3cdf6988fc77b5c537e6 (patch) | |
| tree | 5e60358c0f2b392fe07793a0ac4c9c6c4e84f094 | |
| parent | d7aa990d9352a030615b7695c34f315217deb8c5 (diff) | |
| download | scintilla-mirror-62eda0dd434cae09f22f3cdf6988fc77b5c537e6.tar.gz | |
Bug [#1993]. Fix building on Mingw/MSYS to perform file copies and deletions.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/makefile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index e438c6dfe..ee0483cdf 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -544,6 +544,10 @@ position instead of the limit of the rectangular selection. </li> <li> + Fix building on Mingw/MSYS to perform file copies and deletions. + <a href="http://sourceforge.net/p/scintilla/bugs/1993/">Bug #1993</a>. + </li> + <li> SciTE on Windows can execute Python scripts directly by name when on path. <a href="http://sourceforge.net/p/scintilla/feature-requests/1209/">Feature #1209.</a> </li> diff --git a/win32/makefile b/win32/makefile index 894026e9a..9849ebf89 100644 --- a/win32/makefile +++ b/win32/makefile @@ -18,7 +18,7 @@ endif .SUFFIXES: .cxx ifeq ($(OS),Windows_NT) -DEL = del /q +DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q) else DEL = rm -f endif |