diff options
author | David Walter Seikel | 2014-05-23 13:22:36 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-23 13:22:36 +1000 |
commit | f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38 (patch) | |
tree | df45770acc4a26d56e45bc7ae3420cddb6522d15 /src/GuiLua | |
parent | TODO-- (diff) | |
download | SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.zip SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.gz SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.bz2 SledjHamr-f97c73bd1e43a0eb32ad8dc43fc28f6e40b28f38.tar.xz |
Rewrite the LuaSL script running stuff (twice lol), plus much related tweakage and cleanups.
Diffstat (limited to 'src/GuiLua')
-rwxr-xr-x | src/GuiLua/build.lua | 1 | ||||
-rw-r--r-- | src/GuiLua/test_c.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua index 8b4a1c8..08446f0 100755 --- a/src/GuiLua/build.lua +++ b/src/GuiLua/build.lua | |||
@@ -18,7 +18,6 @@ LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS | |||
18 | removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'}) | 18 | removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'}) |
19 | 19 | ||
20 | runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c') | 20 | runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c') |
21 | |||
22 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') | 21 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') |
23 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o') | 22 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o') |
24 | runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua -lwinFang ' .. libs) | 23 | runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua -lwinFang ' .. libs) |
diff --git a/src/GuiLua/test_c.c b/src/GuiLua/test_c.c index ed680b0..f964d65 100644 --- a/src/GuiLua/test_c.c +++ b/src/GuiLua/test_c.c | |||
@@ -10,6 +10,7 @@ http://lua-users.org/lists/lua-l/2008-01/msg00671.html | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | 12 | ||
13 | #include "LumbrJack.h" | ||
13 | #include "Runnr.h" | 14 | #include "Runnr.h" |
14 | #include "GuiLua.h" | 15 | #include "GuiLua.h" |
15 | 16 | ||