1 files changed, 11 insertions, 76 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32
index 1827667..05916ed 100644
--- a/Makefile.mingw32
+++ b/Makefile.mingw32
@@ -33,7 +33,7 @@ endif
 INCLUDES = \
 -I../mogltk/include \
 -I../Baltisot/include \
--I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \
+-I../LuaJIT/src \
 -I../lua-modules/src \
 -I../Baltisot/MSVC/iconv -I../Baltisot/MSVC/regex -I../Baltisot/MSVC \
 -I../Mesa-7.0.3-mingw32/include \
@@ -53,9 +53,9 @@ LIBS += -L../gnuwin32/lib ../libreadline-static.a -lz.dll -lucl.dll -lwsock32 -l
 
 IUP_LIBS = -lole32 -lcomctl32 -lgdi32 -lcomdlg32
 
-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:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex
-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:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex
-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:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex
+vpath %.c ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex
+vpath %.cc ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex
+vpath %.cpp ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex
 vpath %.lua ../Baltisot/lib:../Baltisot/src
 
 LUAINTERFACE_SOURCES = \
@@ -129,65 +129,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 \
-\
-iconv.c \
-localcharset.c \
-relocatable.c \
-\
-fileutils.cc \
-generic.cc \
-checkargs.c \
-datecalc.c \
-
 LUAINTERFACE_LIGHT_SOURCES = \
 plugin-luaconfigfiles.cc \
 plugin-luahandle.cc \
@@ -198,6 +139,7 @@ plugin-luaregex.cc \
 plugin-luasmtp.cc \
 plugin-luatask.cc \
 plugin-luaxml.cc \
+plugin-luaiup.cc \
 LuaConfigFile.cc \
 tinystr.cpp \
 tinyxml.cpp \
@@ -220,26 +162,22 @@ lua-plugin.cc \
 WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUA_SOURCES) $(LUAINTERFACE_SOURCES)
 
 LUAINTERFACE_OBJECTS = $(addsuffix .o, $(notdir $(basename $(LUAINTERFACE_SOURCES))))
-LUAINTERFACE_MAIN_OBJECTS = $(addsuffix .o, $(notdir $(basename $(LUAINTERFACE_MAIN_SOURCES) $(LUA_SOURCES))))
+LUAINTERFACE_MAIN_OBJECTS = $(addsuffix .o, $(notdir $(basename $(LUAINTERFACE_MAIN_SOURCES))))
 LUAINTERFACE_DLL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(BALTISOT_SOURCES))))
-LUAINTERFACE_LIGHT_OBJECTS = lua-interface-light.o $(addsuffix .o, $(notdir $(basename $(LUAINTERFACE_LIGHT_SOURCES) $(LUA_SOURCES))))
-LUAC_OBJECTS = $(addsuffix .o, $(notdir $(basename $(LUAC_SOURCES) $(LUA_SOURCES))))
+LUAINTERFACE_LIGHT_OBJECTS = lua-interface-light.o $(addsuffix .o, $(notdir $(basename $(LUAINTERFACE_LIGHT_SOURCES))))
 
 ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES))))
 ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES))))
 
-all: dep luac.exe lua-interface.dll lua-interface.exe
+all: dep lua-interface.dll lua-interface.exe
 
 dist: all
 	mkdir -p ../lua-interface-dist-win32
 	$(STRIP) luac.exe lua-interface.dll lua-interface.exe
-	cp luac.exe lua-interface.dll lua-interface.exe ../lua-interface-dist-win32
+	cp lua-interface.dll lua-interface.exe ../lua-interface-dist-win32
 
 dep: $(ALL_DEPS)
 
-luac.exe: $(LUAC_OBJECTS)
-	$(LD) -o luac.exe $(LUAC_OBJECTS) $(LDFLAGS) $(LIBS)
-
 lua-interface.dll: $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_MAIN_OBJECTS)
 	$(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_MAIN_OBJECTS) $(LDFLAGS) $(LUAINTERFACE_LDFLAGS) $(LIBS)
 
@@ -260,7 +198,7 @@ lua-interface-res.o: src/lua-interface.rc src/lua-interface.manifest src/lua.ico
 	$(WINDRES) -o lua-interface-res.o src/lua-interface.rc
 
 clean:
-	rm -f lua-interface.dll lua-interface.exe lua-interface-light.exe luac.exe *.o *.dep *.a *.def
+	rm -f lua-interface.dll lua-interface.exe lua-interface-light.exe *.o *.dep *.a *.def
 
 %.dep : %.c
 	$(CC) $(CPPFLAGS) -M -MF $@ $<
@@ -271,10 +209,7 @@ clean:
 %.dep : %.cc
 	$(CXX) $(CPPFLAGS) -M -MF $@ $<
 
-%.c : %.clua
+%.c : %.lua
 	bin2c $< $@ $(basename $@)
 
-%.clua : %.lua
-	./luac -o $@ $<
-
 -include $(ALL_DEPS)