From b7d9306c8689bdd7f37ce31ed63ce4e65fa396e2 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 24 May 2014 11:42:09 +1000
Subject: Big include and libraries clean up.

---
 src/GuiLua/GuiLua.c  | 2 +-
 src/GuiLua/GuiLua.h  | 1 -
 src/GuiLua/build.lua | 4 ++--
 src/GuiLua/skang.c   | 1 +
 src/GuiLua/test_c.c  | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/GuiLua')

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.
 */
 
 
+#include "LumbrJack.h"
 #include "GuiLua.h"
-#include "Runnr.h"
 
 
 const 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 @@
 #define _GUILUA_H_
 
 
-#include "LumbrJack.h"
 #include "Runnr.h"
 #include "winFang.h"
 
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
 
 removeFiles(dir, {'test_c.so', 'GuiLua.o', lib_d .. '/libGuiLua.so', '../../skang'})
 
-runCommand('C modules',		dir, 'gcc ' .. CFLAGS .. ' -fPIC -shared -o test_c.so test_c.c')
 runCommand('C libraries',	dir, 'gcc ' .. CFLAGS .. ' -fPIC -c GuiLua.c')
 runCommand(nil,			dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libGuiLua.so -o ' .. lib_d .. '/libGuiLua.so GuiLua.o')
-runCommand('C apps',		dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua -lwinFang ' .. libs)
+runCommand('C apps',		dir, 'gcc ' .. CFLAGS .. ' -Wl,-export-dynamic -o ../../skang skang.c ' .. LDFLAGS .. ' -lGuiLua ' .. libs)
+runCommand('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 @@
+#include "LumbrJack.h"
 #include "GuiLua.h"
 
 
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
 
 
 #include "LumbrJack.h"
-#include "Runnr.h"
 #include "GuiLua.h"
 
 
-- 
cgit v1.1