Changeset 568
- Timestamp:
- Mar 9, 2006, 1:47:37 PM (16 years ago)
- Location:
- libcaca/trunk
- Files:
-
- 8 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/Makefile.am
r543 r568 1 1 # $Id$ 2 2 3 SUBDIRS = cucul caca src test doc3 SUBDIRS = kernel cucul caca src test doc 4 4 DIST_SUBDIRS = $(SUBDIRS) autotools debian msvc 5 5 6 EXTRA_DIST = NOTES COPYING. LGPL bootstrap build-dosbuild-win32 caca-config.in libcaca.spec6 EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec 7 7 AUTOMAKE_OPTIONS = dist-bzip2 8 8 -
libcaca/trunk/caca/time.c
r536 r568 20 20 #include "config.h" 21 21 22 #i nclude <stdlib.h>23 # if defined(HAVE_SYS_TIME_H)24 # i nclude <sys/time.h>25 # endif26 # include <time.h>27 28 # if defined(USE_WIN32)29 # include <windows.h>30 # endif31 32 # if defined(HAVE_UNISTD_H)33 # include <unistd.h>22 #if !defined(__KERNEL__) 23 # include <stdlib.h> 24 # if defined(HAVE_SYS_TIME_H) 25 # include <sys/time.h> 26 # endif 27 # include <time.h> 28 # if defined(USE_WIN32) 29 # include <windows.h> 30 # endif 31 # if defined(HAVE_UNISTD_H) 32 # include <unistd.h> 33 # endif 34 34 #endif 35 35 … … 44 44 Sleep(usec / 1000); 45 45 #else 46 SLEEP46 /* SLEEP */ 47 47 #endif 48 48 } -
libcaca/trunk/configure.ac
r554 r568 12 12 AM_PROG_CC_C_O 13 13 AC_PROG_CPP 14 AM_PROG_AS 14 15 15 16 AC_LIBTOOL_WIN32_DLL … … 39 40 AC_ARG_ENABLE(network, 40 41 [ --enable-network Network support (autodetected)]) 42 AC_ARG_ENABLE(vga, 43 [ --enable-vga VGA support (default disabled)]) 41 44 42 45 dnl example programs features … … 48 51 [ --enable-doc build documentation (needs doxygen and LaTeX)]) 49 52 50 AC_CHECK_HEADERS(s ignal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h)53 AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h) 51 54 AC_CHECK_FUNCS(signal ioctl vsnprintf getenv putenv strcasecmp) 52 55 AC_CHECK_FUNCS(usleep gettimeofday) … … 169 172 fi 170 173 174 if test "${enable_vga}" = "yes"; then 175 ac_cv_my_have_vga="yes" 176 CPPFLAGS="${CPPFLAGS} -I. -D__KERNEL__ -nostdinc -include kernel/kernel.h" 177 CFLAGS="${CFLAGS} -fno-builtin -O2 -Wall" 178 CCASFLAGS="${CCASFLAGS} -I." 179 LDFLAGS="${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000" 180 AC_DEFINE(USE_VGA, 1, Define to activate the VGA backend driver) 181 CACA_DRIVERS="${CACA_DRIVERS} vga" 182 fi 183 171 184 AC_MSG_CHECKING(valid output drivers) 172 185 if test -z "${CACA_DRIVERS}"; then … … 245 258 AC_CONFIG_FILES([ 246 259 Makefile 260 kernel/Makefile 247 261 cucul/Makefile 248 262 caca/Makefile -
libcaca/trunk/cucul/bitmap.c
r540 r568 20 20 #include "config.h" 21 21 22 #if defined(HAVE_ENDIAN_H) 23 # include <endian.h> 22 #if !defined(__KERNEL__) 23 # if defined(HAVE_ENDIAN_H) 24 # include <endian.h> 25 # endif 26 # include <stdio.h> 27 # include <stdlib.h> 28 # include <limits.h> 29 # include <string.h> 24 30 #endif 25 26 #include <stdio.h>27 #include <stdlib.h>28 #include <limits.h>29 #include <string.h>30 31 31 32 #include "cucul.h" -
libcaca/trunk/cucul/box.c
r540 r568 20 20 #include "config.h" 21 21 22 #include <stdlib.h> 22 #if !defined(__KERNEL__) 23 # include <stdlib.h> 24 #endif 23 25 24 26 #include "cucul.h" -
libcaca/trunk/cucul/char.c
r540 r568 20 20 #include "config.h" 21 21 22 #include <stdio.h> /* BUFSIZ */ 23 #include <string.h> 24 #include <stdlib.h> 25 #if defined(HAVE_UNISTD_H) 26 # include <unistd.h> 27 #endif 28 #include <stdarg.h> 29 30 #if defined(HAVE_SIGNAL_H) 31 # include <signal.h> 32 #endif 33 #if defined(HAVE_SYS_IOCTL_H) 34 # include <sys/ioctl.h> 22 #if !defined(__KERNEL__) 23 # include <stdio.h> /* BUFSIZ */ 24 # include <string.h> 25 # include <stdlib.h> 26 # include <stdarg.h> 27 # if defined(HAVE_UNISTD_H) 28 # include <unistd.h> 29 # endif 30 # if defined(HAVE_SIGNAL_H) 31 # include <signal.h> 32 # endif 33 # if defined(HAVE_SYS_IOCTL_H) 34 # include <sys/ioctl.h> 35 # endif 35 36 #endif 36 37 -
libcaca/trunk/cucul/conic.c
r540 r568 21 21 #include "config.h" 22 22 23 #include <stdlib.h> 23 #if !defined(__KERNEL__) 24 # include <stdlib.h> 25 #endif 24 26 25 27 #include "cucul.h" -
libcaca/trunk/cucul/cucul.c
r560 r568 21 21 #include "config.h" 22 22 23 #include <stdlib.h> 24 #include <string.h> 23 #if !defined(__KERNEL__) 24 # include <stdlib.h> 25 # include <string.h> 26 #endif 25 27 26 28 #include "cucul.h" -
libcaca/trunk/cucul/cucul_internals.h
r560 r568 21 21 #define __CUCUL_INTERNALS_H__ 22 22 23 #if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)23 #if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__) 24 24 # include <inttypes.h> 25 #elif !defined(CUSTOM_INTTYPES) 25 #elif !defined(CUSTOM_INTTYPES) && !defined(_DOXYGEN_SKIP_ME) 26 26 # define CUSTOM_INTTYPES 27 27 typedef unsigned char uint8_t; 28 typedef unsigned charuint16_t;28 typedef unsigned short uint16_t; 29 29 typedef unsigned int uint32_t; 30 30 #endif -
libcaca/trunk/cucul/export.c
r560 r568 22 22 #include "config.h" 23 23 24 #include <stdlib.h> 25 #include <stdio.h> 26 #include <string.h> 24 #if !defined(__KERNEL__) 25 # include <stdlib.h> 26 # include <stdio.h> 27 # include <string.h> 28 #endif 27 29 28 30 #include "cucul.h" -
libcaca/trunk/cucul/line.c
r540 r568 21 21 #include "config.h" 22 22 23 #include <stdlib.h> 23 #if !defined(__KERNEL__) 24 # include <stdlib.h> 25 #endif 24 26 25 27 #include "cucul.h" -
libcaca/trunk/cucul/math.c
r540 r568 20 20 #include "config.h" 21 21 22 #include <stdlib.h> 22 #if !defined(__KERNEL__) 23 # include <stdlib.h> 24 #endif 23 25 24 26 #include "cucul.h" -
libcaca/trunk/cucul/sprite.c
r540 r568 20 20 #include "config.h" 21 21 22 #include <stdio.h> 23 #include <stdlib.h> 24 #include <string.h> 22 #if !defined(__KERNEL__) 23 # include <stdio.h> 24 # include <stdlib.h> 25 # include <string.h> 26 #endif 25 27 26 28 #include "cucul.h" -
libcaca/trunk/cucul/triangle.c
r540 r568 20 20 #include "config.h" 21 21 22 #include <stdlib.h> 22 #if !defined(__KERNEL__) 23 # include <stdlib.h> 24 #endif 23 25 24 26 #include "cucul.h" -
libcaca/trunk/src
- Property svn:ignore
-
old new 3 3 .libs 4 4 .deps 5 caca-spritedit6 caca-spritedit.exe7 5 cacaview 8 cacaview.exe9 6 cacaball 10 cacaball.exe11 7 cacafire 12 cacafire.exe13 8 cacamoir 14 cacamoir.exe15 9 cacaplas 16 cacaplas.exe10 *.exe
-
- Property svn:ignore
-
libcaca/trunk/src/aafire.c
r527 r568 25 25 #ifdef LIBCACA 26 26 #include "config.h" 27 #include <stdio.h> 28 #include <stdlib.h> 29 #include <string.h> 27 #if !defined(__KERNEL__) 28 # include <stdio.h> 29 # include <stdlib.h> 30 # include <string.h> 31 #endif 30 32 #include "caca.h" 31 33 #else
Note: See TracChangeset
for help on using the changeset viewer.