aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/GuiLua
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-24 11:42:09 +1000
committerDavid Walter Seikel2014-05-24 11:42:09 +1000
commitb7d9306c8689bdd7f37ce31ed63ce4e65fa396e2 (patch)
treeb2016c16ec01ce1ab40decb7533ef6849fa69956 /src/GuiLua
parentPretend to login, and some commenting out so it all compiles. Fix it up later. (diff)
downloadSledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.zip
SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.tar.gz
SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.tar.bz2
SledjHamr-b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2.tar.xz
Big include and libraries clean up.
Diffstat (limited to 'src/GuiLua')
-rw-r--r--src/GuiLua/GuiLua.c2
-rw-r--r--src/GuiLua/GuiLua.h1
-rwxr-xr-xsrc/GuiLua/build.lua4
-rw-r--r--src/GuiLua/skang.c1
-rw-r--r--src/GuiLua/test_c.c1
5 files changed, 4 insertions, 5 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 1ffbc0f..3ef6007 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -142,8 +142,8 @@ and ordinary elementary widgets. Proper introspection can come later.
142*/ 142*/
143 143
144 144
145#include "LumbrJack.h"
145#include "GuiLua.h" 146#include "GuiLua.h"
146#include "Runnr.h"
147 147
148 148
149const char *glName = "ourGuiLua"; 149const char *glName = "ourGuiLua";
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 216ce8a..d82d244 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -2,7 +2,6 @@
2#define _GUILUA_H_ 2#define _GUILUA_H_
3 3
4 4
5#include "LumbrJack.h"
6#include "Runnr.h" 5#include "Runnr.h"
7#include "winFang.h" 6#include "winFang.h"
8 7
diff --git a/src/GuiLua/build.lua b/src/GuiLua/build.lua
index 08446f0..7254eb1 100755
--- a/src/GuiLua/build.lua
+++ b/src/GuiLua/build.lua
@@ -17,7 +17,7 @@ LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS
17 17
18removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'}) 18removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'})
19 19
20runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
21runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c') 20runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
22runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o') 21runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
23runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua -lwinFang ' .. libs) 22runCommand('C apps', dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
23runCommand('C modules', dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
diff --git a/src/GuiLua/skang.c b/src/GuiLua/skang.c
index 3aee0e2..f40b136 100644
--- a/src/GuiLua/skang.c
+++ b/src/GuiLua/skang.c
@@ -1,3 +1,4 @@
1#include "LumbrJack.h"
1#include "GuiLua.h" 2#include "GuiLua.h"
2 3
3 4
diff --git a/src/GuiLua/test_c.c b/src/GuiLua/test_c.c
index f964d65..1cc5c08 100644
--- a/src/GuiLua/test_c.c
+++ b/src/GuiLua/test_c.c
@@ -11,7 +11,6 @@ http://lua-users.org/lists/lua-l/2008-01/msg00671.html
11 11
12 12
13#include "LumbrJack.h" 13#include "LumbrJack.h"
14#include "Runnr.h"
15#include "GuiLua.h" 14#include "GuiLua.h"
16 15
17 16