Changeset 190Tweet

Timestamp:

Nov 16, 2003, 1:13:46 PM (19 years ago)

Author:

Sam Hocevar

Message:

• 2nd pass in the libcaca rehandling; moved sources to src/ and examples to examples/.

Location:

libcaca/trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• examples (moved) (moved from libcaca/trunk/test)
• examples/Makefile.am (modified) (2 diffs)
• src (moved) (moved from libcaca/trunk/libcaca)
• src/line.c (modified) (1 diff)

libcaca/trunk/Makefile.am

@@ -3 +3 @@
 ###############################################################################
 
-SUBDIRS = libcaca test
+SUBDIRS = src examples
 DIST_SUBDIRS = $(SUBDIRS) autotools debian
 

libcaca/trunk/configure.ac

@@ -4 +4 @@
 
 AC_PREREQ(2.50)
-AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_SRCDIR(src/caca.c)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_SYSTEM
@@ -61 +61 @@
 AC_OUTPUT([
   Makefile
-  libcaca/Makefile
-  test/Makefile
+  src/Makefile
+  examples/Makefile
   autotools/Makefile
   debian/Makefile

libcaca/trunk/examples/Makefile.am

@@ -3 +3 @@
 ###############################################################################
 
-AM_CPPFLAGS = -I$(top_srcdir)/libcaca
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 if USE_SLANG
@@ -15 +15 @@
 
 demo_SOURCES = demo.c
-demo_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+demo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 demo_CFLAGS = `pkg-config --cflags gtk+-2.0`
 demo_LDFLAGS = `pkg-config --libs gtk+-2.0`
 
 spritedit_SOURCES = spritedit.c
-spritedit_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+spritedit_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 

libcaca/trunk/src/line.c

@@ -196 +196 @@
     if(x < 0)
         b |= (1<<0);
-    else if(x >= caca_get_width())
+    else if(x >= (int)caca_get_width())
         b |= (1<<1);
 
     if(y < 0)
         b |= (1<<2);
-    else if(y >= caca_get_height())
+    else if(y >= (int)caca_get_height())
         b |= (1<<3);