From 969f1968f2f74f8f09c4788bc7f7b1c9655ad354 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 5 May 2014 20:04:08 +1000
Subject: Call skang modules from extantz.  Needs some clean up.

---
 src/extantz/build.lua | 7 ++++---
 src/extantz/chat.c    | 2 +-
 src/extantz/extantz.c | 7 +++++++
 src/extantz/extantz.h | 2 ++
 src/extantz/woMan.c   | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/extantz')

diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index d3c983a..5ea2029 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -13,9 +13,9 @@ if 'nil' == type(dir) then
   dir = workingDir
 end
 
-CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include'
+CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua'
 LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
-libs    = libs    .. ' -lIrrlicht -lGL -lbz2'
+libs    = libs    .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr'
 
 removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
 removeFiles(dir, {'../../extantz', 'camera.o', 'chat.o', 'files.o', 'woMan.o'})
@@ -24,4 +24,5 @@ runCommand('edje_cc',		dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../medi
 runCommand('Irrlicht files',	dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
 runCommand(nil,			dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
 runCommand(nil,			dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
-compileFiles('../../extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o -lwinFang')
+CFLAGS = CFLAGS .. ' -Wl,-export-dynamic'
+compileFiles('../../extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
diff --git a/src/extantz/chat.c b/src/extantz/chat.c
index d608620..d060cb1 100644
--- a/src/extantz/chat.c
+++ b/src/extantz/chat.c
@@ -16,7 +16,7 @@ winFang *chat_add(globals *ourGlobals)
   Widget  *wid;
   Evas_Object *bx, *en;
 
-  me = winFangAdd(ourGlobals->win, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "chat");
+  me = winFangAdd(ourGlobals->win, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "chat");
   eina_clist_add_head(&ourGlobals->winFangs, &me->node);
 
   bx = eo_add(ELM_OBJ_BOX_CLASS, me->win,
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index e8683f8..7346aea 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -472,6 +472,8 @@ EAPI_MAIN int elm_main(int argc, char **argv)
     woMan_add(&ourGlobals);
     chat_add(&ourGlobals);
     ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
+    char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL};
+    GuiLua *test = GuiLuaDo(5, args, ourGlobals.win);
 
     // Gotta do this after adding the windows, otherwise the menu renders under the window.
     //   This sucks, gotta redefine this menu each time we create a new window?
@@ -509,6 +511,11 @@ EAPI_MAIN int elm_main(int argc, char **argv)
 	Evas_3D_Demo_fini(&ourGlobals);
 	eo_unref(ourGlobals.tb);
 
+	EINA_CLIST_FOR_EACH_ENTRY(win, &test->winFangs, winFang, node)
+	{
+	  winFangDel(win);
+	}
+
 	EINA_CLIST_FOR_EACH_ENTRY(win, &ourGlobals.winFangs, winFang, node)
 	{
 	  winFangDel(win);
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index 7d969b1..969ac98 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -11,6 +11,8 @@
 #include <EPhysics.h>
 #include "extantzCamera.h"
 #include "winFang.h"
+#include "Runnr.h"
+#include "GuiLua.h"
 
 
 #ifdef GL_GLES
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index f0a2ed4..ee0cc02 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -159,7 +159,7 @@ winFang *woMan_add(globals *ourGlobals)
     char buf[PATH_MAX];
     int i;
 
-    me = winFangAdd(ourGlobals->win, 30, 30, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan");
+    me = winFangAdd(ourGlobals->win, 30, 150, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan");
     eina_clist_add_head(&ourGlobals->winFangs, &me->node);
 
     bx = elm_box_add(me->win);
-- 
cgit v1.1