aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-08 07:03:38 +1000
committerDavid Walter Seikel2014-05-08 07:03:38 +1000
commit1d7b6e9233967f7cde1c8872678b2db1bab8c539 (patch)
treedc2f2c964eb0c5dd8c09bcf0f2431735802446c8 /src
parentIntroducing purkle. B-) (diff)
downloadSledjHamr-1d7b6e9233967f7cde1c8872678b2db1bab8c539.zip
SledjHamr-1d7b6e9233967f7cde1c8872678b2db1bab8c539.tar.gz
SledjHamr-1d7b6e9233967f7cde1c8872678b2db1bab8c539.tar.bz2
SledjHamr-1d7b6e9233967f7cde1c8872678b2db1bab8c539.tar.xz
Switch to purkle is complete.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/extantz/build.lua4
-rw-r--r--src/extantz/extantz.c2
-rw-r--r--src/extantz/extantz.h4
-rw-r--r--src/extantz/purkle.c (renamed from src/extantz/chat.c)6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index c50f4da..d15be35 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -18,11 +18,11 @@ LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
18libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' 18libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr'
19 19
20removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) 20removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
21removeFiles(dir, {'../../extantz', 'camera.o', 'chat.o', 'files.o', 'scenri.o', 'woMan.o'}) 21removeFiles(dir, {'../../extantz', 'camera.o', 'purkle.o', 'files.o', 'scenri.o', 'woMan.o'})
22 22
23runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') 23runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj')
24runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) 24runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
25runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) 25runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
26runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) 26runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
27CFLAGS = CFLAGS .. ' -Wl,-export-dynamic' 27CFLAGS = CFLAGS .. ' -Wl,-export-dynamic'
28compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o') 28compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'purkle', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index cf2d7b0..b8536e9 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -516,7 +516,7 @@ EAPI_MAIN int elm_main(int argc, char **argv)
516 516
517// overlay_add(&ourGlobals); 517// overlay_add(&ourGlobals);
518 woMan_add(&ourGlobals); 518 woMan_add(&ourGlobals);
519 chat_add(&ourGlobals); 519 purkleAdd(&ourGlobals);
520 ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE); 520 ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
521 char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL}; 521 char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL};
522 GuiLuaDo(5, args, ourGlobals.mainWindow); 522 GuiLuaDo(5, args, ourGlobals.mainWindow);
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index 4a12a06..c6e3393 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -2,7 +2,7 @@
2#define _EXTANTZ_H_ 2#define _EXTANTZ_H_
3 3
4#define USE_PHYSICS 1 4#define USE_PHYSICS 1
5#define USE_IRR 1 5#define USE_IRR 0
6#define USE_DEMO 1 6#define USE_DEMO 1
7#define DO_GEARS 0 7#define DO_GEARS 0
8 8
@@ -256,9 +256,9 @@ Scene_Data *scenriAdd(Evas_Object *win);
256Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *win); 256Evas_3D_Node *cameraAdd(Evas *evas, Scene_Data *scene, Evas_Object *win);
257Eina_Bool animateCamera(Scene_Data *scene); 257Eina_Bool animateCamera(Scene_Data *scene);
258 258
259winFang *chat_add(globals *ourGlobals);
260winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save); 259winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
261void filesShow(winFang *me, Evas_Smart_Cb func, void *data); 260void filesShow(winFang *me, Evas_Smart_Cb func, void *data);
261winFang *purkleAdd(globals *ourGlobals);
262winFang *woMan_add(globals *ourGlobals); 262winFang *woMan_add(globals *ourGlobals);
263 263
264 264
diff --git a/src/extantz/chat.c b/src/extantz/purkle.c
index c19b936..590a84e 100644
--- a/src/extantz/chat.c
+++ b/src/extantz/purkle.c
@@ -3,20 +3,20 @@
3 3
4// TODO - This is to work around a bug in Elm entry, remove it when the bug is fixed. 4// TODO - This is to work around a bug in Elm entry, remove it when the bug is fixed.
5// The bug is that editable entry widgets cause the app to hang on exit. 5// The bug is that editable entry widgets cause the app to hang on exit.
6void _on_entry_del(void *data, Evas_Object *obj, void *event_info) 6static void _on_entry_del(void *data, Evas_Object *obj, void *event_info)
7{ 7{
8// winFang *me = data; 8// winFang *me = data;
9 9
10 elm_entry_editable_set(obj, EINA_FALSE); 10 elm_entry_editable_set(obj, EINA_FALSE);
11} 11}
12 12
13winFang *chat_add(globals *ourGlobals) 13winFang *purkleAdd(globals *ourGlobals)
14{ 14{
15 winFang *me; 15 winFang *me;
16 Widget *wid; 16 Widget *wid;
17 Evas_Object *en; 17 Evas_Object *en;
18 18
19 me = winFangAdd(ourGlobals->mainWindow, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "chat"); 19 me = winFangAdd(ourGlobals->mainWindow, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "purkle");
20 20
21 en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win, 21 en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win,
22 elm_obj_entry_scrollable_set(EINA_TRUE), 22 elm_obj_entry_scrollable_set(EINA_TRUE),