aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2004-06-20 00:14:35 +0000
committernyamatongwe <unknown>2004-06-20 00:14:35 +0000
commitd1696cb5fac3ede2e7f9f326cee887ec4c50fba5 (patch)
treeecf8d40e9353fa002814ff90ce2b8c3a04365e74
parent066e492ef6e723603e0455499514c43fd958cfc5 (diff)
downloadscintilla-mirror-d1696cb5fac3ede2e7f9f326cee887ec4c50fba5.tar.gz
Parameterised del command and added -mno-cygwin for
mingw under cygwin users.
-rw-r--r--win32/makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile
index bfa9abefc..8fd59fb86 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -9,6 +9,7 @@
.SUFFIXES: .cxx
CC = g++
DLLWRAP = dllwrap
+DEL = del /q
COMPONENT = ../bin/Scintilla.dll
LEXCOMPONENT = ../bin/SciLexer.dll
@@ -28,7 +29,7 @@ LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid
# Add -MMD to get dependencies
#CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti
INCLUDEDIRS=-I ../include -I ../src
-CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti
+CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti -mno-cygwin
ifdef DEBUG
CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -42,7 +43,7 @@ endif
ALL: $(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) ScintillaWinS.o WindowAccessor.o
clean:
- del /q *.exe *.o *.obj *.dll *.res *.map
+ $(DEL) *.exe *.o *.obj *.dll *.res *.map
deps:
$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak