diff options
| author | Alex Auvolat <alex@adnab.me> | 2016-07-15 22:45:41 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2016-07-15 22:45:41 +0200 |
| commit | ba4e59a1d687173ac5cfa74d26d71d6059dc6bc6 (patch) | |
| tree | b8cc1a9ec18bf706d761539b14dda2c9aaedb91e /src/bin/bam.lua | |
| parent | 7a1ea510a9fc43ccbc257601b149a90920332e13 (diff) | |
| download | kogata-ba4e59a1d687173ac5cfa74d26d71d6059dc6bc6.tar.gz kogata-ba4e59a1d687173ac5cfa74d26d71d6059dc6bc6.zip | |
Move stuff around
Diffstat (limited to 'src/bin/bam.lua')
| -rw-r--r-- | src/bin/bam.lua | 11 |
1 files changed, 7 insertions, 4 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}), } |