From f45e76fd128dade00562a8f2f8e59e655720b709 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 7 Oct 2014 19:40:40 +1100 Subject: Feature [feature-requests:#1077]. Support MinGW compilation under Linux. --- win32/makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'win32/makefile') 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