summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2000-10-24 00:21:49 +0000
committerCarsten Haitzler <raster@rasterman.com>2000-10-24 00:21:49 +0000
commitb81ee05c2710a0e48a19fddfab1d5b36c9f4a811 (patch)
tree746f96834add1990a1c145ae67c48345ce4bfd61 /legacy
parent61f9e4f64859dba7cbaa0ed34d99715215a404d1 (diff)
evas_test now make installs :)
SVN revision: 3703
Diffstat (limited to '')
-rw-r--r--legacy/evas/configure.in2
-rw-r--r--legacy/evas/evas.spec2
-rw-r--r--legacy/evas/test/Makefile.am11
-rw-r--r--legacy/evas/test/evas_test.c4
-rw-r--r--legacy/evas/test/evas_test_old.c27
-rw-r--r--legacy/evas/test/fnt/Makefile.am7
-rw-r--r--legacy/evas/test/img/Makefile.am56
7 files changed, 90 insertions, 19 deletions
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index 8dfddabd03..5861bd97c2 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -177,7 +177,7 @@ AC_SUBST(ttf_includes)
177AC_SUBST(ttf_libs) 177AC_SUBST(ttf_libs)
178 178
179AC_OUTPUT([ 179AC_OUTPUT([
180Makefile src/Makefile test/Makefile evas-config doc/Makefile 180Makefile src/Makefile test/Makefile test/img/Makefile test/fnt/Makefile evas-config doc/Makefile
181], [ 181], [
182chmod +x evas-config 182chmod +x evas-config
183]) 183])
diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec
index f9b0db0f79..5e773a28ed 100644
--- a/legacy/evas/evas.spec
+++ b/legacy/evas/evas.spec
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
69%files 69%files
70%defattr(-,root,root) 70%defattr(-,root,root)
71%{prefix}/lib/libevas.so.* 71%{prefix}/lib/libevas.so.*
72#%{prefix}/bin/evas_test 72%{prefix}/bin/evas_*
73%{prefix}/share/evas/* 73%{prefix}/share/evas/*
74 74
75%files devel 75%files devel
diff --git a/legacy/evas/test/Makefile.am b/legacy/evas/test/Makefile.am
index 40378992de..b2e26a97f6 100644
--- a/legacy/evas/test/Makefile.am
+++ b/legacy/evas/test/Makefile.am
@@ -3,9 +3,14 @@ CFLAGS_EXTRA = -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src -I/usr/local
3 3
4CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_EXTRA) 4CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_EXTRA)
5 5
6INCLUDES = $(CFLGAS_ALL) 6SUBDIRS = fnt img
7 7
8noinst_PROGRAMS = evas_test evas_test_old 8INCLUDES = $(CFLGAS_ALL) \
9 -DLIBDIR=\"$(libdir)\" \
10 -DBINDIR=\"$(bindir)\" \
11 -DDATADIR=\"$(datadir)\"
12
13bin_PROGRAMS = evas_test evas_test_old
9 14
10evas_test_DEPENDENCIES = $(top_srcdir)/src/libevas.la 15evas_test_DEPENDENCIES = $(top_srcdir)/src/libevas.la
11 16
diff --git a/legacy/evas/test/evas_test.c b/legacy/evas/test/evas_test.c
index 906e146df5..349f546951 100644
--- a/legacy/evas/test/evas_test.c
+++ b/legacy/evas/test/evas_test.c
@@ -8,8 +8,8 @@
8#include <math.h> 8#include <math.h>
9 9
10/* defines */ 10/* defines */
11#define IMGDIR "./img/" 11#define IMGDIR DATADIR"/evas/img/"
12#define FNTDIR "./fnt" 12#define FNTDIR DATADIR"/evas/fnt/"
13 13
14#ifndef SPANS_COMMON 14#ifndef SPANS_COMMON
15#define SPANS_COMMON(x1, w1, x2, w2) \ 15#define SPANS_COMMON(x1, w1, x2, w2) \
diff --git a/legacy/evas/test/evas_test_old.c b/legacy/evas/test/evas_test_old.c
index 270d7a67c4..a342d2c315 100644
--- a/legacy/evas/test/evas_test_old.c
+++ b/legacy/evas/test/evas_test_old.c
@@ -5,6 +5,9 @@
5#include <unistd.h> 5#include <unistd.h>
6#include <math.h> 6#include <math.h>
7 7
8#define IMGDIR DATADIR"/evas/img/"
9#define FNTDIR DATADIR"/evas/fnt/"
10
8double get_time(void); 11double get_time(void);
9 12
10double 13double
@@ -83,14 +86,14 @@ main(int argc, char **argv)
83 char *save_file = NULL; 86 char *save_file = NULL;
84 char *imgs[8] = 87 char *imgs[8] =
85 { 88 {
86 "img/mush.png", 89 IMGDIR"mush.png",
87 "img/book.png", 90 IMGDIR"book.png",
88 "img/bulb.png", 91 IMGDIR"bulb.png",
89 "img/term.png", 92 IMGDIR"term.png",
90 "img/calc.png", 93 IMGDIR"calc.png",
91 "img/worlds.png", 94 IMGDIR"worlds.png",
92 "img/spider.png", 95 IMGDIR"spider.png",
93 "img/mouse.png" 96 IMGDIR"mouse.png"
94 }; 97 };
95 98
96 win_w = 640; win_h = 480; 99 win_w = 640; win_h = 480;
@@ -188,7 +191,7 @@ main(int argc, char **argv)
188 XMapWindow(d, win); 191 XMapWindow(d, win);
189 XSync(d, False); 192 XSync(d, False);
190 } 193 }
191 evas_font_add_path(e, "./fnt"); 194 evas_font_add_path(e, FNTDIR);
192 evas_set_output(e, d, win, vis, cmap); 195 evas_set_output(e, d, win, vis, cmap);
193 evas_set_output_size(e, win_w, win_h); 196 evas_set_output_size(e, win_w, win_h);
194 evas_set_output_viewport(e, 0, 0, win_w, win_h); 197 evas_set_output_viewport(e, 0, 0, win_w, win_h);
@@ -196,9 +199,9 @@ main(int argc, char **argv)
196 evas_set_font_cache(e, 1 * 1024 * 1024); 199 evas_set_font_cache(e, 1 * 1024 * 1024);
197 evas_set_image_cache(e, 8 * 1024 * 1024); 200 evas_set_image_cache(e, 8 * 1024 * 1024);
198 201
199 o[0] = evas_add_image_from_file(e, "img/sky001.png"); 202 o[0] = evas_add_image_from_file(e, IMGDIR"sky001.png");
200 evas_show(e, o[0]); 203 evas_show(e, o[0]);
201 o[1] = evas_add_image_from_file(e, "img/logo001.png"); 204 o[1] = evas_add_image_from_file(e, IMGDIR"logo001.png");
202 evas_get_image_size(e, o[1], &w, &h); 205 evas_get_image_size(e, o[1], &w, &h);
203 evas_callback_add(e, o[1], CALLBACK_MOUSE_DOWN, mouse_down, NULL); 206 evas_callback_add(e, o[1], CALLBACK_MOUSE_DOWN, mouse_down, NULL);
204 evas_callback_add(e, o[1], CALLBACK_MOUSE_UP, mouse_up, NULL); 207 evas_callback_add(e, o[1], CALLBACK_MOUSE_UP, mouse_up, NULL);
@@ -211,7 +214,7 @@ main(int argc, char **argv)
211 214
212 for (i = 2 ; i < 120; i++) 215 for (i = 2 ; i < 120; i++)
213 { 216 {
214 o[i] = evas_add_image_from_file(e, "img/mush.png"); 217 o[i] = evas_add_image_from_file(e, IMGDIR"mush.png");
215 evas_show(e, o[i]); 218 evas_show(e, o[i]);
216 evas_set_layer(e, o[i], 100); 219 evas_set_layer(e, o[i], 100);
217 evas_callback_add(e, o[i], CALLBACK_MOUSE_DOWN, mouse_down, NULL); 220 evas_callback_add(e, o[i], CALLBACK_MOUSE_DOWN, mouse_down, NULL);
diff --git a/legacy/evas/test/fnt/Makefile.am b/legacy/evas/test/fnt/Makefile.am
new file mode 100644
index 0000000000..9cc7724d08
--- /dev/null
+++ b/legacy/evas/test/fnt/Makefile.am
@@ -0,0 +1,7 @@
1evasdir = $(datadir)/evas/fnt
2evas_DATA = \
3andover.ttf \
4cinema.ttf \
5grunge.ttf \
6morpheus.ttf \
7notepad.ttf
diff --git a/legacy/evas/test/img/Makefile.am b/legacy/evas/test/img/Makefile.am
new file mode 100644
index 0000000000..66edb04367
--- /dev/null
+++ b/legacy/evas/test/img/Makefile.am
@@ -0,0 +1,56 @@
1evasdir = $(datadir)/evas/img
2evas_DATA = \
3book.png \
4bulb.png \
5calc.png \
6evas_icon.png \
7evas_test_alpha1.png \
8evas_test_alpha2.png \
9evas_test_anti_alias.png \
10evas_test_canvas.png \
11evas_test_cheese.png \
12evas_test_control_bg.png \
13evas_test_control_selection1.png \
14evas_test_control_selection2.png \
15evas_test_image_0.png \
16evas_test_image_1.png \
17evas_test_image_10.png \
18evas_test_image_11.png \
19evas_test_image_12.png \
20evas_test_image_13.png \
21evas_test_image_14.png \
22evas_test_image_15.png \
23evas_test_image_2.png \
24evas_test_image_3.png \
25evas_test_image_4.png \
26evas_test_image_5.png \
27evas_test_image_6.png \
28evas_test_image_7.png \
29evas_test_image_8.png \
30evas_test_image_9.png \
31evas_test_mmx.png \
32evas_test_pointer.png \
33evas_test_pointer_big.png \
34evas_test_view_bg.png \
35evas_test_view_bubble.png \
36evas_test_view_bubble_shadow.png \
37evas_test_view_logo.png \
38evas_test_view_logo_image.png \
39evas_test_view_logo_image_brush.png \
40evas_test_view_logo_image_paint.png \
41evas_test_view_logo_impress.png \
42evas_test_view_logo_shadow.png \
43evas_test_wonder_1.png \
44evas_test_wonder_2.png \
45evas_test_wonder_3.png \
46evas_test_wonder_4.png \
47evas_test_wonder_5.png \
48evas_test_wonder_6.png \
49evas_test_wonder_7.png \
50logo001.png \
51mouse.png \
52mush.png \
53sky001.png \
54spider.png \
55term.png \
56worlds.png