Changeset 190


Ignore:
Timestamp:
Nov 16, 2003, 1:13:46 PM (16 years ago)
Author:
Sam Hocevar
Message:
  • 2nd pass in the libcaca rehandling; moved sources to src/ and examples to examples/.
Location:
libcaca/trunk
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/Makefile.am

    r189 r190  
    33###############################################################################
    44
    5 SUBDIRS = libcaca test
     5SUBDIRS = src examples
    66DIST_SUBDIRS = $(SUBDIRS) autotools debian
    77
  • libcaca/trunk/configure.ac

    r189 r190  
    44
    55AC_PREREQ(2.50)
    6 AC_CONFIG_SRCDIR(src/main.c)
     6AC_CONFIG_SRCDIR(src/caca.c)
    77AC_CONFIG_AUX_DIR(autotools)
    88AC_CANONICAL_SYSTEM
     
    6161AC_OUTPUT([
    6262  Makefile
    63   libcaca/Makefile
    64   test/Makefile
     63  src/Makefile
     64  examples/Makefile
    6565  autotools/Makefile
    6666  debian/Makefile
  • libcaca/trunk/examples/Makefile.am

    r185 r190  
    33###############################################################################
    44
    5 AM_CPPFLAGS = -I$(top_srcdir)/libcaca
     5AM_CPPFLAGS = -I$(top_srcdir)/src
    66
    77if USE_SLANG
     
    1515
    1616demo_SOURCES = demo.c
    17 demo_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
     17demo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
    1818demo_CFLAGS = `pkg-config --cflags gtk+-2.0`
    1919demo_LDFLAGS = `pkg-config --libs gtk+-2.0`
    2020
    2121spritedit_SOURCES = spritedit.c
    22 spritedit_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
     22spritedit_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
    2323
  • libcaca/trunk/src/line.c

    r185 r190  
    196196    if(x < 0)
    197197        b |= (1<<0);
    198     else if(x >= caca_get_width())
     198    else if(x >= (int)caca_get_width())
    199199        b |= (1<<1);
    200200
    201201    if(y < 0)
    202202        b |= (1<<2);
    203     else if(y >= caca_get_height())
     203    else if(y >= (int)caca_get_height())
    204204        b |= (1<<3);
    205205
Note: See TracChangeset for help on using the changeset viewer.