aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2012-07-26 11:45:47 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2012-07-26 11:45:47 -0400
commitfbf9435c13a26f504cbf2dcbc82ef4190bfc893a (patch)
tree138eb6ef136e21bb9dece30e748a92a9f36f8dab /src
parentbbbfecca074f908de1efd9f491c6eb2a1bb76249 (diff)
downloadtextadept-fbf9435c13a26f504cbf2dcbc82ef4190bfc893a.tar.gz
textadept-fbf9435c13a26f504cbf2dcbc82ef4190bfc893a.zip
Compile scintillua with NCURSES flag when necessary; src/Makefile
Diffstat (limited to 'src')
-rw-r--r--src/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 2f973e45..d6f30897 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -187,6 +187,12 @@ LexLPeg.o: LexLPeg.cxx
LexLPegjit.o: LexLPeg.cxx
$(CROSS)$(CXX) -c $(CXXFLAGS) $(LUAFLAGS) $(sci_flags) -DLPEG_LEXER \
-DNO_SCITE -Iluajit/src $< -o $@
+LexLPeg-ncurses.o: LexLPeg.cxx
+ $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUAFLAGS) $(sci_flags) -DLPEG_LEXER \
+ -DNO_SCITE -DNCURSES -Ilua/src $< -o $@
+LexLPegjit-ncurses.o: LexLPeg.cxx
+ $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUAFLAGS) $(sci_flags) -DLPEG_LEXER \
+ -DNO_SCITE -DNCURSES -Iluajit/src $< -o $@
textadept.o: textadept.c
$(CROSS)$(CC) -c $(CFLAGS) $(ta_flags) -Ilua/src $(gtk_flags) $<
textadeptjit.o: textadept.c
@@ -232,11 +238,11 @@ textadept: $(scintilla_objs) $(scintilla_gtk_objs) scintilla-marshal.o \
textadeptjit: $(scintilla_objs) $(scintilla_gtk_objs) scintilla-marshal.o \
LexLPegjit.o textadeptjit.o $(luajit_objs) $(libluajit) gtdialog.o
$(CROSS)$(CXX) $(CXXFLAGS) -o ../$@ $^ $(gtk_libs) $(LDFLAGS)
-textadept-ncurses: $(scintilla_objs) ScintillaTerm.o LexLPeg.o \
+textadept-ncurses: $(scintilla_objs) ScintillaTerm.o LexLPeg-ncurses.o \
textadept-ncurses.o $(lua_objs) gtdialog-ncurses.o \
$(termkey_objs) $(cdk_objs)
$(CROSS)$(CXX) $(CXXFLAGS) -o ../$@ $^ -lncursesw $(LDFLAGS)
-textadeptjit-ncurses: $(scintilla_objs) ScintillaTerm.o LexLPegjit.o \
+textadeptjit-ncurses: $(scintilla_objs) ScintillaTerm.o LexLPegjit-ncurses.o \
textadeptjit-ncurses.o $(luajit_objs) $(libluajit) \
gtdialog-ncurses.o $(termkey_objs) $(cdk_objs)
$(CROSS)$(CXX) $(CXXFLAGS) -o ../$@ $^ -lncursesw $(LDFLAGS)