Changeset 3404


Ignore:
Timestamp:
Feb 26, 2009, 11:41:32 AM (11 years ago)
Author:
Sam Hocevar
Message:

Remove occurrences of DATADIR, it conflicts with MinGW's <objidl.h>.
Fixes ticket #51.

Location:
libcaca/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • libcaca/trunk/examples/Makefile.am

    r2860 r3404  
    11# $Id$
    22
    3 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca \
    4                 -DDATADIR=\"$(pkgdatadir)\"
     3AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I$(top_builddir)/caca
    54
    65noinst_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

  • libcaca/trunk/examples/demo.c

    r2821 r3404  
    6868    /* Initialize data */
    6969#if 0
    70     sprite = caca_load_sprite(DATADIR "/caca.txt");
    71     if(!sprite)
    72         sprite = caca_load_sprite("caca.txt");
     70    sprite = caca_load_sprite("caca.txt");
    7371    if(!sprite)
    7472        sprite = caca_load_sprite("examples/caca.txt");

  • libcaca/trunk/examples/demo0.c

    r2101 r3404  
    6464    /* Initialize data */
    6565#if 0
    66     sprite = caca_load_sprite(DATADIR "/caca.txt");
    67     if(!sprite)
    68         sprite = caca_load_sprite("caca.txt");
     66    sprite = caca_load_sprite("caca.txt");
    6967    if(!sprite)
    7068        sprite = caca_load_sprite("examples/caca.txt");

  • libcaca/trunk/tools/Makefile.am

    r2821 r3404  
    22
    33AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
    4               -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
     4              -I$(top_srcdir)/caca
    55
    66noinst_PROGRAMS = optipal sortchars $(pango_programs)
Note: See TracChangeset for help on using the changeset viewer.