diff options
Diffstat (limited to 'build.lua')
-rwxr-xr-x | build.lua | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -27,7 +27,7 @@ runCommand = function (name, dir, command) | |||
27 | os.execute('cd ' .. dir .. '; ' .. command) | 27 | os.execute('cd ' .. dir .. '; ' .. command) |
28 | end | 28 | end |
29 | 29 | ||
30 | compileFiles = function (name, dir, files) | 30 | compileFiles = function (name, dir, files, extras) |
31 | local objects = '' | 31 | local objects = '' |
32 | print('\n' .. name) | 32 | print('\n' .. name) |
33 | for i, v in ipairs(files) do | 33 | for i, v in ipairs(files) do |
@@ -35,7 +35,7 @@ compileFiles = function (name, dir, files) | |||
35 | os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -c -o ' .. v .. '.o ' .. v .. '.c') | 35 | os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -c -o ' .. v .. '.o ' .. v .. '.c') |
36 | objects = objects .. ' ' .. v .. '.o' | 36 | objects = objects .. ' ' .. v .. '.o' |
37 | end | 37 | end |
38 | os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -o ' .. name .. ' ' .. objects .. ' ' .. LDFLAGS .. ' ' .. libs) | 38 | os.execute('cd ' .. dir .. '; gcc ' .. CFLAGS .. ' -o ' .. name .. ' ' .. objects .. ' ' .. extras .. ' ' .. LDFLAGS .. ' ' .. libs) |
39 | end | 39 | end |
40 | 40 | ||
41 | local buildSub = function (name, dir) | 41 | local buildSub = function (name, dir) |
@@ -88,7 +88,7 @@ if 'nil' == type(args) then | |||
88 | -- Building this passes my "holding breath" test, if it can compile while I'm holding my breath, no need for make files. | 88 | -- Building this passes my "holding breath" test, if it can compile while I'm holding my breath, no need for make files. |
89 | print('_______________ BUILDING lemon _______________') | 89 | print('_______________ BUILDING lemon _______________') |
90 | removeFiles('libraries/lemon', {'*.o', 'lemon'}) | 90 | removeFiles('libraries/lemon', {'*.o', 'lemon'}) |
91 | compileFiles('lemon', 'libraries/lemon', {'lemon'}) | 91 | compileFiles('lemon', 'libraries/lemon', {'lemon'}, '') |
92 | print('_______________ BUILDING Irrlicht _______________') | 92 | print('_______________ BUILDING Irrlicht _______________') |
93 | -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test. | 93 | -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test. |
94 | runCommand('Irrlicht','libraries/irrlicht-1.8.1/source/Irrlicht', 'make') | 94 | runCommand('Irrlicht','libraries/irrlicht-1.8.1/source/Irrlicht', 'make') |