From 650a6bdd3b0f8e5b1db7505dde784b238679d2c2 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Wed, 17 Jul 2019 09:27:44 -0700 Subject: kbd: Update to 2.1.0 --- pkg/kbd/gen.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkg/kbd/gen.lua') diff --git a/pkg/kbd/gen.lua b/pkg/kbd/gen.lua index 28c52b1f..9ac5a10e 100644 --- a/pkg/kbd/gen.lua +++ b/pkg/kbd/gen.lua @@ -3,19 +3,20 @@ cflags{ '-I $dir', '-I $srcdir', '-I $srcdir/src', + '-I $srcdir/src/libcommon', + '-I $srcdir/src/libkbdfile', '-I $srcdir/src/libkeymap', '-I $srcdir/src/libkeymap/keymap', } -lib('libcommon.a', 'src/(getfd.c xmalloc.c kbd_error.c version.c)') -lib('libfont.a', 'src/(kdfontop.c kdmapop.c loadunimap.c psffontop.c utf8.c)') +lib('libcommon.a', 'src/libcommon/(getfd.c error.c version.c xmalloc.c)') +lib('libkbdfile.a', 'src/libkbdfile/(init.c kbdfile.c)') lib('libkeymap.a', [[src/libkeymap/( analyze.c array.c common.c diacr.c dump.c - findfile.c func.c kernel.c kmap.c @@ -25,6 +26,7 @@ lib('libkeymap.a', [[src/libkeymap/( parser.c summary.c )]]) +lib('libfont.a', 'src/(kdfontop.c kdmapop.c loadunimap.c psffontop.c utf8.c)') -- old: loadunimap mapscrn -- optional: clrunmap getunimap setlogcons setvesablank setpalette screendump @@ -35,7 +37,7 @@ local function x(cmd, section, subst, srcs) if not srcs then srcs = 'src/'..cmd..'.c' end - exe(cmd, {srcs, 'libcommon.a', 'libfont.a', 'libkeymap.a'}) + exe(cmd, {srcs, 'libcommon.a', 'libfont.a', 'libkeymap.a', 'libkbdfile.a'}) file('bin/'..cmd, '755', '$outdir/'..cmd) if not section then return -- cgit v1.2.3