summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Renner Berthing <esmil@mailme.dk>2012-01-25 21:17:14 +0100
committerEmil Renner Berthing <esmil@mailme.dk>2012-01-25 21:20:11 +0100
commit2b11fcb537f92a2d024f07712a9631ea31667b5e (patch)
tree2027facea037beed7709e5e4ed876368be09914d
parent330ae97d985283da8b50204742f2adf61c160713 (diff)
downloadlem-2b11fcb537f92a2d024f07712a9631ea31667b5e.tar.gz
lem-2b11fcb537f92a2d024f07712a9631ea31667b5e.tar.xz
lem-2b11fcb537f92a2d024f07712a9631ea31667b5e.zip
compile Lua amalgamated
-rw-r--r--Makefile13
-rw-r--r--lua.c52
2 files changed, 59 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 659bc97..5eb6e37 100644
--- a/Makefile
+++ b/Makefile
@@ -37,12 +37,13 @@ CFLAGS += -Ilua -DLUA_USE_LINUX -DLUA_ROOT='"$(PREFIX)/"'
headers += lua/luaconf.h lua/lua.h lua/lauxlib.h
# From lua/Makefile
-CORE_O = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
- ltm.o lundump.o lvm.o lzio.o
-LIB_O = lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
- lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o
-objects += $(CORE_O:%=lua/%) $(LIB_O:%=lua/%)
+#CORE_O = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+# lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+# ltm.o lundump.o lvm.o lzio.o
+#LIB_O = lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
+# lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o
+#objects += $(CORE_O:%=lua/%) $(LIB_O:%=lua/%)
+objects += lua.o
LUA_PATH = $(PREFIX)/share/lua/5.2
LUA_CPATH = $(PREFIX)/lib/lua/5.2
diff --git a/lua.c b/lua.c
new file mode 100644
index 0000000..442741c
--- /dev/null
+++ b/lua.c
@@ -0,0 +1,52 @@
+/* setup for luaconf.h */
+#define LUA_CORE
+#define LUA_LIB
+#define ltable_c
+#define lvm_c
+#include "luaconf.h"
+
+/* do not export internal symbols */
+#undef LUAI_FUNC
+#undef LUAI_DDEC
+#undef LUAI_DDEF
+#define LUAI_FUNC static
+#define LUAI_DDEC static
+#define LUAI_DDEF static
+
+/* core -- used by all */
+#include "lua/lapi.c"
+#include "lua/lcode.c"
+#include "lua/lctype.c"
+#include "lua/ldebug.c"
+#include "lua/ldo.c"
+#include "lua/ldump.c"
+#include "lua/lfunc.c"
+#include "lua/lgc.c"
+#include "lua/llex.c"
+#include "lua/lmem.c"
+#include "lua/lobject.c"
+#include "lua/lopcodes.c"
+#include "lua/lparser.c"
+#include "lua/lstate.c"
+#include "lua/lstring.c"
+#include "lua/ltable.c"
+#include "lua/ltm.c"
+#include "lua/lundump.c"
+#include "lua/lvm.c"
+#include "lua/lzio.c"
+
+/* auxiliary library -- used by all */
+#include "lua/lauxlib.c"
+
+/* standard library -- not used by luac */
+#include "lua/lbaselib.c"
+#include "lua/lbitlib.c"
+#include "lua/lcorolib.c"
+#include "lua/ldblib.c"
+#include "lua/liolib.c"
+#include "lua/lmathlib.c"
+#include "lua/loadlib.c"
+#include "lua/loslib.c"
+#include "lua/lstrlib.c"
+#include "lua/ltablib.c"
+#include "lua/linit.c"