aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-07-31 11:20:44 +1000
committerDavid Walter Seikel2014-07-31 11:20:44 +1000
commit5e72c583353bda794e47904fc3dda83a4bceb309 (patch)
tree10a2e291713d6f461dcb97efeb1bfecdf3ff778d
parentOops, left this out of the last commit. (diff)
downloadSledjHamr-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-xbuild.lua2
-rwxr-xr-xsrc/LuaSL/build.lua3
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'
83 83
84if 'nil' == type(args) then 84if '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
17removeFiles(dir, {'*.output', '*.backup', 'LuaSL_lexer.h', 'LuaSL_lexer.c', 'LuaSL_lemon_yaccer.h', 'LuaSL_lemon_yaccer.c', 'LuaSL_lemon_yaccer.out'}) 17removeFiles(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.
20compileFiles('lemon', dir .. '/../../libraries/lemon', {'lemon'}, '')
20runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y') 21runCommand('lemon', dir, '../../libraries/lemon/lemon -s -T../../libraries/lemon/lempar.c LuaSL_lemon_yaccer.y')
21runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l') 22runCommand('flex', dir, 'flex -C --outfile=LuaSL_lexer.c --header-file=LuaSL_lexer.h LuaSL_lexer.l')
22compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') 23compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')