*** empty log message ***

This commit is contained in:
hyung-hwan 2007-01-26 16:10:32 +00:00
parent 4912ada5d8
commit f01bfbbf9a
3 changed files with 29 additions and 17 deletions

View File

@ -2,11 +2,11 @@ SRCS = awk.c
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. -I$(XPKIT) CFLAGS = @CFLAGS@ -I@abs_top_builddir@/..
LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/awk -L$(XPKIT)/xp/bas LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/awk
LIBS = @LIBS@ -laseawk -lxpbas -lm LIBS = @LIBS@ -laseawk -lm
all: xpkit awk all: awk
awk: $(OBJS) awk: $(OBJS)
$(CC) -o $@ awk.o $(LDFLAGS) $(LIBS) $(CC) -o $@ awk.o $(LDFLAGS) $(LIBS)
@ -14,9 +14,6 @@ awk: $(OBJS)
clean: clean:
rm -rf *.o awk rm -rf *.o awk
xpkit:
@if [ "$(XPKIT)" = "" ]; then echo "ERROR: XPKIT not set. Check XPKIT first"; return 1; fi
.SUFFIXES: .c .o .SUFFIXES: .c .o
.c.o: .c.o:
$(CC) -c $(CFLAGS) $< $(CC) -c $(CFLAGS) $<

View File

@ -1,5 +1,5 @@
/* /*
* $Id: main.c,v 1.3 2007-01-26 16:08:54 bacon Exp $ * $Id: main.c,v 1.4 2007-01-26 16:10:32 bacon Exp $
*/ */
#include <ase/types.h> #include <ase/types.h>
@ -10,7 +10,12 @@
#include <wchar.h> #include <wchar.h>
#include <locale.h> #include <locale.h>
#if defined(ASE_CHAR_IS_WCHAR) && defined(__unix) #if defined(_WIN32)
#include <tchar.h>
#define ase_main _tmain
#elif defined(ASE_CHAR_IS_WCHAR) && defined(__unix)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { int ase_main (...); } extern "C" { int ase_main (...); }

View File

@ -1,5 +1,5 @@
/* /*
* $Id: printf.c,v 1.3 2007-01-21 13:21:14 bacon Exp $ * $Id: printf.c,v 1.4 2007-01-26 16:08:55 bacon Exp $
*/ */
#include <stdarg.h> #include <stdarg.h>
@ -10,6 +10,14 @@
#include <ctype.h> #include <ctype.h>
#include <wctype.h> #include <wctype.h>
#if defined(_WIN32)
#include <tchar.h>
#define ase_printf _tprintf
#define ase_vprintf _vtprintf
#define ase_fprintf _ftprintf
#define ase_vfprintf _vftprintf
#else
#if defined(ASE_CHAR_IS_MCHAR) #if defined(ASE_CHAR_IS_MCHAR)
#define ase_tolower(x) tolower(x) #define ase_tolower(x) tolower(x)
#define ase_isdigit(x) isdigit(x) #define ase_isdigit(x) isdigit(x)
@ -20,6 +28,8 @@
#error define ASE_CHAR_IS_MCHAR or ASE_CHAR_IS_WCHAR #error define ASE_CHAR_IS_MCHAR or ASE_CHAR_IS_WCHAR
#endif #endif
#endif
static ase_char_t* __adjust_format (const ase_char_t* format); static ase_char_t* __adjust_format (const ase_char_t* format);
int ase_vprintf (const ase_char_t* fmt, va_list ap); int ase_vprintf (const ase_char_t* fmt, va_list ap);