diff options
| author | David Walter Seikel | 2014-07-31 11:19:42 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2014-07-31 11:19:42 +1000 |
| commit | ad814a58d8b5bc1958861d3debea1a1816651905 (patch) | |
| tree | e35901fa5ccf224dd79e382c3d00d1fc3f0a6bed | |
| parent | Move entirely over to luajit. (diff) | |
| download | SledjHamr-ad814a58d8b5bc1958861d3debea1a1816651905.zip SledjHamr-ad814a58d8b5bc1958861d3debea1a1816651905.tar.gz SledjHamr-ad814a58d8b5bc1958861d3debea1a1816651905.tar.bz2 SledjHamr-ad814a58d8b5bc1958861d3debea1a1816651905.tar.xz | |
Stop building in Irrlicht, but keep it around in case Evas_3D isn't good enough.
| -rwxr-xr-x | src/extantz/build.lua | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/extantz/build.lua b/src/extantz/build.lua index 1275b0a..7708126 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua | |||
| @@ -13,15 +13,19 @@ if 'nil' == type(dir) then | |||
| 13 | dir = workingDir | 13 | dir = workingDir |
| 14 | end | 14 | end |
| 15 | 15 | ||
| 16 | CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' | 16 | --CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' |
| 17 | LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | 17 | --LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' |
| 18 | libs = libs .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua' | 18 | --libs = libs .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua' |
| 19 | CFLAGS = CFLAGS .. ' -I/usr/X11R6/include -I../GuiLua' | ||
| 20 | libs = libs .. ' -lephysics -lGuiLua' | ||
| 19 | 21 | ||
| 20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'}) | 22 | --removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', '../../media/extantz.edj'}) |
| 23 | removeFiles(dir, {'../../media/extantz.edj'}) | ||
| 21 | 24 | ||
| 22 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') | 25 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') |
| 23 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) | 26 | --runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) |
| 24 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) | 27 | --runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) |
| 25 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) | 28 | --runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) |
| 26 | CFLAGS = CFLAGS .. ' -Wl,-export-dynamic' | 29 | CFLAGS = CFLAGS .. ' -Wl,-export-dynamic' |
| 27 | compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o') | 30 | --compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o') |
| 31 | compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'files', 'scenri', 'woMan', 'extantz'}, '') | ||