diff options
author | David Walter Seikel | 2014-04-21 20:40:05 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-21 20:40:05 +1000 |
commit | e75c2c6233939d50a98c548a9f5bf1b7a58cf578 (patch) | |
tree | e8c12ef9718ae860b6107484c50148340b643c1e | |
parent | Kill more excess EFL logging. (diff) | |
download | SledjHamr-e75c2c6233939d50a98c548a9f5bf1b7a58cf578.zip SledjHamr-e75c2c6233939d50a98c548a9f5bf1b7a58cf578.tar.gz SledjHamr-e75c2c6233939d50a98c548a9f5bf1b7a58cf578.tar.bz2 SledjHamr-e75c2c6233939d50a98c548a9f5bf1b7a58cf578.tar.xz |
Use rpath to tell programs where to find our libraries.
Diffstat (limited to '')
-rwxr-xr-x | ClientHamr/GuiLua/test.sh | 2 | ||||
-rwxr-xr-x | build.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ClientHamr/GuiLua/test.sh b/ClientHamr/GuiLua/test.sh index 93a4afb..1effdb3 100755 --- a/ClientHamr/GuiLua/test.sh +++ b/ClientHamr/GuiLua/test.sh | |||
@@ -1,3 +1,3 @@ | |||
1 | #! /bin/bash | 1 | #! /bin/bash |
2 | 2 | ||
3 | export LD_LIBRARY_PATH=".:../../libraries"; ./skang -l test -foo "argy bargy" | 3 | ./skang -l test -foo "argy bargy" |
@@ -77,7 +77,7 @@ CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. baseDir .. '\\"' | |||
77 | CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS | 77 | CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS |
78 | 78 | ||
79 | 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' |
80 | libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm' | 80 | libs = '-lLumbrJack -lRunnr ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lpthread -lm -Wl,-rpath,' .. baseDir .. '/libraries' |
81 | LFLAGS = '-d' | 81 | LFLAGS = '-d' |
82 | EDJE_FLAGS = '-id ' .. baseDir .. '/images -fd ' .. baseDir .. '/fonts' | 82 | EDJE_FLAGS = '-id ' .. baseDir .. '/images -fd ' .. baseDir .. '/fonts' |
83 | 83 | ||