Merge in Windows port using mingw and make.

This commit is contained in:
Russ Cox
2005-10-31 15:30:23 +00:00
parent d920d42c8b
commit 5d6ebf7a53
56 changed files with 730 additions and 978 deletions

View File

@ -1,7 +1,6 @@
ROOT=..
include ../Make.config
LIB=libmemdraw.a
CC=gcc
CFLAGS=-I../include -I. -c -ggdb -D_THREAD_SAFE -pthread
O=o
OFILES=\
alloc.$O\
@ -25,8 +24,8 @@ OFILES=\
write.$O
$(LIB): $(OFILES)
ar r $(LIB) $(OFILES)
ranlib $(LIB)
$(AR) r $(LIB) $(OFILES)
$(RANLIB) $(LIB)
%.$O: %.c
$(CC) $(CFLAGS) $*.c

View File

@ -20,9 +20,9 @@ struct Seg
};
static void zsort(Seg **seg, Seg **ep);
static int ycompare(void*, void*);
static int xcompare(void*, void*);
static int zcompare(void*, void*);
static int ycompare(const void*, const void*);
static int xcompare(const void*, const void*);
static int zcompare(const void*, const void*);
static void xscan(Memimage *dst, Seg **seg, Seg *segtab, int nseg, int wind, Memimage *src, Point sp, int, int, int, int);
static void yscan(Memimage *dst, Seg **seg, Seg *segtab, int nseg, int wind, Memimage *src, Point sp, int, int);
@ -469,13 +469,13 @@ zsort(Seg **seg, Seg **ep)
}
static int
ycompare(void *a, void *b)
ycompare(const void *a, const void *b)
{
Seg **s0, **s1;
long y0, y1;
s0 = a;
s1 = b;
s0 = (Seg**)a;
s1 = (Seg**)b;
y0 = (*s0)->p0.y;
y1 = (*s1)->p0.y;
@ -487,13 +487,13 @@ ycompare(void *a, void *b)
}
static int
xcompare(void *a, void *b)
xcompare(const void *a, const void *b)
{
Seg **s0, **s1;
long x0, x1;
s0 = a;
s1 = b;
s0 = (Seg**)a;
s1 = (Seg**)b;
x0 = (*s0)->p0.x;
x1 = (*s1)->p0.x;
@ -505,13 +505,13 @@ xcompare(void *a, void *b)
}
static int
zcompare(void *a, void *b)
zcompare(const void *a, const void *b)
{
Seg **s0, **s1;
long z0, z1;
s0 = a;
s1 = b;
s0 = (Seg**)a;
s1 = (Seg**)b;
z0 = (*s0)->z;
z1 = (*s1)->z;

View File

@ -1,27 +0,0 @@
<$DSRC/mkfile-$CONF
TARG=libmemdraw.$L
OFILES=\
alloc.$O\
arc.$O\
cload.$O\
cmap.$O\
cread.$O\
defont.$O\
draw.$O\
ellipse.$O\
fillpoly.$O\
hwdraw.$O\
line.$O\
load.$O\
openmemsubfont.$O\
poly.$O\
read.$O\
string.$O\
subfont.$O\
unload.$O\
write.$O
HFILE=\
<$DSRC/mklib-$CONF