diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2010-08-31 21:36:43 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2010-08-31 21:36:43 -0400 |
| commit | c5df56961a77f1b6a4042f7285c6e52ee28eb54a (patch) | |
| tree | a416bdcc2c28ad3a68e86c953a3a693c2c0b59f6 | |
| parent | f062973a81b74e5a5ea38602d74a8ee61aa76695 (diff) | |
| download | textadept-c5df56961a77f1b6a4042f7285c6e52ee28eb54a.tar.gz textadept-c5df56961a77f1b6a4042f7285c6e52ee28eb54a.zip | |
Patched Scintilla (as scintillua) no longer needed; src/Makefile
The changes to LexLPeg.cxx mean that src/scintillua (patched Scintilla) is no
longer required. Can use stock Scintilla now.
| -rw-r--r-- | src/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index 4fb61776..b455f6b4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,7 +34,7 @@ DEBUG_FLAG = -DNDEBUG else DEBUG_FLAG = -DDEBUG -DTRACE -g endif -INCLUDEDIRS = -Iscintillua/include -Ilua/include -Igcocoadialog +INCLUDEDIRS = -Iscintilla/include -Ilua/include -Igcocoadialog # Textadept @@ -58,8 +58,8 @@ GCOCOADIALOG = gcocoadialog.o # Scintilla SCI_CXXFLAGS = $(DEBUG_FLAG) -pedantic -Os $(PLAT_FLAGS) -DSCI_LEXER \ - $(SCI_THREAD_FLAG) $(INCLUDEDIRS) -Iscintillua/src -Iscintillua/gtk \ - -Iscintillua/lexlib \ + $(SCI_THREAD_FLAG) $(INCLUDEDIRS) -Iscintilla/src -Iscintilla/gtk \ + -Iscintilla/lexlib \ -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long SCINTILLA_OBJS = AutoComplete.o CallTip.o Catalogue.o CellBuffer.o \ @@ -77,10 +77,10 @@ SCINTILLA_LEXER = LexLPeg.o all: $(TEXTADEPT) -$(SCINTILLA_OBJS): scintillua/gtk/*.cxx scintillua/src/*.cxx \ - scintillua/lexlib/*.cxx +$(SCINTILLA_OBJS): scintilla/gtk/*.cxx scintilla/src/*.cxx \ + scintilla/lexlib/*.cxx $(CPP) $(SCI_CXXFLAGS) $(GTKFLAGS) -c $^ -$(SCINTILLA_MARSHALLER): scintillua/gtk/scintilla-marshal.c +$(SCINTILLA_MARSHALLER): scintilla/gtk/scintilla-marshal.c $(CC) $(SCI_CXXFLAGS) $(GTKFLAGS) -w -c $^ $(SCINTILLA_LEXER): LexLPeg.cxx $(CPP) $(SCI_CXXFLAGS) $(GTKFLAGS) $(LUA_CFLAGS) -DLPEG_LEXER -DNO_SCITE -c $^ @@ -155,8 +155,8 @@ release: ../$(TEXTADEPT) ../$(TEXTADEPT32) ../$(TEXTADEPTWIN32) \ rm -r $(RELEASEDIRMAC) # Source rm $(RELEASEDIR32)/$(TEXTADEPT) - cp -r lua scintillua gcocoadialog $(RELEASEDIR32)/src/ - rm -r $(RELEASEDIR32)/src/scintillua/.hg + cp -r lua scintilla gcocoadialog $(RELEASEDIR32)/src/ + rm -r $(RELEASEDIR32)/src/scintilla/.hg cp -r ../xcode $(RELEASEDIR32)/ zip -r $(SRCPACKAGE) $(RELEASEDIR32) # Done |