First massive overhaul of lua-interface: removing luac (let's place sourcecode directly...), removing Lua (let's use LuaJIT instead)

1 files changed, 12 insertions, 73 deletions

diff --git a/Makefile b/Makefile
index 68ebb0f..766d425 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ INCLUDES = \
 -I../mogltk/include \
 -I../Baltisot/include \
 -I../Baltisot/lib/zlib/include \
--I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \
+-I../LuaJIT/src \
 -I../lua-modules/src \
 \
 -I ../Mesa-7.4.4/include \
@@ -63,11 +63,11 @@ CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
 
 BASIC_LDFLAGS += $(ARCH_FLAGS) $(LIBS)
 
-LDFLAGS += $(BASIC_LDFLAGS) $(LDFLAGS_READLINE) -L/usr/lib/oracle/11.1.0.1/client/lib
+LDFLAGS += $(BASIC_LDFLAGS) $(LDFLAGS_READLINE) -L/usr/lib/oracle/11.1.0.1/client/lib ../LuaJIT/src/luajit.a
 
-vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src
-vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../lua-modules-cd-tool/src
-vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../PSX-Bundle/lib
+vpath %.c ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src
+vpath %.cc ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src:../lua-modules-cd-tool/src
+vpath %.cpp ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src:../PSX-Bundle/lib
 vpath %.lua ../Baltisot/lib:../Baltisot/src
 
 LUAINTERFACE_SOURCES = \
@@ -76,6 +76,7 @@ lua-plugin.cc \
 
 BALTISOT_SOURCES = \
 Main.cc \
+ldirlib.c \
 \
 RandISAAC.cc \
 Exceptions.cc \
@@ -131,61 +132,6 @@ md5.c \
 sha1.c \
 sha256.c \
 
-LUA_SOURCES = \
-lapi.c \
-lcode.c \
-ldebug.c \
-ldo.c \
-ldump.c \
-lfunc.c \
-lgc.c \
-llex.c \
-lmem.c \
-lobject.c \
-lopcodes.c \
-lparser.c \
-lstate.c \
-lstring.c \
-ltable.c \
-ltests.c \
-ltm.c \
-luacomp.c \
-lundump.c \
-lvm.c \
-lzio.c \
-lprint.c \
-\
-linit.c \
-lauxlib.c \
-loadlib.c \
-lbaselib.c \
-ldblib.c \
-ldirlib.c \
-liolib.c \
-loslib.c \
-lmathlib.c \
-lstrlib.c \
-ltablib.c \
-
-LUAC_SOURCES = \
-luac.cc \
-\
-Main.cc \
-Exceptions.cc \
-String.cc \
-\
-Handle.cc \
-Input.cc \
-Output.cc \
-Buffer.cc \
-\
-BLua.cc \
-\
-fileutils.cc \
-generic.cc \
-checkargs.c \
-datecalc.c \
-
 DEBUG_MODULES = \
 lua-interface-main.c \
 tinystr.cpp \
@@ -222,29 +168,25 @@ yazedc.cpp \
 LuaOCCI.cpp \
 plugin-luaocci.cc \
 
-WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUA_SOURCES) $(LUAINTERFACE_SOURCES) $(GL_GLUE)
+WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUAINTERFACE_SOURCES) $(GL_GLUE)
 DEBUG_SOURCES = $(DEBUG_MODULES)
 
 LUAINTERFACE_OBJECTS = $(addsuffix .o, $(notdir $(basename $(LUAINTERFACE_SOURCES))))
-LUAC_OBJECTS = $(addsuffix .o, $(notdir $(basename $(LUAC_SOURCES) $(LUA_SOURCES))))
 DEBUG_OBJECTS = $(addsuffix .o, $(notdir $(basename $(DEBUG_SOURCES))))
 
 ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES))))
 ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES) $(DEBUG_SOURCES))))
 
-all: dep luac lua-interface
+all: dep lua-interface
 
-dist: luac lua-interface lua-interface-gl.$(SHARED_EXT)
+dist: lua-interface lua-interface-gl.$(SHARED_EXT)
 	mkdir -p ../lua-interface-dist
 	ln -sf lua-interface-mesa.$(SHARED_EXT) lua-interface.$(SHARED_EXT)
 	$(STRIP) $+
-	cp luac lua-interface lua-interface*.$(SHARED_EXT) ../lua-interface-dist
+	cp lua-interface lua-interface*.$(SHARED_EXT) ../lua-interface-dist
 
 dep: $(ALL_DEPS)
 
-luac: $(LUAC_OBJECTS)
-	$(LD) -o luac $(LUAC_OBJECTS) $(BASIC_LDFLAGS)
-
 lua-interface-mesa.$(SHARED_EXT): $(ALL_OBJECTS)
 	$(LD) $(SHARED_FLAGS) -o lua-interface.$(SHARED_EXT) $(ALL_OBJECTS) $(LDFLAGS) $(LDFLAGS_MESA)
 	mv lua-interface.$(SHARED_EXT) $@
@@ -262,7 +204,7 @@ lua-interface-dbg: $(ALL_OBJECTS) $(DEBUG_OBJECTS)
 	$(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) $(LDFLAGS_MESA) -locci -lclntsh
 
 clean:
-	rm -f lua-interface-mesa lua-interface-gl luac *.o *.dep *.so *.dylib
+	rm -f lua-interface-mesa lua-interface-gl *.o *.dep *.so *.dylib
 
 %.dep : %.c
 	$(CC) $(CPPFLAGS_NO_ARCH) -M -MF $@ $<
@@ -273,12 +215,9 @@ clean:
 %.dep : %.cc
 	$(CXX) $(CPPFLAGS_NO_ARCH) -M -MF $@ $<
 
-%.c : %.clua
+%.c : %.lua
 	bin2c $< $@ $(basename $@)
 
-%.clua : %.lua
-	./luac -o $@ $<
-
 gl-glue-i386.dep:
 	touch gl-glue-i386.dep