diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-27 09:36:03 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-27 09:36:03 +1100 |
| commit | 07e215b1cfb224a7e77304499df886a83080ff8a (patch) | |
| tree | 46e96fef5af57eafdc43e68d6b0204f5de8fc35a | |
| parent | 6f7ab15526f1fef558212efc363a2023a5699e7d (diff) | |
| download | scintilla-mirror-07e215b1cfb224a7e77304499df886a83080ff8a.tar.gz | |
Backport: Use Unix paths except when deleting files, then call normalize to change / to \.
Backport of changeset 7851:c1e4d8c34272.
| -rw-r--r-- | gtk/makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/makefile b/gtk/makefile index b5437346e..8e433edaf 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -35,14 +35,16 @@ ifndef windir BASE_FLAGS += -fPIC endif +# Take care of changing Unix style '/' directory separator to '\' on Windows +normalize = $(if $(windir),$(subst /,\,$1),$1) + ifdef windir CC = gcc DEL = del /q -COMPLIB=$(srcdir)\..\bin\scintilla.a else DEL = rm -f -COMPLIB=$(basedir)/bin/scintilla.a endif +COMPLIB=$(basedir)/bin/scintilla.a vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib vpath %.c $(srcdir) @@ -78,7 +80,7 @@ MARSHALLER=scintilla-marshal.o all: $(COMPLIB) clean: - $(DEL) *.o $(COMPLIB) *.plist + $(DEL) *.o $(call normalize,$(COMPLIB)) *.plist .cxx.o: $(CXX) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) -c $< |