From a70a0e9c78b57d27ca00e7559dbbbd1216f017bf Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 21 Jul 2016 20:28:29 +1000
Subject: Update Lua building stuff.

---
 build.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'build.lua')

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'
 CFLAGOPTS = readCommand('echo "$CFLAGOPTS"')
 
 -- Make sure any old servers are killed off.
-os.execute(baseDir .. '/bin//killem.sh')
+os.execute(baseDir .. '/bin/killem.sh')
 
 CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries'
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit')
+--CFLAGS = CFLAGS .. ' ' .. '-I ' .. baseDir .. '/include/luajit-2.0'
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary')
 CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
 
-LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit')
+--LDFLAGS = '-L ' .. baseDir .. '/lib '
+LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') .. ' '
 libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl'
 LFLAGS = '-d'
-EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media'
+EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media/fonts'
 
 
 if 'nil' == type(args) then
-- 
cgit v1.1