From 775ff693bbf41edeaa1b3c561a786cdc2e09ef37 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Sun, 31 Mar 2013 00:46:09 -0400
Subject: Reverted update to LPeg 0.11 due to crash in multi-lang lexers;
 src/Makefile

---
 src/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 2dfb20d9..5bb536a8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -166,8 +166,10 @@ lua_objs = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o \
            lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o \
            lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
            lmathlib.o loadlib.o loslib.o ltablib.o lstrlib.o \
-           lpvm.o lpcap.o lptree.o lpcode.o lpprint.o lfs.o
-luajit_objs = lpvmjit.o lpcapjit.o lptreejit.o lpcodejit.o lpprintjit.o lfsjit.o
+           lpeg.o lfs.o
+#          lpvm.o lpcap.o lptree.o lpcode.o lpprint.o lfs.o
+luajit_objs = lpegjit.o lfsjit.o
+#luajit_objs= lpvmjit.o lpcapjit.o lptreejit.o lpcodejit.o lpprintjit.o lfsjit.o
 termkey_objs = termkey.o driver-ti.o driver-csi.o
 cdk_objs = binding.o buttonbox.o button.o cdk.o cdk_display.o cdk_objs.o \
            cdk_params.o cdkscreen.o debug.o draw.o entry.o fselect.o \
@@ -226,9 +228,9 @@ textadept-ncurses.o: textadept.c
 textadeptjit-ncurses.o: textadept.c
 	$(CROSS)$(CC) -c $(CFLAGS) $(ta_flags) -DLUAJIT -Iluajit/src \
 		-Iscintilla/term -Itermkey -Icdk $< -o $@
-$(lua_objs): lua/src/*.c lua/src/lib/*.c lua/src/lib/lpeg/*.c
+$(lua_objs): lua/src/*.c lua/src/lib/*.c #lua/src/lib/lpeg/*.c
 	$(CROSS)$(CC) -c $(CFLAGS) $(LUAFLAGS) -Ilua/src $^
-$(luajit_objs): lua/src/lib/*.c lua/src/lib/lpeg/*.c
+$(luajit_objs): lua/src/lib/*.c #lua/src/lib/lpeg/*.c
 	$(CROSS)$(CC) -c $(CFLAGS) $(LUAFLAGS) -Iluajit/src $^
 	for lib in $(luajit_objs); do mv $$(echo $$lib | sed 's/jit//g') $$lib; done
 libluajit.a:
-- 
cgit v1.2.3