From 5e72c583353bda794e47904fc3dda83a4bceb309 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 31 Jul 2014 11:20:44 +1000 Subject: Move lemon building to be part of LuaSL building. --- build.lua | 2 -- src/LuaSL/build.lua | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.lua b/build.lua index 6a4af7c..dc89b11 100755 --- a/build.lua +++ b/build.lua @@ -83,8 +83,6 @@ EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media' if 'nil' == type(args) then -- Building this passes my "holding breath" test, if it can compile while I'm holding my breath, no need for make files. - print('_______________ BUILDING lemon _______________') - compileFiles('lemon', 'libraries/lemon', {'lemon'}, '') -- print('_______________ BUILDING Irrlicht _______________') -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test. diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua index 847fba7..8a917c0 100755 --- a/src/LuaSL/build.lua +++ b/src/LuaSL/build.lua @@ -16,7 +16,8 @@ end removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) --- Run lemon first, flex depends on it to define the symbol values. +-- Build and run lemon first, flex depends on it to define the symbol values. +compileFiles('lemon', dir .. '/../../libraries/lemon', {'lemon'}, '') runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') -- cgit v1.1