diff options
Diffstat (limited to '')
-rwxr-xr-x | build.lua | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -81,17 +81,19 @@ locale_d = baseDir .. '/locale' | |||
81 | CFLAGOPTS = readCommand('echo "$CFLAGOPTS"') | 81 | CFLAGOPTS = readCommand('echo "$CFLAGOPTS"') |
82 | 82 | ||
83 | -- Make sure any old servers are killed off. | 83 | -- Make sure any old servers are killed off. |
84 | os.execute(baseDir .. '/bin//killem.sh') | 84 | os.execute(baseDir .. '/bin/killem.sh') |
85 | 85 | ||
86 | CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries' | 86 | CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries' |
87 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit') | 87 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit') |
88 | --CFLAGS = CFLAGS .. ' ' .. '-I ' .. baseDir .. '/include/luajit-2.0' | ||
88 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary') | 89 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary') |
89 | CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS | 90 | CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS |
90 | 91 | ||
91 | LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') | 92 | --LDFLAGS = '-L ' .. baseDir .. '/lib ' |
93 | LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') .. ' ' | ||
92 | libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl' | 94 | libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl' |
93 | LFLAGS = '-d' | 95 | LFLAGS = '-d' |
94 | EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media' | 96 | EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media/fonts' |
95 | 97 | ||
96 | 98 | ||
97 | if 'nil' == type(args) then | 99 | if 'nil' == type(args) then |