From f45e76fd128dade00562a8f2f8e59e655720b709 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 7 Oct 2014 19:40:40 +1100
Subject: Feature [feature-requests:#1077]. Support MinGW compilation under
 Linux.

---
 doc/ScintillaHistory.html |  5 +++++
 win32/makefile            | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 69236dc15..79b302302 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -459,6 +459,7 @@
 	<td>danselmi</td>
 	<td>Mat Berchtold</td>
 	<td>Michael Staszewski</td>
+	<td>Baurzhan Muftakhidinov</td>
     </tr>
     </table>
     <p>
@@ -499,6 +500,10 @@
 	On Windows, allow right click selection in popup menu.
 	<a href="http://sourceforge.net/p/scintilla/feature-requests/1080/">Feature #1080.</a>
 	</li>
+	<li>
+	Support MinGW compilation under Linux.
+	<a href="http://sourceforge.net/p/scintilla/feature-requests/1077/">Feature #1077.</a>
+	</li>
     </ul>
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite351.zip?download">Release 3.5.1</a>
diff --git a/win32/makefile b/win32/makefile
index bd808fe41..806e585d5 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -5,7 +5,13 @@
 # be needed to use other compilers.
 
 .SUFFIXES: .cxx
-DEL ?= del /q
+ifeq ($(OS),Windows_NT)
+DEL = del /q
+else
+DEL = rm -f
+endif
+RANLIB ?= ranlib
+WINDRES ?= windres
 
 COMPONENT = ../bin/Scintilla.dll
 LEXCOMPONENT = ../bin/SciLexer.dll
@@ -110,7 +116,7 @@ $(LEXCOMPONENT): $(LOBJS) Scintilla.def
 
 $(LEXLIB): $(LEXOBJS)
 	$(AR) rc $@ $^
-	ranlib $@
+	$(RANLIB) $@	
 
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak
@@ -160,5 +166,5 @@ ScintillaWinL.o:
 	$(CXX) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
 
 ScintRes.o:	ScintRes.rc
-	windres ScintRes.rc $@
+	$(WINDRES) ScintRes.rc $@
 
-- 
cgit v1.2.3