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 | 4044cf5fdff8441b53550d84d9ca61f2c56ff8b7 (patch) | |
| tree | 00aa1a3cc38304fa546bbd8b33cbf1c18df85827 | |
| parent | 4588ee8ef913e3dfb66abd904af47b74a4840ca9 (diff) | |
| download | scintilla-mirror-4044cf5fdff8441b53550d84d9ca61f2c56ff8b7.tar.gz | |
Use Unix paths except when deleting files, then call normalize to change / to \.
| -rw-r--r-- | gtk/makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/makefile b/gtk/makefile index 05827c3ed..86e28061d 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) @@ -68,7 +70,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 $< |