From 808dc157f913fb8f8d1e7a04833c26bf00bba1ab Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Fri, 2 May 2014 15:21:11 +1000 Subject: Split up extantz. --- build.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build.lua') diff --git a/build.lua b/build.lua index 414ebfa..359dbe8 100755 --- a/build.lua +++ b/build.lua @@ -27,7 +27,7 @@ runCommand = function (name, dir, command) os.execute('cd ' .. dir .. '; ' .. command) end -compileFiles = function (name, dir, files) +compileFiles = function (name, dir, files, extras) local objects = '' print('\n' .. name) for i, v in ipairs(files) do @@ -35,7 +35,7 @@ compileFiles = function (name, dir, files) os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -c -o ' .. v .. '.o ' .. v .. '.c') objects = objects .. ' ' .. v .. '.o' end - os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -o ' .. name .. ' ' .. objects .. ' ' .. LDFLAGS .. ' ' .. libs) + os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -o ' .. name .. ' ' .. objects .. ' ' .. extras .. ' ' .. LDFLAGS .. ' ' .. libs) end local buildSub = function (name, dir) @@ -88,7 +88,7 @@ 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 _______________') removeFiles('libraries/lemon', {'*.o', 'lemon'}) - compileFiles('lemon', 'libraries/lemon', {'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. runCommand('Irrlicht','libraries/irrlicht-1.8.1/source/Irrlicht', 'make') -- cgit v1.1