Bladeren bron

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

Fixes ticket #51.
tags/v0.99.beta17
Sam Hocevar sam 16 jaren geleden
bovenliggende
commit
b7ba0adba0
4 gewijzigde bestanden met toevoegingen van 4 en 9 verwijderingen
  1. +1
    -2
      examples/Makefile.am
  2. +1
    -3
      examples/demo.c
  3. +1
    -3
      examples/demo0.c
  4. +1
    -1
      tools/Makefile.am

+ 1
- 2
examples/Makefile.am Bestand weergeven

@@ -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



+ 1
- 3
examples/demo.c Bestand weergeven

@@ -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


+ 1
- 3
examples/demo0.c Bestand weergeven

@@ -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


+ 1
- 1
tools/Makefile.am Bestand weergeven

@@ -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)



Laden…
Annuleren
Opslaan