Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Mar 2015 19:13:55 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r280708 - projects/lua-bootloader/sys/boot/i386/loader
Message-ID:  <201503261913.t2QJDtTM037940@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rpaulo
Date: Thu Mar 26 19:13:54 2015
New Revision: 280708
URL: https://svnweb.freebsd.org/changeset/base/280708

Log:
  i386/loader: add the necessary glue for lua.

Modified:
  projects/lua-bootloader/sys/boot/i386/loader/Makefile

Modified: projects/lua-bootloader/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/lua-bootloader/sys/boot/i386/loader/Makefile	Thu Mar 26 18:51:00 2015	(r280707)
+++ projects/lua-bootloader/sys/boot/i386/loader/Makefile	Thu Mar 26 19:13:54 2015	(r280708)
@@ -50,6 +50,8 @@ LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
 
 .if ${MK_LUA} != "no"
 BOOT_LUA=	yes
+CFLAGS+=	-DBOOT_LUA -I${.CURDIR}/../../../contrib/lua
+CFLAGS+=	-I${.CURDIR}/../../liblua
 .if ${MACHINE_CPUARCH} == "amd64"
 LIBLUA=		${.OBJDIR}/../../liblua32/liblua.a
 .else
@@ -130,6 +132,8 @@ FILES+= menu.rc
 .endif
 .endif
 .if defined(BOOT_LUA)
+# 'forth' is included just for loader.conf.
+.PATH: ${.CURDIR}/../../forth ${.CURDIR}/../../lua
 FILES+=	config.lua core.lua drawer.lua password.lua screen.lua
 .if !exists(${DESTDIR}/boot/loader.lua)
 FILES+=	loader.lua



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503261913.t2QJDtTM037940>