diff options
author | David Walter Seikel | 2014-07-31 11:20:44 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-07-31 11:20:44 +1000 |
commit | 5e72c583353bda794e47904fc3dda83a4bceb309 (patch) | |
tree | 10a2e291713d6f461dcb97efeb1bfecdf3ff778d | |
parent | Oops, left this out of the last commit. (diff) | |
download | SledjHamr-5e72c583353bda794e47904fc3dda83a4bceb309.zip SledjHamr-5e72c583353bda794e47904fc3dda83a4bceb309.tar.gz SledjHamr-5e72c583353bda794e47904fc3dda83a4bceb309.tar.bz2 SledjHamr-5e72c583353bda794e47904fc3dda83a4bceb309.tar.xz |
Move lemon building to be part of LuaSL building.
-rwxr-xr-x | build.lua | 2 | ||||
-rwxr-xr-x | src/LuaSL/build.lua | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -83,8 +83,6 @@ EDJE_FLAGS = '-id ' .. baseDir .. '/media -fd ' .. baseDir .. '/media' | |||
83 | 83 | ||
84 | if 'nil' == type(args) then | 84 | if 'nil' == type(args) then |
85 | -- Building this passes my "holding breath" test, if it can compile while I'm holding my breath, no need for make files. | 85 | -- Building this passes my "holding breath" test, if it can compile while I'm holding my breath, no need for make files. |
86 | print('_______________ BUILDING lemon _______________') | ||
87 | compileFiles('lemon', 'libraries/lemon', {'lemon'}, '') | ||
88 | 86 | ||
89 | -- print('_______________ BUILDING Irrlicht _______________') | 87 | -- print('_______________ BUILDING Irrlicht _______________') |
90 | -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test. | 88 | -- 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 | |||
16 | 16 | ||
17 | removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) | 17 | removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) |
18 | 18 | ||
19 | -- Run lemon first, flex depends on it to define the symbol values. | 19 | -- Build and run lemon first, flex depends on it to define the symbol values. |
20 | compileFiles('lemon', dir .. '/../../libraries/lemon', {'lemon'}, '') | ||
20 | runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') | 21 | runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') |
21 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') | 22 | runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') |
22 | compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') | 23 | compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') |