evas_test now make installs :)

SVN revision: 3703
This commit is contained in:
Carsten Haitzler 2000-10-24 00:21:49 +00:00
parent 61f9e4f648
commit b81ee05c27
7 changed files with 89 additions and 18 deletions

View File

@ -177,7 +177,7 @@ AC_SUBST(ttf_includes)
AC_SUBST(ttf_libs)
AC_OUTPUT([
Makefile src/Makefile test/Makefile evas-config doc/Makefile
Makefile src/Makefile test/Makefile test/img/Makefile test/fnt/Makefile evas-config doc/Makefile
], [
chmod +x evas-config
])

View File

@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{prefix}/lib/libevas.so.*
#%{prefix}/bin/evas_test
%{prefix}/bin/evas_*
%{prefix}/share/evas/*
%files devel

View File

@ -3,9 +3,14 @@ CFLAGS_EXTRA = -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src -I/usr/local
CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_EXTRA)
INCLUDES = $(CFLGAS_ALL)
SUBDIRS = fnt img
noinst_PROGRAMS = evas_test evas_test_old
INCLUDES = $(CFLGAS_ALL) \
-DLIBDIR=\"$(libdir)\" \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\"
bin_PROGRAMS = evas_test evas_test_old
evas_test_DEPENDENCIES = $(top_srcdir)/src/libevas.la

View File

@ -8,8 +8,8 @@
#include <math.h>
/* defines */
#define IMGDIR "./img/"
#define FNTDIR "./fnt"
#define IMGDIR DATADIR"/evas/img/"
#define FNTDIR DATADIR"/evas/fnt/"
#ifndef SPANS_COMMON
#define SPANS_COMMON(x1, w1, x2, w2) \

View File

@ -5,6 +5,9 @@
#include <unistd.h>
#include <math.h>
#define IMGDIR DATADIR"/evas/img/"
#define FNTDIR DATADIR"/evas/fnt/"
double get_time(void);
double
@ -83,14 +86,14 @@ main(int argc, char **argv)
char *save_file = NULL;
char *imgs[8] =
{
"img/mush.png",
"img/book.png",
"img/bulb.png",
"img/term.png",
"img/calc.png",
"img/worlds.png",
"img/spider.png",
"img/mouse.png"
IMGDIR"mush.png",
IMGDIR"book.png",
IMGDIR"bulb.png",
IMGDIR"term.png",
IMGDIR"calc.png",
IMGDIR"worlds.png",
IMGDIR"spider.png",
IMGDIR"mouse.png"
};
win_w = 640; win_h = 480;
@ -188,7 +191,7 @@ main(int argc, char **argv)
XMapWindow(d, win);
XSync(d, False);
}
evas_font_add_path(e, "./fnt");
evas_font_add_path(e, FNTDIR);
evas_set_output(e, d, win, vis, cmap);
evas_set_output_size(e, win_w, win_h);
evas_set_output_viewport(e, 0, 0, win_w, win_h);
@ -196,9 +199,9 @@ main(int argc, char **argv)
evas_set_font_cache(e, 1 * 1024 * 1024);
evas_set_image_cache(e, 8 * 1024 * 1024);
o[0] = evas_add_image_from_file(e, "img/sky001.png");
o[0] = evas_add_image_from_file(e, IMGDIR"sky001.png");
evas_show(e, o[0]);
o[1] = evas_add_image_from_file(e, "img/logo001.png");
o[1] = evas_add_image_from_file(e, IMGDIR"logo001.png");
evas_get_image_size(e, o[1], &w, &h);
evas_callback_add(e, o[1], CALLBACK_MOUSE_DOWN, mouse_down, NULL);
evas_callback_add(e, o[1], CALLBACK_MOUSE_UP, mouse_up, NULL);
@ -211,7 +214,7 @@ main(int argc, char **argv)
for (i = 2 ; i < 120; i++)
{
o[i] = evas_add_image_from_file(e, "img/mush.png");
o[i] = evas_add_image_from_file(e, IMGDIR"mush.png");
evas_show(e, o[i]);
evas_set_layer(e, o[i], 100);
evas_callback_add(e, o[i], CALLBACK_MOUSE_DOWN, mouse_down, NULL);

View File

@ -0,0 +1,7 @@
evasdir = $(datadir)/evas/fnt
evas_DATA = \
andover.ttf \
cinema.ttf \
grunge.ttf \
morpheus.ttf \
notepad.ttf

View File

@ -0,0 +1,56 @@
evasdir = $(datadir)/evas/img
evas_DATA = \
book.png \
bulb.png \
calc.png \
evas_icon.png \
evas_test_alpha1.png \
evas_test_alpha2.png \
evas_test_anti_alias.png \
evas_test_canvas.png \
evas_test_cheese.png \
evas_test_control_bg.png \
evas_test_control_selection1.png \
evas_test_control_selection2.png \
evas_test_image_0.png \
evas_test_image_1.png \
evas_test_image_10.png \
evas_test_image_11.png \
evas_test_image_12.png \
evas_test_image_13.png \
evas_test_image_14.png \
evas_test_image_15.png \
evas_test_image_2.png \
evas_test_image_3.png \
evas_test_image_4.png \
evas_test_image_5.png \
evas_test_image_6.png \
evas_test_image_7.png \
evas_test_image_8.png \
evas_test_image_9.png \
evas_test_mmx.png \
evas_test_pointer.png \
evas_test_pointer_big.png \
evas_test_view_bg.png \
evas_test_view_bubble.png \
evas_test_view_bubble_shadow.png \
evas_test_view_logo.png \
evas_test_view_logo_image.png \
evas_test_view_logo_image_brush.png \
evas_test_view_logo_image_paint.png \
evas_test_view_logo_impress.png \
evas_test_view_logo_shadow.png \
evas_test_wonder_1.png \
evas_test_wonder_2.png \
evas_test_wonder_3.png \
evas_test_wonder_4.png \
evas_test_wonder_5.png \
evas_test_wonder_6.png \
evas_test_wonder_7.png \
logo001.png \
mouse.png \
mush.png \
sky001.png \
spider.png \
term.png \
worlds.png