HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace escape character '\' by slash '/' in paths in the Windows Makefiles (patch by Matthew Brush, thanks).

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5685 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2011-04-03 16:38:31 +00:00
parent c03d77d8a6
commit a43d27d0a4
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -4,6 +4,9 @@
Update Scintilla to version 2.25. Update Scintilla to version 2.25.
* version.txt, Makefile.am: * version.txt, Makefile.am:
Add Scintilla's version.txt file. 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 <colomban(at)geany(dot)org> 2011-04-03 Colomban Wendling <colomban(at)geany(dot)org>

6
makefile.win32
View File

@ -22,7 +22,7 @@ MAKE = make
# Note: && is needed after cd because each line is executed in a different # Note: && is needed after cd because each line is executed in a different
# shell. (cd .. is just for clarity). # shell. (cd .. is just for clarity).
all: check-tools config.h 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 tagmanager && $(MAKE) -f makefile.win32 && cd ..
cd scintilla && $(MAKE) -f makefile.win32 && cd .. cd scintilla && $(MAKE) -f makefile.win32 && cd ..
cd plugins && $(MAKE) -f makefile.win32 && cd .. cd plugins && $(MAKE) -f makefile.win32 && cd ..
@ -38,14 +38,14 @@ config.h: win32-config.h
$(CP) $< $@ $(CP) $< $@
deps: 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 # used by src/makefile.win32 to avoid del ../file which is an error
clean-local: clean-local:
-$(RM) geany_private.res geany.exe -$(RM) geany_private.res geany.exe
clean: deps 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 tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
cd plugins && $(MAKE) -f makefile.win32 clean && cd .. cd plugins && $(MAKE) -f makefile.win32 clean && cd ..

2
scintilla/makefile.win32
View File

@ -138,7 +138,7 @@ $(COMPLIB): $(MARSHALLER) $(LEXOBJS) $(SRCOBJS)
$(RANLIB) $@ $(RANLIB) $@
deps.mak: 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" # Generate header dependencies with "make deps.mak"
include deps.mak include deps.mak

2
tagmanager/makefile.win32
View File

@ -3,7 +3,7 @@
CC = gcc CC = gcc
AR = ar AR = ar
RANLIB = ranlib RANLIB = ranlib
PREFIX = C:\libs PREFIX = C:/libs
RM = del RM = del
-include ../localwin32.mk -include ../localwin32.mk