diff options
Diffstat (limited to '')
-rwxr-xr-x | src/extantz/build.lua | 4 | ||||
-rw-r--r-- | src/libraries/winFang.c (renamed from src/extantz/winFang.c) | 9 | ||||
-rw-r--r-- | src/libraries/winFang.h (renamed from src/extantz/winFang.h) | 10 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/extantz/build.lua b/src/extantz/build.lua index 261c96f..d3c983a 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua | |||
@@ -18,12 +18,10 @@ LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' | |||
18 | libs = libs .. ' -lIrrlicht -lGL -lbz2' | 18 | libs = libs .. ' -lIrrlicht -lGL -lbz2' |
19 | 19 | ||
20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) | 20 | removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) |
21 | removeFiles(dir, {'../../extantz', 'camera.o', 'winFang.o', lib_d .. '/libwinFang.so', 'chat.o', 'files.o', 'woMan.o'}) | 21 | removeFiles(dir, {'../../extantz', 'camera.o', 'chat.o', 'files.o', 'woMan.o'}) |
22 | 22 | ||
23 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') | 23 | runCommand('edje_cc', dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj') |
24 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) | 24 | runCommand('Irrlicht files', dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS) |
25 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) | 25 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS) |
26 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) | 26 | runCommand(nil, dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS) |
27 | runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c winFang.c') | ||
28 | runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libwinFang.so -o ' .. lib_d .. '/libwinFang.so winFang.o') | ||
29 | compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o -lwinFang') | 27 | compileFiles('../../extantz', dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'chat', 'files', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o -lwinFang') |
diff --git a/src/extantz/winFang.c b/src/libraries/winFang.c index a38845a..4d54627 100644 --- a/src/extantz/winFang.c +++ b/src/libraries/winFang.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "extantz.h" | 1 | #include "winFang.h" |
2 | 2 | ||
3 | 3 | ||
4 | // Elm inlined image windows needs this to change focus on mouse click. | 4 | // Elm inlined image windows needs this to change focus on mouse click. |
@@ -144,7 +144,6 @@ winFang *winFangAdd(Evas_Object *parent, int x, int y, int w, int h, char *title | |||
144 | } | 144 | } |
145 | else | 145 | else |
146 | { | 146 | { |
147 | elm_config_preferred_engine_set("opengl_x11"); | ||
148 | result->win = elm_win_add(parent, name, ELM_WIN_BASIC); | 147 | result->win = elm_win_add(parent, name, ELM_WIN_BASIC); |
149 | evas_object_move(result->win, result->x, result->y); | 148 | evas_object_move(result->win, result->x, result->y); |
150 | evas_object_smart_callback_add(result->win, "delete,request", _on_done, NULL); | 149 | evas_object_smart_callback_add(result->win, "delete,request", _on_done, NULL); |
@@ -198,7 +197,11 @@ Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char | |||
198 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 197 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
199 | evas_obj_visibility_set(EINA_TRUE) | 198 | evas_obj_visibility_set(EINA_TRUE) |
200 | ); | 199 | ); |
201 | if (title) elm_object_text_set(result->obj, title); | 200 | if (title) |
201 | { | ||
202 | result->label = strdup(title); | ||
203 | elm_object_text_set(result->obj, result->label); | ||
204 | } | ||
202 | } | 205 | } |
203 | 206 | ||
204 | return result; | 207 | return result; |
diff --git a/src/extantz/winFang.h b/src/libraries/winFang.h index 6ae26e4..219dcf0 100644 --- a/src/extantz/winFang.h +++ b/src/libraries/winFang.h | |||
@@ -1,3 +1,13 @@ | |||
1 | #define EFL_API_OVERRIDE 1 | ||
2 | /* Enable access to unstable EFL API that are still in beta */ | ||
3 | #define EFL_BETA_API_SUPPORT 1 | ||
4 | /* Enable access to unstable EFL EO API. */ | ||
5 | #define EFL_EO_API_SUPPORT 1 | ||
6 | |||
7 | |||
8 | #include <Eo.h> | ||
9 | #include <Eina.h> | ||
10 | #include <Evas.h> | ||
1 | #include <Elementary.h> | 11 | #include <Elementary.h> |
2 | 12 | ||
3 | 13 | ||