From b7ba0adba0e743af1303cfd23cf3f0a73ec188db Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 26 Feb 2009 10:41:32 +0000 Subject: [PATCH] Remove occurrences of DATADIR, it conflicts with MinGW's . Fixes ticket #51. --- examples/Makefile.am | 3 +-- examples/demo.c | 4 +--- examples/demo0.c | 4 +--- tools/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index c0b239b..f35f4ef 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,7 +1,6 @@ # $Id$ -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca \ - -DDATADIR=\"$(pkgdatadir)\" +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca noinst_PROGRAMS = blit canvas colors demo demo0 dithering driver event export figfont font font2tga frames fullwidth gamma hsv input spritedit swallow text transform truecolor unicode import diff --git a/examples/demo.c b/examples/demo.c index b5ab483..bbac7b1 100644 --- a/examples/demo.c +++ b/examples/demo.c @@ -67,9 +67,7 @@ int main(int argc, char **argv) /* Initialize data */ #if 0 - sprite = caca_load_sprite(DATADIR "/caca.txt"); - if(!sprite) - sprite = caca_load_sprite("caca.txt"); + sprite = caca_load_sprite("caca.txt"); if(!sprite) sprite = caca_load_sprite("examples/caca.txt"); #endif diff --git a/examples/demo0.c b/examples/demo0.c index 8c1f60d..c9dbe02 100644 --- a/examples/demo0.c +++ b/examples/demo0.c @@ -63,9 +63,7 @@ int main(int argc, char **argv) /* Initialize data */ #if 0 - sprite = caca_load_sprite(DATADIR "/caca.txt"); - if(!sprite) - sprite = caca_load_sprite("caca.txt"); + sprite = caca_load_sprite("caca.txt"); if(!sprite) sprite = caca_load_sprite("examples/caca.txt"); #endif diff --git a/tools/Makefile.am b/tools/Makefile.am index eb7354d..0eee617 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,7 @@ # $Id$ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \ - -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\" + -I$(top_srcdir)/caca noinst_PROGRAMS = optipal sortchars $(pango_programs)