Move stuff around

21 files changed, 10 insertions, 8 deletions

diff --git a/src/bin/bam.lua b/src/bin/bam.lua
index 56b21fb..1a2d3a7 100644
--- a/src/bin/bam.lua
+++ b/src/bin/bam.lua
@@ -1,12 +1,15 @@
 local function bin_settings(name)
 	local s = TableDeepCopy(user_settings)
-	s.link.flags:Add("-T src/bin/linker.ld",
+	s.link.flags:Add("-T src/sysbin/linker.ld",
 					 "-Xlinker -Map=build/bin/" .. name .. ".map")
+	if name == 'lua' or name == 'luac' then
+		s.cc.includes:Add("src/lib/lua")
+	end
 	return s
 end
 
 local function bin_exe(name, moredeps)
-	local s = sysbin_settings(name)
+	local s = bin_settings(name)
 
 	local src = Collect('src/bin/' .. name .. '/*.c')
 	local obj = Compile(s, src)
@@ -15,6 +18,6 @@ local function bin_exe(name, moredeps)
 end
 
 bin = {
-	-- bin_exe('lua', {liblua, liblualib}),
-	-- bin_exe('luac', {liblua, liblualib}),
+	bin_exe('lua', {liblua}),
+	-- bin_exe('luac', {liblua}),
 }
diff --git a/src/lib/bam.lua b/src/lib/bam.lua
index 87d87b1..b8e51e4 100644
--- a/src/lib/bam.lua
+++ b/src/lib/bam.lua
@@ -6,4 +6,3 @@ end
 libkogata = {lib('libkogata'), common_libc, common_libalgo, common_libkogata}
 
 liblua = lib('lua')
-liblualib = lib('lualib')
diff --git a/src/lib/include/lua/lauxlib.h b/src/lib/include/lua/lauxlib.h
index dbb800e..5b71e16 120000
--- a/src/lib/include/lua/lauxlib.h
+++ b/src/lib/include/lua/lauxlib.h
@@ -1 +1 @@
-../../lualib/lauxlib.h
\ No newline at end of file
+../../lua/lauxlib.h
\ No newline at end of file
diff --git a/src/lib/include/lua/lua.hpp b/src/lib/include/lua/lua.hpp
index 22e5fad..d372a59 120000
--- a/src/lib/include/lua/lua.hpp
+++ b/src/lib/include/lua/lua.hpp
@@ -1 +1 @@
-../../lualib/lua.hpp
\ No newline at end of file
+../../lua/lua.hpp
\ No newline at end of file
diff --git a/src/lib/include/lua/lualib.h b/src/lib/include/lua/lualib.h
index 20094b8..6bf4536 120000
--- a/src/lib/include/lua/lualib.h
+++ b/src/lib/include/lua/lualib.h
@@ -1 +1 @@
-../../lualib/lualib.h
\ No newline at end of file
+../../lua/lualib.h
\ No newline at end of file
diff --git a/src/lib/lualib/lauxlib.c b/src/lib/lua/lauxlib.c
index bacf43b..bacf43b 100644
--- a/src/lib/lualib/lauxlib.c
+++ b/src/lib/lua/lauxlib.c
diff --git a/src/lib/lualib/lauxlib.h b/src/lib/lua/lauxlib.h
index ddb7c22..ddb7c22 100644
--- a/src/lib/lualib/lauxlib.h
+++ b/src/lib/lua/lauxlib.h
diff --git a/src/lib/lualib/lbaselib.c b/src/lib/lua/lbaselib.c
index d481c4e..d481c4e 100644
--- a/src/lib/lualib/lbaselib.c
+++ b/src/lib/lua/lbaselib.c
diff --git a/src/lib/lualib/lbitlib.c b/src/lib/lua/lbitlib.c
index 1cb1d5b..1cb1d5b 100644
--- a/src/lib/lualib/lbitlib.c
+++ b/src/lib/lua/lbitlib.c
diff --git a/src/lib/lualib/lcorolib.c b/src/lib/lua/lcorolib.c
index 2303429..2303429 100644
--- a/src/lib/lualib/lcorolib.c
+++ b/src/lib/lua/lcorolib.c
diff --git a/src/lib/lualib/ldblib.c b/src/lib/lua/ldblib.c
index 786f6cd..786f6cd 100644
--- a/src/lib/lualib/ldblib.c
+++ b/src/lib/lua/ldblib.c
diff --git a/src/lib/lualib/linit.c b/src/lib/lua/linit.c
index 8ce94cc..8ce94cc 100644
--- a/src/lib/lualib/linit.c
+++ b/src/lib/lua/linit.c
diff --git a/src/lib/lualib/liolib.c b/src/lib/lua/liolib.c
index aa78e59..aa78e59 100644
--- a/src/lib/lualib/liolib.c
+++ b/src/lib/lua/liolib.c
diff --git a/src/lib/lualib/lmathlib.c b/src/lib/lua/lmathlib.c
index 94815f1..94815f1 100644
--- a/src/lib/lualib/lmathlib.c
+++ b/src/lib/lua/lmathlib.c
diff --git a/src/lib/lualib/loadlib.c b/src/lib/lua/loadlib.c
index 7911928..7911928 100644
--- a/src/lib/lualib/loadlib.c
+++ b/src/lib/lua/loadlib.c
diff --git a/src/lib/lualib/loslib.c b/src/lib/lua/loslib.c
index 4810655..4810655 100644
--- a/src/lib/lualib/loslib.c
+++ b/src/lib/lua/loslib.c
diff --git a/src/lib/lualib/lstrlib.c b/src/lib/lua/lstrlib.c
index 12264f8..12264f8 100644
--- a/src/lib/lualib/lstrlib.c
+++ b/src/lib/lua/lstrlib.c
diff --git a/src/lib/lualib/ltablib.c b/src/lib/lua/ltablib.c
index 98b2f87..98b2f87 100644
--- a/src/lib/lualib/ltablib.c
+++ b/src/lib/lua/ltablib.c
diff --git a/src/lib/lualib/lua.hpp b/src/lib/lua/lua.hpp
index ec417f5..ec417f5 100644
--- a/src/lib/lualib/lua.hpp
+++ b/src/lib/lua/lua.hpp
diff --git a/src/lib/lualib/lualib.h b/src/lib/lua/lualib.h
index 5165c0f..5165c0f 100644
--- a/src/lib/lualib/lualib.h
+++ b/src/lib/lua/lualib.h
diff --git a/src/lib/lualib/lutf8lib.c b/src/lib/lua/lutf8lib.c
index 9042582..9042582 100644
--- a/src/lib/lualib/lutf8lib.c
+++ b/src/lib/lua/lutf8lib.c