diff --git a/ChangeLog b/ChangeLog index f1644734..b79da3f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ Update Scintilla to version 2.25. * version.txt, Makefile.am: Add Scintilla's version.txt file. + * scintilla/makefile.win32, tagmanager/makefile.win32, makefile.win32: + Replace escape character '\' by slash '/' in paths in the + Windows Makefiles (patch by Matthew Brush, thanks). 2011-04-03 Colomban Wendling diff --git a/makefile.win32 b/makefile.win32 index ddac0183..73c2ae16 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -22,7 +22,7 @@ MAKE = make # Note: && is needed after cd because each line is executed in a different # shell. (cd .. is just for clarity). all: check-tools config.h - cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\.. + cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../.. cd tagmanager && $(MAKE) -f makefile.win32 && cd .. cd scintilla && $(MAKE) -f makefile.win32 && cd .. cd plugins && $(MAKE) -f makefile.win32 && cd .. @@ -38,14 +38,14 @@ config.h: win32-config.h $(CP) $< $@ deps: - -$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak + -$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak # used by src/makefile.win32 to avoid del ../file which is an error clean-local: -$(RM) geany_private.res geany.exe clean: deps - cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\.. + cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../.. cd tagmanager && $(MAKE) -f makefile.win32 clean && cd .. cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. cd plugins && $(MAKE) -f makefile.win32 clean && cd .. diff --git a/scintilla/makefile.win32 b/scintilla/makefile.win32 index 87c4b8df..2d122974 100644 --- a/scintilla/makefile.win32 +++ b/scintilla/makefile.win32 @@ -138,7 +138,7 @@ $(COMPLIB): $(MARSHALLER) $(LEXOBJS) $(SRCOBJS) $(RANLIB) $@ deps.mak: - $(CC) -MM $(CXXFLAGS) gtk\*.cxx lexers\*.cxx lexlib\*.cxx src\*.cxx >deps.mak + $(CC) -MM $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak # Generate header dependencies with "make deps.mak" include deps.mak diff --git a/tagmanager/makefile.win32 b/tagmanager/makefile.win32 index 7c99a2ea..1fd12b27 100644 --- a/tagmanager/makefile.win32 +++ b/tagmanager/makefile.win32 @@ -3,7 +3,7 @@ CC = gcc AR = ar RANLIB = ranlib -PREFIX = C:\libs +PREFIX = C:/libs RM = del -include ../localwin32.mk