summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorLauri Leukkunen <lleukkun@leka.rahina.org>2006-08-05 01:31:05 +0300
committerLauri Leukkunen <lleukkun@leka.rahina.org>2006-08-05 01:31:05 +0300
commit22e066bd6575610fc7aa4345568f8ebf2be2172a (patch)
tree6f4a0b1f7ab53215f9f9fc4f2136de26c60aee97 /lua
parent6d3bd6ab21b53af8b9b43f36f63b63cceb053927 (diff)
fix linking and remove SConscript files
Diffstat (limited to 'lua')
-rw-r--r--lua/Makefile3
-rw-r--r--lua/SConscript22
2 files changed, 2 insertions, 23 deletions
diff --git a/lua/Makefile b/lua/Makefile
index 43bac78..a68012a 100644
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -1,7 +1,8 @@
CFLAGS += -fPIC -Wall -W
+CFLAGS += -I./lua-5.1/src
export CFLAGS
source_list := $(shell find ./lua-5.1/src -name "*.c" -not -name "lua.c" -not -name "luac.c" -not -name "print.c")
-obj-default = $(source_list:.c=.o)
+obj-default = $(source_list:.c=.o) lua_bindings.o
diff --git a/lua/SConscript b/lua/SConscript
deleted file mode 100644
index 404a10e..0000000
--- a/lua/SConscript
+++ /dev/null
@@ -1,22 +0,0 @@
-import glob
-
-Import('env')
-
-lualib_env = env.Copy()
-
-lualib_src = glob.glob("lua-5.1/src/*.c")
-
-# remove unwanted compiler and interpreter files
-lualib_src.remove("lua-5.1/src/lua.c")
-lualib_src.remove("lua-5.1/src/luac.c")
-lualib_src.remove("lua-5.1/src/print.c")
-
-lualib_env.StaticLibrary("liblua", lualib_src)
-
-lua_env = env.Copy()
-
-lua_env.Append(LIBS = "lua")
-lua_env.Append(LIBPATH = ".")
-lua_env.Append(CCFLAGS = " -I./lua/lua-5.1/src")
-lua_env.StaticLibrary("lua_bindings", ["lua_bindings.c"])
-