diff options
author | David Walter Seikel | 2014-04-21 17:53:25 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-04-21 17:53:25 +1000 |
commit | e9447ecc19114cee9550c7aaea89a4d3de3cfa3f (patch) | |
tree | 8f99cefa904c2ee80ac83abea394a54cf51bea0b /libraries | |
parent | Added LumbrJack (logging) and Runnr (Lua function / script runner). (diff) | |
download | SledjHamr-e9447ecc19114cee9550c7aaea89a4d3de3cfa3f.zip SledjHamr-e9447ecc19114cee9550c7aaea89a4d3de3cfa3f.tar.gz SledjHamr-e9447ecc19114cee9550c7aaea89a4d3de3cfa3f.tar.bz2 SledjHamr-e9447ecc19114cee9550c7aaea89a4d3de3cfa3f.tar.xz |
Move LumbrJack and Runnr to the libraries directory, and use them from GuiLua.
Diffstat (limited to '')
-rw-r--r-- | libraries/LumbrJack.c (renamed from LumbrJack/LumbrJack.c) | 0 | ||||
-rw-r--r-- | libraries/LumbrJack.h (renamed from LumbrJack/LumbrJack.h) | 0 | ||||
-rw-r--r-- | libraries/README | 8 | ||||
-rw-r--r-- | libraries/Runnr.c (renamed from Runnr/Runnr.c) | 0 | ||||
-rw-r--r-- | libraries/Runnr.h (renamed from Runnr/Runnr.h) | 0 | ||||
-rwxr-xr-x | libraries/build.lua (renamed from LumbrJack/build.lua) | 5 |
6 files changed, 12 insertions, 1 deletions
diff --git a/LumbrJack/LumbrJack.c b/libraries/LumbrJack.c index 9760766..9760766 100644 --- a/LumbrJack/LumbrJack.c +++ b/libraries/LumbrJack.c | |||
diff --git a/LumbrJack/LumbrJack.h b/libraries/LumbrJack.h index 4a3290c..4a3290c 100644 --- a/LumbrJack/LumbrJack.h +++ b/libraries/LumbrJack.h | |||
diff --git a/libraries/README b/libraries/README index 8ef38d3..a26fda1 100644 --- a/libraries/README +++ b/libraries/README | |||
@@ -21,3 +21,11 @@ that anymore. | |||
21 | 21 | ||
22 | luaproc has been hacked up a bit, and will continue to be hacked up. | 22 | luaproc has been hacked up a bit, and will continue to be hacked up. |
23 | Merged it into LuaSL, so it's no longer here. | 23 | Merged it into LuaSL, so it's no longer here. |
24 | |||
25 | -------------------------------------------------------------------- | ||
26 | |||
27 | These are the libraries written for the SledjHamr project. | ||
28 | |||
29 | LumbrJack is a library of logging stuff, coz every one wants to log. | ||
30 | |||
31 | Runnr is for running Lua scripts. Named (sorta) after a friend of mine. | ||
diff --git a/Runnr/Runnr.c b/libraries/Runnr.c index a24e7f5..a24e7f5 100644 --- a/Runnr/Runnr.c +++ b/libraries/Runnr.c | |||
diff --git a/Runnr/Runnr.h b/libraries/Runnr.h index dc720ff..dc720ff 100644 --- a/Runnr/Runnr.h +++ b/libraries/Runnr.h | |||
diff --git a/LumbrJack/build.lua b/libraries/build.lua index 3181bef..8b48b70 100755 --- a/LumbrJack/build.lua +++ b/libraries/build.lua | |||
@@ -15,7 +15,10 @@ end | |||
15 | 15 | ||
16 | LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS | 16 | LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS |
17 | 17 | ||
18 | removeFiles(dir, {'LumbrJack.o', 'libLumbrJack.so'}) | 18 | removeFiles(dir, {'LumbrJack.o', 'libLumbrJack.so', 'Runnr.o', 'libRunnr.so'}) |
19 | 19 | ||
20 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c') | 20 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c') |
21 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o libLumbrJack.so LumbrJack.o') | 21 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o libLumbrJack.so LumbrJack.o') |
22 | |||
23 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -fPIC -c Runnr.c') | ||
24 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o libRunnr.so Runnr.o') | ||