diff options
author | David Walter Seikel | 2014-04-21 18:59:33 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-21 18:59:33 +1000 |
commit | 6099a79ef6397ca80cc892fecbfe7faf5b49cb00 (patch) | |
tree | fcfa1ca724cf5e68deddc808ed965ac68c4c4071 /build.lua | |
parent | Convert LuaSL to use LumbrJack. (diff) | |
download | SledjHamr-6099a79ef6397ca80cc892fecbfe7faf5b49cb00.zip SledjHamr-6099a79ef6397ca80cc892fecbfe7faf5b49cb00.tar.gz SledjHamr-6099a79ef6397ca80cc892fecbfe7faf5b49cb00.tar.bz2 SledjHamr-6099a79ef6397ca80cc892fecbfe7faf5b49cb00.tar.xz |
Move images to the base directory, and point all the special EFL directories to the base.
Diffstat (limited to '')
-rwxr-xr-x | build.lua | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -71,18 +71,15 @@ CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-evas') | |||
71 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-file') | 71 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'ecore-file') |
72 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'edje') | 72 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'edje') |
73 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary') | 73 | CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary') |
74 | -- TODO - The workingDir part of these strings gets set differently depending on who starts the build. | 74 | CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"' .. baseDir .. '\\"' |
75 | -- Which is a problem for the PACKAGE_*_DIR defines. | 75 | CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. baseDir .. '\\"' |
76 | -- On the other hand, that part needs to be rethought anyway, coz otherwise they are locked to the build place. | 76 | CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. baseDir .. '\\"' |
77 | CFLAGS = CFLAGS .. ' -DPACKAGE_BIN_DIR=\\"' .. workingDir .. '\\"' | ||
78 | CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. workingDir .. '\\"' | ||
79 | CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. workingDir .. '\\"' | ||
80 | CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS | 77 | CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS |
81 | 78 | ||
82 | LDFLAGS = '-L ' .. baseDir .. '/libraries ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib' | 79 | LDFLAGS = '-L ' .. baseDir .. '/libraries ' .. pkgConfig('libs-only-L', 'luajit') .. ' -L /usr/lib -L /lib' |
83 | libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm' | 80 | libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm' |
84 | LFLAGS = '-d' | 81 | LFLAGS = '-d' |
85 | EDJE_FLAGS = '-id images -fd fonts' | 82 | EDJE_FLAGS = '-id ' .. baseDir .. '/images -fd ' .. baseDir .. '/fonts' |
86 | 83 | ||
87 | 84 | ||
88 | if 'nil' == type(args) then | 85 | if 'nil' == type(args) then |