aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2016-07-15 19:20:08 +0200
committerAlex Auvolat <alex@adnab.me>2016-07-15 19:20:08 +0200
commit327d62f7d56f79999cac6407bdfdcc0b90510aef (patch)
treea81070cfaabb4f5d53f8d2099dfe9943bf319d52 /res
parent2f13288a23da4dfaf6c40e1e943f83d8fa43145a (diff)
downloadkogata-327d62f7d56f79999cac6407bdfdcc0b90510aef.tar.gz
kogata-327d62f7d56f79999cac6407bdfdcc0b90510aef.zip
cppcheck integration ; not much
Diffstat (limited to 'res')
-rw-r--r--res/fonts/bam.lua6
-rw-r--r--res/keymaps/bam.lua4
2 files changed, 5 insertions, 5 deletions
diff --git a/res/fonts/bam.lua b/res/fonts/bam.lua
index 1f99169..04974c4 100644
--- a/res/fonts/bam.lua
+++ b/res/fonts/bam.lua
@@ -1,7 +1,7 @@
fonts = {}
for _, file in pairs(Collect('res/fonts/*.s')) do
- local out = PathJoin('build', PathBase(file) .. '.bf')
+ local out = BuildOutput(host_settings, PathBase(file)) .. '.bf'
AddJob(out, "nasm font " .. out, "nasm -o " .. out .. " " .. file)
AddDependency(out, file)
table.insert(fonts, out)
@@ -9,10 +9,10 @@ end
for _, file in pairs(Collect('res/fonts/*.c')) do
local obj = Compile(host_settings, file)
- local tgt = PathJoin('build', PathBase(file) .. '_tmp')
+ local tgt = BuildOutput(host_settings, PathBase(file) .. '_tmp')
local bin = Link(host_settings, tgt, obj)
- local out = PathJoin('build', PathBase(file) .. '.bf')
+ local out = BuildOutput(host_settings, PathBase(file)) .. '.bf'
AddJob(out, "call font " .. bin, "./" .. bin .. " > " .. out)
AddDependency(out, bin)
table.insert(fonts, out)
diff --git a/res/keymaps/bam.lua b/res/keymaps/bam.lua
index f078dd0..0657abc 100644
--- a/res/keymaps/bam.lua
+++ b/res/keymaps/bam.lua
@@ -2,10 +2,10 @@ keymaps = {}
for _, file in pairs(Collect('res/keymaps/*.c')) do
local obj = Compile(host_settings, file)
- local tgt = PathJoin('build', PathBase(file) .. '_tmp')
+ local tgt = BuildOutput(host_settings, PathBase(file) .. '_tmp')
local bin = Link(host_settings, tgt, obj)
- local out = PathJoin('build', PathBase(file) .. '.km')
+ local out = BuildOutput(host_settings, PathBase(file)) .. '.km'
AddJob(out, "call font " .. bin, "./" .. bin .. " > " .. out)
AddDependency(out, bin)
table.insert(keymaps, out)