diff options
Diffstat (limited to 'curses/jinx')
| -rw-r--r-- | curses/jinx/Makefile | 18 | ||||
| -rw-r--r-- | curses/jinx/jinx.c | 10 |
2 files changed, 18 insertions, 10 deletions
diff --git a/curses/jinx/Makefile b/curses/jinx/Makefile index 6811d4f7e..cd34e14cf 100644 --- a/curses/jinx/Makefile +++ b/curses/jinx/Makefile @@ -3,17 +3,15 @@ CC = gcc CXX = g++ INCLUDEDIRS = -I ../../include -I ../../src -I ../../lexlib -I ../ -CFLAGS = -DCURSES -DSCI_LEXER -D_XOPEN_SOURCE_EXTENDED -W -Wall $(INCLUDEDIRS) \ - -Wno-unused-parameter +CFLAGS = -DCURSES -DSCI_LEXER -Wall $(INCLUDEDIRS) CXXFLAGS = $(CFLAGS) +ifdef LPEG_LEXER + CFLAGS += -DLPEG_LEXER -I ../src/lua +endif -scintilla = ../../bin/scintilla_curses.a -lexers = $(wildcard ../Lex*.o) +scintilla = ../../bin/scintilla.a all: jinx -jinx.o: jinx.c - $(CC) $(CFLAGS) -c $< -jinx: jinx.o $(lexers) $(scintilla) - $(CXX) -DCURSES $^ -o $@ -lncursesw -clean: - rm -f jinx *.o +jinx.o: jinx.c ; $(CC) $(CFLAGS) -c $< +jinx: jinx.o $(scintilla) ; $(CXX) $^ -o $@ -lncursesw +clean: ; rm -f jinx *.o diff --git a/curses/jinx/jinx.c b/curses/jinx/jinx.c index 83a955cb4..bea88f67f 100644 --- a/curses/jinx/jinx.c +++ b/curses/jinx/jinx.c @@ -24,6 +24,7 @@ int main(int argc, char **argv) { SSM(SCI_STYLESETFORE, STYLE_DEFAULT, 0xFFFFFF); SSM(SCI_STYLESETBACK, STYLE_DEFAULT, 0); SSM(SCI_STYLECLEARALL, 0, 0); +#if !LPEG_LEXER SSM(SCI_SETLEXER, SCLEX_CPP, 0); SSM(SCI_SETKEYWORDS, 0, (sptr_t)"int char"); SSM(SCI_STYLESETFORE, SCE_C_COMMENT, 0x00FF00); @@ -32,6 +33,15 @@ int main(int argc, char **argv) { SSM(SCI_STYLESETFORE, SCE_C_WORD, 0xFF0000); SSM(SCI_STYLESETFORE, SCE_C_STRING, 0xFF00FF); SSM(SCI_STYLESETBOLD, SCE_C_OPERATOR, 1); +#else + SSM(SCI_SETLEXER, SCLEX_LPEG, 0); + SSM(SCI_SETPROPERTY, (uptr_t)"lexer.lpeg.home", (sptr_t)"../../lexlua"); + SSM(SCI_SETPROPERTY, (uptr_t)"lexer.lpeg.color.theme", (sptr_t)"curses"); + SSM(SCI_PRIVATELEXERCALL, SCI_GETDIRECTFUNCTION, + SSM(SCI_GETDIRECTFUNCTION, 0, 0)); + SSM(SCI_PRIVATELEXERCALL, SCI_SETDOCPOINTER, SSM(SCI_GETDIRECTPOINTER, 0, 0)); + SSM(SCI_PRIVATELEXERCALL, SCI_SETLEXERLANGUAGE, (sptr_t)"ansi_c"); +#endif SSM(SCI_INSERTTEXT, 0, (sptr_t) "int main(int argc, char **argv) {\n" " // Start up the gnome\n" |