diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-01-01 10:21:25 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-01-01 10:21:25 +1100 |
| commit | 3e959c127418a2053db1ea6acbe4ee9030b70fe1 (patch) | |
| tree | 086da4b70bf9e85a3e9af203af691574bd2d211b | |
| parent | 4f1b30ebe70a6475ffeca1ce2c0dc48c8e70a5f9 (diff) | |
| download | scintilla-mirror-3e959c127418a2053db1ea6acbe4ee9030b70fe1.tar.gz | |
Be more accurate for 'make clean' as bin directory now shared with Lexilla.
| -rw-r--r-- | win32/makefile | 5 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile index 45c9c525b..2442ca65e 100644 --- a/win32/makefile +++ b/win32/makefile @@ -31,6 +31,9 @@ WINDRES ?= windres # Environment variable windir always defined on Win32 +# Take care of changing Unix style '/' directory separator to '\' on Windows +normalize = $(if $(windir),$(subst /,\,$1),$1) + ifdef windir DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q) else @@ -64,7 +67,7 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) all: $(COMPONENT) $(LEXCOMPONENT) $(LIBSCI) clean: - $(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist + $(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI)) %.o: %.cxx $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $< diff --git a/win32/scintilla.mak b/win32/scintilla.mak index e005e298b..fb5e11867 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -61,7 +61,8 @@ all: $(COMPONENT) $(LEXCOMPONENT) $(LIBSCI) clean: -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) $(LEXCOMPONENT) \ - $(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb $(DIR_BIN)\*.lib + $(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb \ + $(DIR_BIN)\Scintilla.lib $(DIR_BIN)\SciLexer.lib $(LIBSCI) depend: python DepGen.py |