aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/build.lua
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-07-21 20:28:29 +1000
committerDavid Walter Seikel2016-07-21 20:28:29 +1000
commita70a0e9c78b57d27ca00e7559dbbbd1216f017bf (patch)
tree6b4deb6d67df585e0c96b00a65220ac795376c3f /build.lua
parentAdd script for building Lua (LuaJIT actually) (diff)
downloadSledjHamr-a70a0e9c78b57d27ca00e7559dbbbd1216f017bf.zip
SledjHamr-a70a0e9c78b57d27ca00e7559dbbbd1216f017bf.tar.gz
SledjHamr-a70a0e9c78b57d27ca00e7559dbbbd1216f017bf.tar.bz2
SledjHamr-a70a0e9c78b57d27ca00e7559dbbbd1216f017bf.tar.xz
Update Lua building stuff.
Diffstat (limited to '')
-rwxr-xr-xbuild.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/build.lua b/build.lua
index 3c29f2a..ed5964e 100755
--- a/build.lua
+++ b/build.lua
@@ -81,17 +81,19 @@ locale_d = baseDir .. '/locale'
81CFLAGOPTS = readCommand('echo "$CFLAGOPTS"') 81CFLAGOPTS = readCommand('echo "$CFLAGOPTS"')
82 82
83-- Make sure any old servers are killed off. 83-- Make sure any old servers are killed off.
84os.execute(baseDir .. '/bin//killem.sh') 84os.execute(baseDir .. '/bin/killem.sh')
85 85
86CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries' 86CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries'
87CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit') 87CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit')
88--CFLAGS = CFLAGS .. ' ' .. '-I ' .. baseDir .. '/include/luajit-2.0'
88CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary') 89CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary')
89CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS 90CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
90 91
91LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') 92--LDFLAGS = '-L ' .. baseDir .. '/lib '
93LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') .. ' '
92libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl' 94libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl'
93LFLAGS = '-d' 95LFLAGS = '-d'
94EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media' 96EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media/fonts'
95 97
96 98
97if 'nil' == type(args) then 99if 'nil' == type(args) then