summaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorBogdan Devichev <b.devichev@samsung.com>2015-02-20 17:59:27 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-02-20 18:37:03 +0100
commit4cd50a447fc3887fdcf0f8041beb360e3729c448 (patch)
tree69b45fdb7a0f311b064d4f6379f62092324c0edd /src/examples
parentf377770cc16585ce0e6d7777f8e2090ca38dda21 (diff)
evas: resources for evas-2d examples are added to resource folder.
Summary: Process of loading is standard now. TODOs which are added here will be done in one of the next commits soon. Reviewers: cedric, Hermet, raster Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2013 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/evas/Makefile.am8
-rw-r--r--src/examples/evas/evas-3d-aabb.c9
-rw-r--r--src/examples/evas/evas-3d-colorpick.c11
-rw-r--r--src/examples/evas/evas-3d-common.h3
-rw-r--r--src/examples/evas/evas-3d-cube2.c7
-rw-r--r--src/examples/evas/evas-3d-eet.c14
-rw-r--r--src/examples/evas/evas-3d-frustum.c9
-rw-r--r--src/examples/evas/evas-3d-md2.c9
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c7
-rw-r--r--src/examples/evas/evas-3d-moon-space.c11
-rw-r--r--src/examples/evas/evas-3d-obj.c15
-rw-r--r--src/examples/evas/evas-3d-pick.c7
-rw-r--r--src/examples/evas/evas-3d-ply.c16
-rw-r--r--src/examples/evas/evas-3d-shadows.c7
-rw-r--r--src/examples/evas/evas-aspect-hints.c3
-rw-r--r--src/examples/evas/evas-common.h3
-rw-r--r--src/examples/evas/evas-events.c5
-rw-r--r--src/examples/evas/evas-hints.c4
-rw-r--r--src/examples/evas/evas-images.c6
-rw-r--r--src/examples/evas/evas-images2.c4
-rw-r--r--src/examples/evas/evas-images3.c4
-rw-r--r--src/examples/evas/evas-images4.c4
-rw-r--r--src/examples/evas/evas-map-aa.c8
-rw-r--r--src/examples/evas/evas-map-utils.c13
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c1
-rw-r--r--src/examples/evas/evas-object-manipulation.c5
-rw-r--r--src/examples/evas/evas-smart-object.c5
-rw-r--r--src/examples/evas/resources/images/cube1.png (renamed from src/examples/evas/cube1.png)bin183167 -> 183167 bytes
-rw-r--r--src/examples/evas/resources/images/enlightenment.png (renamed from src/examples/evas/enlightenment.png)bin17541 -> 17541 bytes
-rw-r--r--src/examples/evas/resources/images/im1.png (renamed from src/examples/evas/im1.png)bin467518 -> 467518 bytes
-rw-r--r--src/examples/evas/resources/images/red.png (renamed from src/examples/evas/red.png)bin225 -> 225 bytes
31 files changed, 104 insertions, 94 deletions
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 300f978..9d81f15 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -327,10 +327,10 @@ evas-multi-touch.c \
327evas-text.c 327evas-text.c
328 328
329DATA_FILES = \ 329DATA_FILES = \
330enlightenment.png \ 330resources/images/enlightenment.png \
331red.png \ 331resources/images/red.png \
332im1.png \ 332resources/images/im1.png \
333cube1.png \ 333resources/images/cube1.png \
334resources/images/bg_space.jpg \ 334resources/images/bg_space.jpg \
335resources/images/eagle.png \ 335resources/images/eagle.png \
336resources/images/EarthDiffuse.png \ 336resources/images/EarthDiffuse.png \
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index ef3e079..90603be 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -10,22 +10,21 @@
10#include "config.h" 10#include "config.h"
11#else 11#else
12#define PACKAGE_EXAMPLES_DIR "." 12#define PACKAGE_EXAMPLES_DIR "."
13#endif
14
15#define EFL_EO_API_SUPPORT 13#define EFL_EO_API_SUPPORT
16#define EFL_BETA_API_SUPPORT 14#define EFL_BETA_API_SUPPORT
15#endif
17 16
18#include <Eo.h> 17#include <Eo.h>
19#include <Evas.h> 18#include <Evas.h>
20#include <Ecore.h> 19#include <Ecore.h>
21#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
22#include "evas-3d-common.h" 21#include "evas-common.h"
23 22
24#define WIDTH 400 23#define WIDTH 400
25#define HEIGHT 400 24#define HEIGHT 400
26 25
27static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/sonic.md2"; 26static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/sonic.md2";
28static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/sonic.png"; 27static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sonic.png";
29 28
30Ecore_Evas *ecore_evas = NULL; 29Ecore_Evas *ecore_evas = NULL;
31Evas *evas = NULL; 30Evas *evas = NULL;
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 6ca3376..b909a0c 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -15,17 +15,16 @@
15#include "config.h" 15#include "config.h"
16#else 16#else
17#define PACKAGE_EXAMPLES_DIR "." 17#define PACKAGE_EXAMPLES_DIR "."
18#endif
19
20#define EFL_EO_API_SUPPORT 18#define EFL_EO_API_SUPPORT
21#define EFL_BETA_API_SUPPORT 19#define EFL_BETA_API_SUPPORT
20#endif
22 21
23#include <Eo.h> 22#include <Eo.h>
24#include <Evas.h> 23#include <Evas.h>
25#include <Ecore.h> 24#include <Ecore.h>
26#include <Ecore_Evas.h> 25#include <Ecore_Evas.h>
27#include <Ecore_Getopt.h> 26#include <Ecore_Getopt.h>
28#include "evas-3d-common.h" 27#include "evas-common.h"
29 28
30#define WIDTH 800 29#define WIDTH 800
31#define HEIGHT 600 30#define HEIGHT 600
@@ -33,9 +32,9 @@
33#define ANIMATION_COUNT 3 32#define ANIMATION_COUNT 3
34#define MAX_PATH 128 33#define MAX_PATH 128
35 34
36static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/M15.obj"; 35static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/M15.obj";
37static const char *image1_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/M15.png"; 36static const char *image1_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/M15.png";
38static const char *image2_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/M15_1.png"; 37static const char *image2_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/M15_1.png";
39 38
40Ecore_Evas *ecore_evas = NULL; 39Ecore_Evas *ecore_evas = NULL;
41Evas *evas = NULL; 40Evas *evas = NULL;
diff --git a/src/examples/evas/evas-3d-common.h b/src/examples/evas/evas-3d-common.h
deleted file mode 100644
index 4304b3d..0000000
--- a/src/examples/evas/evas-3d-common.h
+++ /dev/null
@@ -1,3 +0,0 @@
1#define EVAS_3D_IMAGE_FOLDER "/resources/images"
2#define EVAS_3D_MODEL_FOLDER "/resources/models"
3#define EVAS_3D_SAVED_FILES "/saved_files"
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 3009520..c0112d6 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -2,21 +2,20 @@
2#include "config.h" 2#include "config.h"
3#else 3#else
4#define PACKAGE_EXAMPLES_DIR "." 4#define PACKAGE_EXAMPLES_DIR "."
5#endif
6
7#define EFL_EO_API_SUPPORT 5#define EFL_EO_API_SUPPORT
8#define EFL_BETA_API_SUPPORT 6#define EFL_BETA_API_SUPPORT
7#endif
9 8
10#include <Eo.h> 9#include <Eo.h>
11#include <Evas.h> 10#include <Evas.h>
12#include <Ecore.h> 11#include <Ecore.h>
13#include <Ecore_Evas.h> 12#include <Ecore_Evas.h>
14#include "evas-3d-common.h" 13#include "evas-common.h"
15 14
16#define WIDTH 400 15#define WIDTH 400
17#define HEIGHT 400 16#define HEIGHT 400
18 17
19static const char *normal_map_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/normal_lego.png"; 18static const char *normal_map_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/normal_lego.png";
20 19
21typedef struct _Scene_Data 20typedef struct _Scene_Data
22{ 21{
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index c7139a8..f67f36e 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -17,22 +17,22 @@
17#include "config.h" 17#include "config.h"
18#else 18#else
19#define PACKAGE_EXAMPLES_DIR "." 19#define PACKAGE_EXAMPLES_DIR "."
20#endif
21
22#define EFL_EO_API_SUPPORT 20#define EFL_EO_API_SUPPORT
23#define EFL_BETA_API_SUPPORT 21#define EFL_BETA_API_SUPPORT
22#endif
24 23
25#include <Eo.h> 24#include <Eo.h>
26#include <Evas.h> 25#include <Evas.h>
27#include <Ecore.h> 26#include <Ecore.h>
28#include <Ecore_Evas.h> 27#include <Ecore_Evas.h>
29#include "evas-3d-common.h" 28#include <Ecore_File.h>
29#include "evas-common.h"
30 30
31#define WIDTH 1024 31#define WIDTH 1024
32#define HEIGHT 1024 32#define HEIGHT 1024
33 33
34static const char *input_model_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/sonic.md2"; 34static const char *input_model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/sonic.md2";
35static const char *output_model_path = PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES "/saved_Sonic_EET.eet"; 35static const char *output_model_path = PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES "/saved_Sonic_EET.eet";
36 36
37Ecore_Evas *ecore_evas = NULL; 37Ecore_Evas *ecore_evas = NULL;
38Evas *evas = NULL; 38Evas *evas = NULL;
@@ -178,9 +178,9 @@ main(void)
178 0.50, 0.00, 0.50, 0.30), 178 0.50, 0.00, 0.50, 0.30),
179 evas_3d_material_shininess_set(50.0)); 179 evas_3d_material_shininess_set(50.0));
180 180
181 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES)) 181 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
182 fprintf(stderr, "Failed to create folder %s\n\n", 182 fprintf(stderr, "Failed to create folder %s\n\n",
183 PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES); 183 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES);
184 184
185 eo_do(mesh, efl_file_save(output_model_path, NULL, NULL)); 185 eo_do(mesh, efl_file_save(output_model_path, NULL, NULL));
186 186
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 90b8a6a..15ed883 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -15,23 +15,22 @@
15#include "config.h" 15#include "config.h"
16#else 16#else
17#define PACKAGE_EXAMPLES_DIR "." 17#define PACKAGE_EXAMPLES_DIR "."
18#endif
19
20#define EFL_EO_API_SUPPORT 18#define EFL_EO_API_SUPPORT
21#define EFL_BETA_API_SUPPORT 19#define EFL_BETA_API_SUPPORT
20#endif
22 21
23#include <Ecore.h> 22#include <Ecore.h>
24#include <Ecore_Evas.h> 23#include <Ecore_Evas.h>
25#include <Evas.h> 24#include <Evas.h>
26#include <Eo.h> 25#include <Eo.h>
27#include <math.h> 26#include <math.h>
28#include "evas-3d-common.h" 27#include "evas-common.h"
29 28
30#define WIDTH 800 29#define WIDTH 800
31#define HEIGHT 600 30#define HEIGHT 600
32 31
33static const char *image_eagle_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/eagle.png"; 32static const char *image_eagle_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/eagle.png";
34static const char *eagle_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/eagle.md2"; 33static const char *eagle_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/eagle.md2";
35 34
36typedef struct _Scene_Data 35typedef struct _Scene_Data
37{ 36{
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 5a9309e..f5344bb 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -2,22 +2,21 @@
2#include "config.h" 2#include "config.h"
3#else 3#else
4#define PACKAGE_EXAMPLES_DIR "." 4#define PACKAGE_EXAMPLES_DIR "."
5#endif
6
7#define EFL_EO_API_SUPPORT 5#define EFL_EO_API_SUPPORT
8#define EFL_BETA_API_SUPPORT 6#define EFL_BETA_API_SUPPORT
7#endif
9 8
10#include <Eo.h> 9#include <Eo.h>
11#include <Evas.h> 10#include <Evas.h>
12#include <Ecore.h> 11#include <Ecore.h>
13#include <Ecore_Evas.h> 12#include <Ecore_Evas.h>
14#include "evas-3d-common.h" 13#include "evas-common.h"
15 14
16#define WIDTH 400 15#define WIDTH 400
17#define HEIGHT 400 16#define HEIGHT 400
18 17
19static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/sonic.md2"; 18static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/sonic.md2";
20static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/sonic.png"; 19static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sonic.png";
21 20
22Ecore_Evas *ecore_evas = NULL; 21Ecore_Evas *ecore_evas = NULL;
23Evas *evas = NULL; 22Evas *evas = NULL;
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 923654e..084852b 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -14,16 +14,15 @@
14#include "config.h" 14#include "config.h"
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#endif
18
19#define EFL_EO_API_SUPPORT 17#define EFL_EO_API_SUPPORT
20#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#endif
21 20
22#include <Eo.h> 21#include <Eo.h>
23#include <Evas.h> 22#include <Evas.h>
24#include <Ecore.h> 23#include <Ecore.h>
25#include <Ecore_Evas.h> 24#include <Ecore_Evas.h>
26#include "evas-3d-common.h" 25#include "evas-common.h"
27 26
28#include <math.h> 27#include <math.h>
29 28
@@ -54,7 +53,7 @@
54 initial_node_data[number * 10 + 9]));\ 53 initial_node_data[number * 10 + 9]));\
55 ecore_timer_add(0.01, _animate_##extention, node_##extention); 54 ecore_timer_add(0.01, _animate_##extention, node_##extention);
56 55
57static const char *template_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/mesh_for_mmap."; 56static const char *template_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/mesh_for_mmap.";
58 57
59Ecore_Evas *ecore_evas = NULL; 58Ecore_Evas *ecore_evas = NULL;
60Evas *evas = NULL; 59Evas *evas = NULL;
diff --git a/src/examples/evas/evas-3d-moon-space.c b/src/examples/evas/evas-3d-moon-space.c
index cbe4a92..928245c 100644
--- a/src/examples/evas/evas-3d-moon-space.c
+++ b/src/examples/evas/evas-3d-moon-space.c
@@ -20,10 +20,9 @@
20#include "config.h" 20#include "config.h"
21#else 21#else
22#define PACKAGE_EXAMPLES_DIR "." 22#define PACKAGE_EXAMPLES_DIR "."
23#endif
24
25#define EFL_EO_API_SUPPORT 23#define EFL_EO_API_SUPPORT
26#define EFL_BETA_API_SUPPORT 24#define EFL_BETA_API_SUPPORT
25#endif
27 26
28#include <Ecore_Evas.h> 27#include <Ecore_Evas.h>
29#include <Ecore.h> 28#include <Ecore.h>
@@ -31,14 +30,14 @@
31#include <stdio.h> 30#include <stdio.h>
32#include <math.h> 31#include <math.h>
33#include <Eo.h> 32#include <Eo.h>
34#include "evas-3d-common.h" 33#include "evas-common.h"
35 34
36#define WIDTH 1024 35#define WIDTH 1024
37#define HEIGHT 1024 36#define HEIGHT 1024
38 37
39static const char *bg_image = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/bg_space.jpg"; 38static const char *bg_image = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/bg_space.jpg";
40static const char *moon_image = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/moon.png"; 39static const char *moon_image = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/moon.png";
41static const char *earth_image = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/EarthDiffuse.png"; 40static const char *earth_image = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/EarthDiffuse.png";
42 41
43typedef struct _Scene_Data 42typedef struct _Scene_Data
44{ 43{
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index bccbea2..ea86377 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -17,16 +17,15 @@
17#include "config.h" 17#include "config.h"
18#else 18#else
19#define PACKAGE_EXAMPLES_DIR "." 19#define PACKAGE_EXAMPLES_DIR "."
20#endif
21
22#define EFL_EO_API_SUPPORT 20#define EFL_EO_API_SUPPORT
23#define EFL_BETA_API_SUPPORT 21#define EFL_BETA_API_SUPPORT
22#endif
24 23
25#include <Eo.h> 24#include <Eo.h>
26#include <Evas.h> 25#include <Evas.h>
27#include <Ecore.h> 26#include <Ecore.h>
28#include <Ecore_Evas.h> 27#include <Ecore_Evas.h>
29#include "evas-3d-common.h" 28#include "evas-common.h"
30 29
31#define WIDTH 1900 30#define WIDTH 1900
32#define HEIGHT 1080 31#define HEIGHT 1080
@@ -90,9 +89,9 @@
90 COL_BLUE, 0.5), \ 89 COL_BLUE, 0.5), \
91 evas_3d_material_shininess_set(100.0)); 90 evas_3d_material_shininess_set(100.0));
92 91
93static const char *texture_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/sweet_home_reversed.png"; 92static const char *texture_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sweet_home_reversed.png";
94static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES "/saved_"; 93static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES "/saved_";
95static const char *input_template = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/sweet_"; 94static const char *input_template = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/sweet_";
96 95
97Ecore_Evas *ecore_evas = NULL; 96Ecore_Evas *ecore_evas = NULL;
98Evas *evas = NULL; 97Evas *evas = NULL;
@@ -213,9 +212,9 @@ main(void)
213 eo_do(material_with_tex, 212 eo_do(material_with_tex,
214 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture)); 213 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture));
215 214
216 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES)) 215 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
217 fprintf(stderr, "Failed to create folder %s\n\n", 216 fprintf(stderr, "Failed to create folder %s\n\n",
218 PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES); 217 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES);
219 218
220 ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0, 219 ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0,
221 EVAS_3D_SHADE_MODE_PHONG, material_with_tex) 220 EVAS_3D_SHADE_MODE_PHONG, material_with_tex)
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 3d7c235..dded35e 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -2,22 +2,21 @@
2#include "config.h" 2#include "config.h"
3#else 3#else
4#define PACKAGE_EXAMPLES_DIR "." 4#define PACKAGE_EXAMPLES_DIR "."
5#endif
6
7#define EFL_EO_API_SUPPORT 5#define EFL_EO_API_SUPPORT
8#define EFL_BETA_API_SUPPORT 6#define EFL_BETA_API_SUPPORT
7#endif
9 8
10#include <math.h> 9#include <math.h>
11#include <Eo.h> 10#include <Eo.h>
12#include <Evas.h> 11#include <Evas.h>
13#include <Ecore.h> 12#include <Ecore.h>
14#include <Ecore_Evas.h> 13#include <Ecore_Evas.h>
15#include "evas-3d-common.h" 14#include "evas-common.h"
16 15
17#define WIDTH 400 16#define WIDTH 400
18#define HEIGHT 400 17#define HEIGHT 400
19 18
20static const char *earth_image = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/EarthDiffuse.png"; 19static const char *earth_image = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/EarthDiffuse.png";
21 20
22typedef struct _vec4 21typedef struct _vec4
23{ 22{
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 8e010fc..c35cd60 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -16,25 +16,25 @@
16#include "config.h" 16#include "config.h"
17#else 17#else
18#define PACKAGE_EXAMPLES_DIR "." 18#define PACKAGE_EXAMPLES_DIR "."
19#endif
20
21#define EFL_EO_API_SUPPORT 19#define EFL_EO_API_SUPPORT
22#define EFL_BETA_API_SUPPORT 20#define EFL_BETA_API_SUPPORT
21#endif
23 22
24#include <Eo.h> 23#include <Eo.h>
25#include <Evas.h> 24#include <Evas.h>
26#include <Ecore.h> 25#include <Ecore.h>
27#include <Ecore_Evas.h> 26#include <Ecore_Evas.h>
28#include "evas-3d-common.h" 27#include <Ecore_File.h>
28#include "evas-common.h"
29 29
30#define WIDTH 1024 30#define WIDTH 1024
31#define HEIGHT 1024 31#define HEIGHT 1024
32 32
33#define NUMBER_OF_MESHES 32 33#define NUMBER_OF_MESHES 32
34 34
35static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/normal_lego.png"; 35static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/normal_lego.png";
36static const char *input_template = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/"; 36static const char *input_template = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/";
37static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES "/"; 37static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES "/";
38static const char *file_name[8] = {"Normal_UVs_Colors.ply", 38static const char *file_name[8] = {"Normal_UVs_Colors.ply",
39 "Normal_UVs_NoColors.ply", 39 "Normal_UVs_NoColors.ply",
40 "Normal_NoUVs_Colors.ply", 40 "Normal_NoUVs_Colors.ply",
@@ -185,9 +185,9 @@ main(void)
185 1.0, 1.0, 1.0, 1.0), 185 1.0, 1.0, 1.0, 1.0),
186 evas_3d_material_shininess_set(50.0)); 186 evas_3d_material_shininess_set(50.0));
187 187
188 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES)) 188 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
189 fprintf(stderr, "Failed to create folder %s\n\n", 189 fprintf(stderr, "Failed to create folder %s\n\n",
190 PACKAGE_EXAMPLES_DIR EVAS_3D_SAVED_FILES); 190 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES);
191 191
192 /* Add the meshes. */ 192 /* Add the meshes. */
193 for (i = 0; i < NUMBER_OF_MESHES; i++) 193 for (i = 0; i < NUMBER_OF_MESHES; i++)
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 710507c..3170eb7 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -12,10 +12,9 @@
12#include "config.h" 12#include "config.h"
13#else 13#else
14#define PACKAGE_EXAMPLES_DIR "." 14#define PACKAGE_EXAMPLES_DIR "."
15#endif
16
17#define EFL_EO_API_SUPPORT 15#define EFL_EO_API_SUPPORT
18#define EFL_BETA_API_SUPPORT 16#define EFL_BETA_API_SUPPORT
17#endif
19 18
20#include <Eo.h> 19#include <Eo.h>
21#include <Evas.h> 20#include <Evas.h>
@@ -35,8 +34,8 @@
35#define DIFFUSE_LIGHT 1.0, 1.0, 1.0 34#define DIFFUSE_LIGHT 1.0, 1.0, 1.0
36#define SPECULAR_LIGHT 1.0, 1.0, 1.0 35#define SPECULAR_LIGHT 1.0, 1.0, 1.0
37 36
38static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_3D_MODEL_FOLDER "/sonic.md2"; 37static const char *model_path = PACKAGE_EXAMPLES_DIR EVAS_MODEL_FOLDER "/sonic.md2";
39static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_3D_IMAGE_FOLDER "/sonic.png"; 38static const char *image_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sonic.png";
40static const vec2 tex_scale = {1, 1}; 39static const vec2 tex_scale = {1, 1};
41 40
42Ecore_Evas *ecore_evas = NULL; 41Ecore_Evas *ecore_evas = NULL;
diff --git a/src/examples/evas/evas-aspect-hints.c b/src/examples/evas/evas-aspect-hints.c
index 6da0102..1d1b911 100644
--- a/src/examples/evas/evas-aspect-hints.c
+++ b/src/examples/evas/evas-aspect-hints.c
@@ -25,11 +25,12 @@
25#include <Edje.h> 25#include <Edje.h>
26#include <stdio.h> 26#include <stdio.h>
27#include <errno.h> 27#include <errno.h>
28#include "evas-common.h"
28 29
29#define WIDTH 320 30#define WIDTH 320
30#define HEIGHT 480 31#define HEIGHT 480
31 32
32static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png"; 33static const char *border_img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/red.png";
33static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/aspect.edj"; 34static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/aspect.edj";
34 35
35struct test_data 36struct test_data
diff --git a/src/examples/evas/evas-common.h b/src/examples/evas/evas-common.h
new file mode 100644
index 0000000..4ce369a
--- /dev/null
+++ b/src/examples/evas/evas-common.h
@@ -0,0 +1,3 @@
1#define EVAS_IMAGE_FOLDER "/resources/images"
2#define EVAS_MODEL_FOLDER "/resources/models"
3#define EVAS_SAVED_FILES "/saved_files"
diff --git a/src/examples/evas/evas-events.c b/src/examples/evas/evas-events.c
index 937a900..7b61498 100644
--- a/src/examples/evas/evas-events.c
+++ b/src/examples/evas/evas-events.c
@@ -10,9 +10,9 @@
10 * gcc -o evas-events evas-events.c `pkg-config --libs --cflags evas ecore ecore-evas` 10 * gcc -o evas-events evas-events.c `pkg-config --libs --cflags evas ecore ecore-evas`
11 * @endverbatim 11 * @endverbatim
12 */ 12 */
13//TODO: Fix warning.
13 14
14#ifdef HAVE_CONFIG_H 15#ifdef HAVE_CONFIG_H
15
16#include "config.h" 16#include "config.h"
17#else 17#else
18#define PACKAGE_EXAMPLES_DIR "." 18#define PACKAGE_EXAMPLES_DIR "."
@@ -22,11 +22,12 @@
22#include <Ecore_Evas.h> 22#include <Ecore_Evas.h>
23#include <stdio.h> 23#include <stdio.h>
24#include <errno.h> 24#include <errno.h>
25#include "evas-common.h"
25 26
26#define WIDTH (320) 27#define WIDTH (320)
27#define HEIGHT (240) 28#define HEIGHT (240)
28 29
29static const char *img_path = PACKAGE_EXAMPLES_DIR "/enlightenment.png"; 30static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/enlightenment.png";
30 31
31static const char *commands = \ 32static const char *commands = \
32 "commands are:\n" 33 "commands are:\n"
diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c
index 39deefc..23c6f3d 100644
--- a/src/examples/evas/evas-hints.c
+++ b/src/examples/evas/evas-hints.c
@@ -22,10 +22,10 @@
22 22
23#include <Ecore.h> 23#include <Ecore.h>
24#include <Ecore_Evas.h> 24#include <Ecore_Evas.h>
25
26#include <stdlib.h> 25#include <stdlib.h>
27#include <stdio.h> 26#include <stdio.h>
28#include <string.h> 27#include <string.h>
28#include "evas-common.h"
29 29
30#define WIDTH 320 30#define WIDTH 320
31#define HEIGHT 480 31#define HEIGHT 480
@@ -45,7 +45,7 @@ static const char commands[] = \
45 "\ts - print current hints information\n" 45 "\ts - print current hints information\n"
46 "\th - print help\n"; 46 "\th - print help\n";
47 47
48static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png"; 48static const char *border_img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/red.png";
49 49
50struct coord_tuple 50struct coord_tuple
51{ 51{
diff --git a/src/examples/evas/evas-images.c b/src/examples/evas/evas-images.c
index d924d25..851b0d6 100644
--- a/src/examples/evas/evas-images.c
+++ b/src/examples/evas/evas-images.c
@@ -9,6 +9,7 @@
9 * gcc -o evas-images evas-images.c `pkg-config --libs --cflags evas ecore ecore-evas` 9 * gcc -o evas-images evas-images.c `pkg-config --libs --cflags evas ecore ecore-evas`
10 * @endverbatim 10 * @endverbatim
11 */ 11 */
12//TODO: Fix warnings.
12 13
13#ifdef HAVE_CONFIG_H 14#ifdef HAVE_CONFIG_H
14#include "config.h" 15#include "config.h"
@@ -20,12 +21,13 @@
20#include <Ecore_Evas.h> 21#include <Ecore_Evas.h>
21#include <stdio.h> 22#include <stdio.h>
22#include <errno.h> 23#include <errno.h>
24#include "evas-common.h"
23 25
24#define WIDTH (320) 26#define WIDTH (320)
25#define HEIGHT (240) 27#define HEIGHT (240)
26 28
27static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png"; 29static const char *border_img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/red.png";
28static const char *valid_path = PACKAGE_EXAMPLES_DIR "/enlightenment.png"; 30static const char *valid_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/enlightenment.png";
29static const char *bogus_path = "/tmp/non-existent-220986.png"; 31static const char *bogus_path = "/tmp/non-existent-220986.png";
30static const char *commands = \ 32static const char *commands = \
31 "commands are:\n" 33 "commands are:\n"
diff --git a/src/examples/evas/evas-images2.c b/src/examples/evas/evas-images2.c
index f441301..45d7a4f 100644
--- a/src/examples/evas/evas-images2.c
+++ b/src/examples/evas/evas-images2.c
@@ -9,6 +9,7 @@
9 * gcc -o evas-images2 evas-images2.c `pkg-config --libs --cflags evas ecore ecore-evas` 9 * gcc -o evas-images2 evas-images2.c `pkg-config --libs --cflags evas ecore ecore-evas`
10 * @endverbatim 10 * @endverbatim
11 */ 11 */
12//TODO: Fix warnings
12 13
13#ifdef HAVE_CONFIG_H 14#ifdef HAVE_CONFIG_H
14#include "config.h" 15#include "config.h"
@@ -20,11 +21,12 @@
20#include <Ecore_Evas.h> 21#include <Ecore_Evas.h>
21#include <stdio.h> 22#include <stdio.h>
22#include <errno.h> 23#include <errno.h>
24#include "evas-common.h"
23 25
24#define WIDTH (320) 26#define WIDTH (320)
25#define HEIGHT (240) 27#define HEIGHT (240)
26 28
27static const char *img_path = PACKAGE_EXAMPLES_DIR "/enlightenment.png"; 29static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/enlightenment.png";
28static const char *commands = \ 30static const char *commands = \
29 "commands are:\n" 31 "commands are:\n"
30 "\tp - change proxy image's source\n" 32 "\tp - change proxy image's source\n"
diff --git a/src/examples/evas/evas-images3.c b/src/examples/evas/evas-images3.c
index 52e2656..7bd68f8 100644
--- a/src/examples/evas/evas-images3.c
+++ b/src/examples/evas/evas-images3.c
@@ -9,6 +9,7 @@
9 * gcc -o evas-images3 evas-images3.c `pkg-config --libs --cflags evas ecore ecore-evas` 9 * gcc -o evas-images3 evas-images3.c `pkg-config --libs --cflags evas ecore ecore-evas`
10 * @endverbatim 10 * @endverbatim
11 */ 11 */
12//TODO: Fix warnings.
12 13
13#ifdef HAVE_CONFIG_H 14#ifdef HAVE_CONFIG_H
14#include "config.h" 15#include "config.h"
@@ -20,11 +21,12 @@
20#include <Ecore_Evas.h> 21#include <Ecore_Evas.h>
21#include <stdio.h> 22#include <stdio.h>
22#include <errno.h> 23#include <errno.h>
24#include "evas-common.h"
23 25
24#define WIDTH (320) 26#define WIDTH (320)
25#define HEIGHT (240) 27#define HEIGHT (240)
26 28
27static const char *img_path = PACKAGE_EXAMPLES_DIR "/enlightenment.png"; 29static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/enlightenment.png";
28static const char *commands = \ 30static const char *commands = \
29 "commands are:\n" 31 "commands are:\n"
30 "\tw - write new pixel data to image\n" 32 "\tw - write new pixel data to image\n"
diff --git a/src/examples/evas/evas-images4.c b/src/examples/evas/evas-images4.c
index 391664e..0bb51fa 100644
--- a/src/examples/evas/evas-images4.c
+++ b/src/examples/evas/evas-images4.c
@@ -9,6 +9,7 @@
9 * gcc -o evas-images4 evas-images4.c `pkg-config --libs --cflags evas ecore ecore-evas` 9 * gcc -o evas-images4 evas-images4.c `pkg-config --libs --cflags evas ecore ecore-evas`
10 * @endverbatim 10 * @endverbatim
11 */ 11 */
12//TODO: Fix warnings.
12 13
13#ifdef HAVE_CONFIG_H 14#ifdef HAVE_CONFIG_H
14#include "config.h" 15#include "config.h"
@@ -20,11 +21,12 @@
20#include <Ecore_Evas.h> 21#include <Ecore_Evas.h>
21#include <stdio.h> 22#include <stdio.h>
22#include <errno.h> 23#include <errno.h>
24#include "evas-common.h"
23 25
24#define WIDTH (320) 26#define WIDTH (320)
25#define HEIGHT (240) 27#define HEIGHT (240)
26 28
27static const char *img_path = PACKAGE_EXAMPLES_DIR "/im1.png"; 29static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/im1.png";
28static const char *commands = \ 30static const char *commands = \
29 "commands are:\n" 31 "commands are:\n"
30 "\tp - print image fill property\n" 32 "\tp - print image fill property\n"
diff --git a/src/examples/evas/evas-map-aa.c b/src/examples/evas/evas-map-aa.c
index c396543..61413e9 100644
--- a/src/examples/evas/evas-map-aa.c
+++ b/src/examples/evas/evas-map-aa.c
@@ -15,10 +15,10 @@
15 15
16#include <Ecore.h> 16#include <Ecore.h>
17#include <Ecore_Evas.h> 17#include <Ecore_Evas.h>
18
19#include <stdlib.h> 18#include <stdlib.h>
20#include <stdio.h> 19#include <stdio.h>
21#include <string.h> 20#include <string.h>
21#include "evas-common.h"
22 22
23#define WIDTH (800) 23#define WIDTH (800)
24#define HEIGHT (400) 24#define HEIGHT (400)
@@ -44,6 +44,8 @@ struct exemple_data
44 Eina_Bool image; 44 Eina_Bool image;
45}; 45};
46 46
47static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/cube1.png";
48
47static struct exemple_data d = 49static struct exemple_data d =
48{ NULL, NULL, NULL, NULL, NULL, 62, 62, 262, 62, 262, 262, 62, 262, 50{ NULL, NULL, NULL, NULL, NULL, 62, 62, 262, 62, 262, 262, 62, 262,
49 EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE }; 51 EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE };
@@ -225,14 +227,14 @@ _on_keydown(void *data EINA_UNUSED, Evas *e, Evas_Object *obj EINA_UNUSED,
225 { 227 {
226 evas_object_del(d.target1); 228 evas_object_del(d.target1);
227 d.target1 = evas_object_image_filled_add(e); 229 d.target1 = evas_object_image_filled_add(e);
228 evas_object_image_file_set(d.target1, "cube1.png", NULL); 230 evas_object_image_file_set(d.target1, img_path, NULL);
229 evas_object_image_smooth_scale_set(d.target1, 0); 231 evas_object_image_smooth_scale_set(d.target1, 0);
230 evas_object_resize(d.target1, 200, 200); 232 evas_object_resize(d.target1, 200, 200);
231 evas_object_show(d.target1); 233 evas_object_show(d.target1);
232 234
233 evas_object_del(d.target2); 235 evas_object_del(d.target2);
234 d.target2 = evas_object_image_filled_add(e); 236 d.target2 = evas_object_image_filled_add(e);
235 evas_object_image_file_set(d.target2, "cube1.png", NULL); 237 evas_object_image_file_set(d.target2, img_path, NULL);
236 evas_object_image_smooth_scale_set(d.target2, 0); 238 evas_object_image_smooth_scale_set(d.target2, 0);
237 evas_object_anti_alias_set(d.target2, EINA_TRUE); 239 evas_object_anti_alias_set(d.target2, EINA_TRUE);
238 evas_object_resize(d.target2, 200, 200); 240 evas_object_resize(d.target2, 200, 200);
diff --git a/src/examples/evas/evas-map-utils.c b/src/examples/evas/evas-map-utils.c
index 644968c4..766cf11 100644
--- a/src/examples/evas/evas-map-utils.c
+++ b/src/examples/evas/evas-map-utils.c
@@ -22,6 +22,7 @@
22#include <stdio.h> 22#include <stdio.h>
23#include <string.h> 23#include <string.h>
24#include <math.h> 24#include <math.h>
25#include "evas-common.h"
25 26
26#define WIDTH 480 27#define WIDTH 480
27#define HEIGHT 480 28#define HEIGHT 480
@@ -42,6 +43,10 @@ typedef struct
42 Eina_Bool apply_lighting : 1; 43 Eina_Bool apply_lighting : 1;
43} App_Data; 44} App_Data;
44 45
46static const char *img1_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/cube1.png";
47static const char *img2_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/enlightenment.png";
48static const char *img3_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/im1.png";
49
45static const char *help_string = 50static const char *help_string =
46 "Valid commands:\n" 51 "Valid commands:\n"
47 "\ta - toggle alpha for maps\n" 52 "\ta - toggle alpha for maps\n"
@@ -271,7 +276,7 @@ main(void)
271 d.canvas = ecore_evas_get(d.ee); 276 d.canvas = ecore_evas_get(d.ee);
272 277
273 bg = evas_object_image_filled_add(d.canvas); 278 bg = evas_object_image_filled_add(d.canvas);
274 evas_object_image_file_set(bg, "cube1.png", NULL); 279 evas_object_image_file_set(bg, img1_path, NULL);
275 ecore_evas_object_associate(d.ee, bg, 0); 280 ecore_evas_object_associate(d.ee, bg, 0);
276 evas_object_focus_set(bg, EINA_TRUE); 281 evas_object_focus_set(bg, EINA_TRUE);
277 evas_object_move(bg, 0, 0); 282 evas_object_move(bg, 0, 0);
@@ -285,16 +290,16 @@ main(void)
285 290
286 o = evas_object_image_filled_add(d.canvas); 291 o = evas_object_image_filled_add(d.canvas);
287 evas_object_name_set(o, "obj2"); 292 evas_object_name_set(o, "obj2");
288 evas_object_image_file_set(o, "enlightenment.png", NULL); 293 evas_object_image_file_set(o, img2_path, NULL);
289 evas_object_show(o); 294 evas_object_show(o);
290 295
291 o = evas_object_image_filled_add(d.canvas); 296 o = evas_object_image_filled_add(d.canvas);
292 evas_object_name_set(o, "obj3"); 297 evas_object_name_set(o, "obj3");
293 evas_object_image_file_set(o, "enlightenment.png", NULL); 298 evas_object_image_file_set(o, img2_path, NULL);
294 evas_object_show(o); 299 evas_object_show(o);
295 300
296 osrc = evas_object_image_filled_add(d.canvas); 301 osrc = evas_object_image_filled_add(d.canvas);
297 evas_object_image_file_set(osrc, "im1.png", NULL); 302 evas_object_image_file_set(osrc, img3_path, NULL);
298 evas_object_name_set(osrc, "obj4_source"); 303 evas_object_name_set(osrc, "obj4_source");
299 evas_object_show(osrc); 304 evas_object_show(osrc);
300 305
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 5191347..2b0bfbe 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -12,6 +12,7 @@
12 * gcc -o evas-object-manipulation-eo evas-object-manipulation-eo.c `pkg-config --libs --cflags ecore evas ecore-evas eo` 12 * gcc -o evas-object-manipulation-eo evas-object-manipulation-eo.c `pkg-config --libs --cflags ecore evas ecore-evas eo`
13 * @endverbatim 13 * @endverbatim
14 */ 14 */
15//TODO: Fix error and warning.
15 16
16#ifdef HAVE_CONFIG_H 17#ifdef HAVE_CONFIG_H
17#include "config.h" 18#include "config.h"
diff --git a/src/examples/evas/evas-object-manipulation.c b/src/examples/evas/evas-object-manipulation.c
index d52f221..e6eaa18 100644
--- a/src/examples/evas/evas-object-manipulation.c
+++ b/src/examples/evas/evas-object-manipulation.c
@@ -20,12 +20,13 @@
20#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
21#include <stdio.h> 21#include <stdio.h>
22#include <errno.h> 22#include <errno.h>
23#include "evas-common.h"
23 24
24#define WIDTH (320) 25#define WIDTH (320)
25#define HEIGHT (240) 26#define HEIGHT (240)
26 27
27static const char *img_path = PACKAGE_EXAMPLES_DIR "/enlightenment.png"; 28static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/enlightenment.png";
28static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png"; 29static const char *border_img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/red.png";
29 30
30struct test_data 31struct test_data
31{ 32{
diff --git a/src/examples/evas/evas-smart-object.c b/src/examples/evas/evas-smart-object.c
index 3df08be..5cece8e 100644
--- a/src/examples/evas/evas-smart-object.c
+++ b/src/examples/evas/evas-smart-object.c
@@ -8,9 +8,9 @@
8 * gcc -o evas-smart-object evas-smart-object.c `pkg-config --libs --cflags evas ecore ecore-evas` 8 * gcc -o evas-smart-object evas-smart-object.c `pkg-config --libs --cflags evas ecore ecore-evas`
9 * @endverbatim 9 * @endverbatim
10 */ 10 */
11//TODO: Fix warnings.
11 12
12#ifdef HAVE_CONFIG_H 13#ifdef HAVE_CONFIG_H
13
14#include "config.h" 14#include "config.h"
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
@@ -20,6 +20,7 @@
20#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
21#include <stdio.h> 21#include <stdio.h>
22#include <errno.h> 22#include <errno.h>
23#include "evas-common.h"
23 24
24#define WIDTH (320) 25#define WIDTH (320)
25#define HEIGHT (240) 26#define HEIGHT (240)
@@ -84,7 +85,7 @@ _index_to_color(int i)
84} 85}
85 86
86static struct test_data d = {0}; 87static struct test_data d = {0};
87static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png"; 88static const char *border_img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/red.png";
88 89
89#define _evas_smart_example_type "Evas_Smart_Example" 90#define _evas_smart_example_type "Evas_Smart_Example"
90#define EVT_CHILDREN_NUMBER_CHANGED "children,changed" 91#define EVT_CHILDREN_NUMBER_CHANGED "children,changed"
diff --git a/src/examples/evas/cube1.png b/src/examples/evas/resources/images/cube1.png
index c2f4fda..c2f4fda 100644
--- a/src/examples/evas/cube1.png
+++ b/src/examples/evas/resources/images/cube1.png
Binary files differ
diff --git a/src/examples/evas/enlightenment.png b/src/examples/evas/resources/images/enlightenment.png
index aeb836b..aeb836b 100644
--- a/src/examples/evas/enlightenment.png
+++ b/src/examples/evas/resources/images/enlightenment.png
Binary files differ
diff --git a/src/examples/evas/im1.png b/src/examples/evas/resources/images/im1.png
index aa37869..aa37869 100644
--- a/src/examples/evas/im1.png
+++ b/src/examples/evas/resources/images/im1.png
Binary files differ
diff --git a/src/examples/evas/red.png b/src/examples/evas/resources/images/red.png
index dd03528..dd03528 100644
--- a/src/examples/evas/red.png
+++ b/src/examples/evas/resources/images/red.png
Binary files differ