|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
diff -ru figlet-2.2.5.old/figlet.c figlet-2.2.5/figlet.c
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
--- figlet-2.2.5.old/figlet.c 2012-06-01 14:51:09.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
@@ -66,10 +66,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#include <sys/stat.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#include <fcntl.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-#ifdef unix
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#include <unistd.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#include <sys/ioctl.h> /* Needed for get_columns */
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#ifdef TLF_FONTS
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#include <wchar.h>
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
diff -ru figlet-2.2.5.old/Makefile figlet-2.2.5/Makefile
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
--- figlet-2.2.5.old/Makefile 2012-06-01 14:51:09.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
@@ -19,17 +19,17 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
SHELL = /bin/sh
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
# The C compiler and linker to use
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-CC = gcc
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-CFLAGS = -g -O2 -Wall
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-LD = gcc
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-LDFLAGS =
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+CC ?= gcc
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+CFLAGS ?= -g -O2 -Wall
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+LD ?= gcc
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+LDFLAGS ?=
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
# Feature flags:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
# define TLF_FONTS to use TOIlet TLF fonts
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
XCFLAGS = -DTLF_FONTS
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
# Where to install files
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-prefix = /usr/local
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+prefix ?=
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
BINDIR = $(prefix)/bin
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
diff -ru figlet-2.2.5.old/utf8.h figlet-2.2.5/utf8.h
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
--- figlet-2.2.5.old/utf8.h 2012-06-01 14:51:10.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
@@ -27,13 +27,17 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#define UTF8_IGNORE_ERROR 0x01
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#define UTF8_SKIP_BOM 0x02
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-__BEGIN_DECLS
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+#ifdef __cplusplus
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+extern "C" {
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
size_t utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
size_t outsize, int flags);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
size_t wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
size_t outsize, int flags);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
-__END_DECLS
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+#ifdef __cplusplus
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
+#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
a1fc14 |
#endif
|