Small patches to integrate under Win

4 files changed, 16 insertions, 950 deletions

diff --git a/libtess/Makefile b/libtess/Makefile
deleted file mode 100644
index 08c7805..0000000
--- a/libtess/Makefile
+++ /dev/null
@@ -1,946 +0,0 @@
-# Makefile generated by imake - do not edit!
-# $Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $
-
-# ----------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and <Imakefile>
-# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-#
-#
-#
-#
-# $XFree86: xc/config/cf/Imake.tmpl,v 3.102 2001/04/26 21:09:38 dawes Exp $
-# ----------------------------------------------------------------------
-
-all::
-
-.SUFFIXES: .i
-
-# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
-
-# $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/18 16:13:17 dawes Exp $
-
-# Keep cpp from replacing path elements containing i486/i586/i686
-
-#  for compatibility with 3.3.x
-
-# -----------------------------------------------------------------------
-# site-specific configuration parameters that need to come before
-# the platform-specific parameters - edit site.def to change
-
-# site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-
-# site:  $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $
-
-# $XFree86: xc/config/cf/xf86site.def,v 3.172 2001/02/26 18:27:56 dawes Exp $
-
-# ----------------------------------------------------------------------
-# platform-specific configuration parameters - edit linux.cf to change
-
-# platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-# platform:  $XFree86: xc/config/cf/linux.cf,v 3.165 2001/04/19 19:54:43 dawes Exp $
-
-# operating system:  Linux 2.4.19 i686 [ELF] (2.4.19)
-# libc:	(6.2.5)
-# binutils:	(32)
-
-# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-# $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $
-
-# $XFree86: xc/config/cf/xfree86.cf,v 3.360 2001/05/19 00:26:41 dawes Exp $
-
-# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
-
-AFB_DEFS = -DUSE_AFB
-
-DRIVERSDKDIR = $(USRLIBDIR)/Server
-DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
-DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
-
-       XF86SRC = $(SERVERSRC)/hw/xfree86
-    XF86COMSRC = $(XF86SRC)/common
- XF86PARSERSRC = $(XF86SRC)/parser
-     XF86OSSRC = $(XF86SRC)/os-support
- XF86DRIVERSRC = $(XF86SRC)/drivers
-     DRIVERSRC = $(XF86DRIVERSRC)
-
-        XFREE86DOCDIR = $(DOCDIR)
-      XFREE86PSDOCDIR = $(DOCPSDIR)
-    XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
-XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
-
-# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-# $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $
-
-# ----------------------------------------------------------------------
-# site-specific configuration parameters that go after
-# the platform-specific parameters - edit site.def to change
-
-# site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-
-# site:  $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $
-
-# ---------------------------------------------------------------------
-# Imake rules for building libraries, programs, scripts, and data files
-# rules:  $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-#
-#
-#
-#
-# rules:  $XFree86: xc/config/cf/Imake.rules,v 3.94.2.1 2001/07/28 15:06:39 dawes Exp $
-
- _NULLCMD_ = @ echo -n
-
-GLIDE2INCDIR = /usr/include/glide
-
-GLIDE3INCDIR = /usr/include/glide3
-
-GLIDE3LIBNAME = glide3
-
-TKLIBNAME = tk8.3
-
-TKLIBDIR = /usr/lib
-
-TCLLIBNAME = tcl8.3
-
-TCLIBDIR = /usr/lib
-
-          PATHSEP = /
-            SHELL = /bin/sh -e
-
-              TOP = .
-      CURRENT_DIR = .
-
-            IMAKE = imake
-           DEPEND = gccmakedep
-        MKDIRHIER = mkdir -p
-          REVPATH = revpath
-    EXPORTLISTGEN =
-             RMAN = RmanCmd
-      RMANOPTIONS = RmanOptions
-        CONFIGSRC = $(TOP)/config
-         IMAKESRC = $(CONFIGSRC)/imake
-        DEPENDSRC = $(CONFIGSRC)/util
-
-          INCROOT = /usr/X11R6/include
-        USRLIBDIR = /usr/X11R6/lib
-           VARDIR = /var
-        VARLIBDIR = $(VARDIR)/lib
-  SYSTEMUSRLIBDIR = /usr/lib
-  SYSTEMUSRINCDIR = /usr/include
-         SHLIBDIR = /usr/X11R6/lib
-       LINTLIBDIR = $(USRLIBDIR)/lint
-          MANPATH = /usr/X11R6/man
-    MANSOURCEPATH = $(MANPATH)/man
-           MANDIR = $(MANSOURCEPATH)1
-        LIBMANDIR = $(MANSOURCEPATH)3
-       FILEMANDIR = $(MANSOURCEPATH)5
-       MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX)
-     DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
-     LOGDIRECTORY = $(VARDIR)/log
-
-        VARRUNDIR = $(VARDIR)/run
-
-         VARDBDIR = $(VARDIR)/lib
-
-               AR = ar clq
-  BOOTSTRAPCFLAGS =
-               CC = gcc
-               AS = as
-
-.SUFFIXES: .cc
-
-              CXX = c++
-          CXXFILT = c++filt
-           CXXLIB =
-    CXXDEBUGFLAGS = -O2 -fno-strength-reduce
-CXXDEPENDINCLUDES =
- CXXEXTRA_DEFINES =
-CXXEXTRA_INCLUDES =
-   CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE    $(CXXPROJECT_DEFINES)
-       CXXOPTIONS =
-      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
-       CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
-
-         COMPRESS = compress
-          GZIPCMD = gzip
-              CPP = /lib/cpp $(STD_CPP_DEFINES)
-           RAWCPP = /lib/cpp -undef $(STD_CPP_OPTIONS)
-    PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
-          INSTALL = install
-     INSTALLFLAGS = -c
-               LD = ld
-              LEX = flex -l
-               M4 = m4
-          M4FLAGS =
-           LEXLIB = -lfl
-             YACC = bison -y
-           CCYACC = bison -y
-             LINT = lint
-      LINTLIBFLAG = -C
-         LINTOPTS = -axz
-               LN = ln -s
-             MAKE = make
-               MV = mv -f
-               CP = cp
-
-           RANLIB = ranlib
-  RANLIBINSTFLAGS =
-
-               RM = rm -f
-             PERL = perl
-         PERLOPTS =
-        MANSUFFIX = 1x
-     LIBMANSUFFIX = 3x
-    FILEMANSUFFIX = 5x
-    MISCMANSUFFIX = 7
-  DRIVERMANSUFFIX = 4
-     MANSRCSUFFIX = man
-     MANNEWSUFFIX = _man
-          MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS)
-
-   COMPRESSMANCMD = gzip -n
-
-            TROFF = groff -Tps
-            NROFF = nroff
-         MSMACROS = -ms
-        MANMACROS = -man
-              TBL = tbl
-              EQN = eqn
-             NEQN = neqn
-              COL = col
-         COLFLAGS = -b
-            MODCC = gcc
-           MODCPP = /lib/cpp
-        MODCFLAGS = $(CFLAGS)
-            MODAS = as
-       MODASFLAGS =
-            MODLD = ld
-       MODLDFLAGS =
-MODLDCOMBINEFLAGS = -r
-            MODAR = ar clq
-        MODRANLIB = ranlib
-
-            DVIPS = dvips
-            LATEX = latex
-
-     STD_INCLUDES =
-  STD_CPP_OPTIONS = -traditional
-  STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE    $(PROJECT_DEFINES)
-      STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE    $(PROJECT_DEFINES)
- EXTRA_LOAD_FLAGS =
-  EXTRA_LDOPTIONS =
-  EXTRA_LIBRARIES =
-             TAGS = ctags
-
-   PARALLELMFLAGS =
-
-    SHAREDCODEDEF =
-         SHLIBDEF =
-
-     SHLIBLDFLAGS = -shared
-
-         PICFLAGS = -fPIC
-
-      CXXPICFLAGS = -fPIC
-
-    PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
-
-     INSTPGMFLAGS =
-
-     INSTBINFLAGS = -m 0755
-     INSTUIDFLAGS = -m 4711
-     INSTLIBFLAGS = -m 0644
-     INSTINCFLAGS = -m 0444
-     INSTMANFLAGS = -m 0444
-     INSTDATFLAGS = -m 0444
-    INSTKMEMFLAGS = -m 4711
-
-      PROJECTROOT = /usr/X11R6
-
-      CDEBUGFLAGS = -O2 -fno-strength-reduce
-        CCOPTIONS =
-
-      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-         LDPRELIB = -L$(USRLIBDIR)
-        LDPOSTLIB =
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-     CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
-           LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-
-           CCLINK = $(CC)
-
-          CXXLINK = $(CXX)
-
-     LDSTRIPFLAGS = -x
-   LDCOMBINEFLAGS = -r
-      DEPENDFLAGS =
-   DEPEND_DEFINES = -DUSE_MAKEDEPEND
-
-# Not sure this belongs here
-         TKLIBDIR = /usr/lib
-         TKINCDIR = /usr/include
-        TKLIBNAME = tk8.3
-        TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
-        TCLLIBDIR = /usr/lib
-        TCLINCDIR = /usr/include
-       TCLLIBNAME = tcl8.3
-       TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
-
-        MACROFILE = linux.cf
-           RM_CMD = $(RM)
-
-    IMAKE_DEFINES =
-
-         IRULESRC = $(CONFIGDIR)
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-
-     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl 			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) 			$(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
-
-# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-
-# $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $
-
-# ----------------------------------------------------------------------
-# X Window System Build Parameters and Rules
-# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
-#
-#
-#
-#
-# $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.2 2001/05/29 18:21:57 dawes Exp $
-
-XORGRELSTRING = Release 6.5
-XORGMANNAME = X Version 11
-
-VENDORMANNAME = XFree86
-VENDORMANVERSION = Version 4.1.0.1
-
-STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
-
-FCHOWN_DEFINES = -DHAS_FCHOWN
-
-# -----------------------------------------------------------------------
-# X Window System make variables; these need to be coordinated with rules
-
-             XTOP = $(TOP)
-           BINDIR = /usr/X11R6/bin
-     BUILDINCROOT = $(TOP)/exports
-      BUILDINCDIR = $(BUILDINCROOT)/include
-      BUILDINCTOP = ../..
-      BUILDLIBDIR = $(TOP)/exports/lib
-      BUILDLIBTOP = ../..
-      BUILDBINDIR = $(TOP)/exports/bin
-      BUILDBINTOP = ../..
-   BUILDMODULEDIR = $(BUILDLIBDIR)/modules
-   BUILDMODULETOP = $(BUILDLIBTOP)/..
-    XBUILDINCROOT = $(XTOP)/exports
-     XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
-     XBUILDINCTOP = ../../..
-     XBUILDBINDIR = $(XBUILDINCROOT)/bin
-           INCDIR = $(INCROOT)
-           ADMDIR = /usr/adm
-           LIBDIR = $(USRLIBDIR)/X11
-       LIBEXECDIR = /usr/X11R6/libexec
-        MODULEDIR = $(USRLIBDIR)/modules
-   TOP_X_INCLUDES =
-
-        ETCX11DIR = /etc/X11
-
-          CONFDIR = $(ETCX11DIR)
-
-           DOCDIR = $(LIBDIR)/doc
-       DOCHTMLDIR = $(DOCDIR)/html
-         DOCPSDIR = $(DOCDIR)/PostScript
-          FONTDIR = $(LIBDIR)/fonts
-     ENCODINGSDIR = $(FONTDIR)/encodings
-         XINITDIR = $(LIBDIR)/xinit
-           XDMDIR = $(LIBDIR)/xdm
-        XDMVARDIR = $(VARLIBDIR)/xdm
-           TWMDIR = $(LIBDIR)/twm
-           XSMDIR = $(LIBDIR)/xsm
-           NLSDIR = $(LIBDIR)/nls
-       XLOCALEDIR = $(LIBDIR)/locale
-        PEXAPIDIR = $(LIBDIR)/PEX
-      LBXPROXYDIR = $(LIBDIR)/lbxproxy
-  PROXYMANAGERDIR = $(LIBDIR)/proxymngr
-        XPRINTDIR = $(LIBDIR)/xserver
-      XAPPLOADDIR = /etc/X11/app-defaults
-       FONTCFLAGS = -t
-
-     INSTAPPFLAGS = $(INSTDATFLAGS)
-
-              RGB = $(BINDIR)/rgb
-            FONTC = $(BINDIR)/bdftopcf
-        MKFONTDIR = $(BINDIR)/mkfontdir
-         XFTCACHE = $(BINDIR)/xftcache
-      MKHTMLINDEX = $(BINDIR)/mkhtmlindex
-          UCS2ANY = $(BINDIR)/ucs2any.pl
-      BDFTRUNCATE = $(BINDIR)/bdftruncate.pl
-     UCSMAPPREFIX = $(FONTDIR)/util/map-
-
-     HTMLINDEXCMD = HtmlIndexCmd
-
-       DOCUTILSRC = $(XTOP)/doc/util
-        CLIENTSRC = $(TOP)/clients
-          DEMOSRC = $(TOP)/demos
-       XDOCMACROS = $(DOCUTILSRC)/macros.t
-       XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
-       PROGRAMSRC = $(TOP)/programs
-           LIBSRC = $(XTOP)/lib
-          FONTSRC = $(XTOP)/fonts
-     ENCODINGSSRC = $(FONTSRC)/encodings
-       INCLUDESRC = $(BUILDINCROOT)/include
-      XINCLUDESRC = $(INCLUDESRC)/X11
-        SERVERSRC = $(XTOP)/programs/Xserver
-       CONTRIBSRC = $(XTOP)/../contrib
-   UNSUPPORTEDSRC = $(XTOP)/unsupported
-           DOCSRC = $(XTOP)/doc
-           RGBSRC = $(XTOP)/programs/rgb
-      BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
-     MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-    FONTSERVERSRC = $(PROGRAMSRC)/xfs
-       FONTINCSRC = $(XTOP)/include/fonts
-        EXTINCSRC = $(XTOP)/include/extensions
-      FTSOURCEDIR = $(TOP)/extras/FreeType
-     XTTSOURCEDIR = $(TOP)/extras/X-TrueType
-       MESASRCDIR = $(TOP)/extras/Mesa
-  OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample
-        PSWRAPSRC = $(XTOP)/config/pswrap
-     TRANSCOMMSRC = $(LIBSRC)/xtrans
-   TRANS_INCLUDES = -I$(TRANSCOMMSRC)
- CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
-
-      XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
-    VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"'
-
-       XENVLIBDIR = $(USRLIBDIR)
-   CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
-
-# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $
-
-          XLIBSRC = $(LIBSRC)/X11
-
-SOXLIBREV = 6.2
-DEPXONLYLIB =
-XONLYLIB =  -lX11
-
-LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
-
-         XLIBONLY = $(XONLYLIB)
-
-      XEXTLIBSRC = $(LIBSRC)/Xext
-
-SOXEXTREV = 6.4
-DEPEXTENSIONLIB =
-EXTENSIONLIB =  -lXext
-
-LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln
-
-LINTEXTENSIONLIB = $(LINTEXTENSION)
-          DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
-             XLIB = $(EXTENSIONLIB) $(XONLYLIB)
-         LINTXLIB = $(LINTXONLYLIB)
-
-    XSSLIBSRC = $(LIBSRC)/Xss
-
-DEPXSSLIB = $(USRLIBDIR)/libXss.a
-XSSLIB =  -lXss
-
-LINTXSS = $(LINTLIBDIR)/llib-lXss.ln
-
-    XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
-
-DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a
-XXF86MISCLIB =  -lXxf86misc
-
-LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln
-
-    XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
-
-DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a
-XXF86VMLIB =  -lXxf86vm
-
-LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln
-
-    XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
-
-DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a
-XXF86DGALIB =  -lXxf86dga
-
-LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
-
-    XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
-
-DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a
-XXF86RUSHLIB =  -lXxf86rush
-
-LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln
-
-    XVLIBSRC = $(LIBSRC)/Xv
-
-DEPXVLIB = $(USRLIBDIR)/libXv.a
-XVLIB =  -lXv
-
-LINTXV = $(LINTLIBDIR)/llib-lXv.ln
-
-    XINERAMALIBSRC = $(LIBSRC)/Xinerama
-
-DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a
-XINERAMALIB =  -lXinerama
-
-LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
-
-    DPSLIBSRC = $(LIBSRC)/dps
-
-SODPSREV = 1.0
-DEPDPSLIB =
-DPSLIB =  -ldps
-
-LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
-
-    DPSTKLIBSRC = $(LIBSRC)/dpstk
-
-SODPSTKREV = 1.0
-DEPDPSTKLIB =
-DPSTKLIB =  -ldpstk
-
-LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
-
-    PSRESLIBSRC = $(LIBSRC)/psres
-
-SOPSRESREV = 1.0
-DEPPSRESLIB =
-PSRESLIB =  -lpsres
-
-LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
-
-    GLULIBSRC = $(LIBSRC)/GLU
-
-SOGLUREV = 1.3
-DEPGLULIB =
-GLULIB =  -lGLU
-
-LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln
-
-    GLXLIBSRC = $(LIBSRC)/GL
-
-SOGLREV = 1.2
-DEPGLXLIB =
-GLXLIB =  -lGL
-
-LINTGLX = $(LINTLIBDIR)/llib-lGL.ln
-
-    GLWIDGETSRC = $(LIBSRC)/GLw
-
-DEPGLWLIB = $(USRLIBDIR)/libGLw.a
-GLWLIB =  -lGLw
-
-LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln
-
-    XRENDERLIBSRC = $(LIBSRC)/Xrender
-
-SOXRENDERREV = 1.0
-DEPXRENDERLIB =
-XRENDERLIB =  -lXrender
-
-LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln
-
-    XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
-
-DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a
-XFONTCACHELIB =  -lXfontcache
-
-LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln
-
-         XAUTHSRC = $(LIBSRC)/Xau
-
-DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
-XAUTHLIB =  -lXau
-
-LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
-
-      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-
-DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
-XDMCPLIB =  -lXdmcp
-
-LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
-
-           XMUSRC = $(LIBSRC)/Xmu
-
-SOXMUREV = 6.2
-DEPXMULIB =
-XMULIB =  -lXmu
-
-LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
-
-           XMUUSRC = $(LIBSRC)/Xmuu
-
-SOXMUUREV = 1.0
-DEPXMUULIB =
-XMUULIB =  -lXmuu
-
-LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln
-
-       OLDXLIBSRC = $(LIBSRC)/oldX
-
-DEPOLDXLIB = $(USRLIBDIR)/liboldX.a
-OLDXLIB =  -loldX
-
-LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln
-
-         XPLIBSRC = $(LIBSRC)/Xp
-
-SOXPREV = 6.2
-DEPXPLIB =
-XPLIB =  -lXp
-
-LINTXP = $(LINTLIBDIR)/llib-lXp.ln
-
-       TOOLKITSRC = $(LIBSRC)/Xt
-
-SOXTREV = 6.0
-DEPXTOOLONLYLIB =
-XTOOLONLYLIB =  -lXt
-
-LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln
-
-      DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
-         XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
-     LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
-
-       XALIBSRC = $(LIBSRC)/Xa
-
-SOXAREV = 1.0
-DEPXALIB =
-XALIB =  -lXa
-
-LINTXA = $(LINTLIBDIR)/llib-lXa.ln
-
-       AWIDGETSRC = $(LIBSRC)/Xaw
-
-SOXAWREV = 7.0
-DEPXAWLIB =
-XAWLIB =  -lXaw
-
-LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
-
-       AWIDGET6SRC = $(LIBSRC)/Xaw6
-
-SOXAW6REV = 6.1
-DEPXAW6LIB =
-XAW6LIB =  -lXaw
-
-LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln
-
-         XILIBSRC = $(LIBSRC)/Xi
-
-SOXINPUTREV = 6.0
-DEPXILIB =
-XILIB =  -lXi
-
-LINTXI = $(LINTLIBDIR)/llib-lXi.ln
-
-      XTESTLIBSRC = $(LIBSRC)/Xtst
-
-SOXTESTREV = 6.1
-DEPXTESTLIB =
-XTESTLIB =  -lXtst
-
-LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
-
-        PEXLIBSRC = $(LIBSRC)/PEX5
-
-SOPEXREV = 6.0
-DEPPEXLIB =
-PEXLIB =  -lPEX5
-
-LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
-
-        XIELIBSRC = $(LIBSRC)/XIE
-
-SOXIEREV = 6.0
-DEPXIELIB =
-XIELIB =  -lXIE
-
-LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln
-
-      PHIGSLIBSRC = $(LIBSRC)/PHIGS
-
-DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
-PHIGSLIB =  -lphigs
-
-LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
-
-DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
-XBSDLIB =  -lXbsd
-
-LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln
-
-           ICESRC = $(LIBSRC)/ICE
-
-SOICEREV = 6.3
-DEPICELIB =
-ICELIB =  -lICE
-
-LINTICE = $(LINTLIBDIR)/llib-lICE.ln
-
-            SMSRC = $(LIBSRC)/SM
-
-SOSMREV = 6.0
-DEPSMLIB =
-SMLIB =  -lSM
-
-LINTSM = $(LINTLIBDIR)/llib-lSM.ln
-
-           XKEYSRC = $(LIBSRC)/Xkey
-
-SOXKEYREV = 6.0
-DEPXKEYLIB =
-XKEYLIB =  -lXkey
-
-LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln
-
-         FSLIBSRC = $(LIBSRC)/FS
-
-DEPFSLIB = $(USRLIBDIR)/libFS.a
-FSLIB =  -lFS
-
-LINTFS = $(LINTLIBDIR)/llib-lFS.ln
-
-         FONTLIBSRC = $(LIBSRC)/font
-
-DEPFONTLIB = $(USRLIBDIR)/libXfont.a
-FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC)  -lXfont
-
-LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
-#
-DEPXFONTLIB = $(USRLIBDIR)/libXfont.a
-XFONTLIB =  -lXfont
-
-LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
-
-     FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
-
-DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a
-FONTSTUBLIB =  -lfntstubs
-
-LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln
-         DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
-            FONTLIB = $(XFONTLIB) $(FONTSTUBLIB)
-
-          XPMLIBSRC = $(LIBSRC)/Xpm
-
-SOXPMREV = 4.11
-DEPXPMLIB =
-XPMLIB =  -lXpm
-
-LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
-
-          FREETYPE2LIBSRC = $(LIBSRC)/freetype2
-
-SOFREETYPE2REV = 6.0
-DEPFREETYPE2LIB =
-FREETYPE2LIB =  -lfreetype
-
-LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln
-
-FREETYPE2DIR = /usr
-FREETYPE2LIBDIR = /usr/lib
-FREETYPE2INCDIR = /usr/include/freetype2
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
-FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
-FREETYPE2DEFINES = -DFREETYPE2
-
-          XFTLIBSRC = $(LIBSRC)/Xft
-
-SOXFTREV = 1.1
-DEPXFTLIB =
-XFTLIB =  -lXft
-
-LINTXFT = $(LINTLIBDIR)/llib-lXft.ln
-
-    XKBFILELIBSRC = $(LIBSRC)/xkbfile
-
-DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a
-XKBFILELIB =  -lxkbfile
-
-LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
-
-     XKBCOMPCMD = $(BINDIR)/xkbcomp
-
-    XKBUILIBSRC = $(LIBSRC)/xkbui
-
-DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a
-XKBUILIB =  -lxkbui
-
-LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln
-
-          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
-         DEPLIBS1 = $(DEPLIBS)
-         DEPLIBS2 = $(DEPLIBS)
-         DEPLIBS3 = $(DEPLIBS)
-         DEPLIBS4 = $(DEPLIBS)
-         DEPLIBS5 = $(DEPLIBS)
-         DEPLIBS6 = $(DEPLIBS)
-         DEPLIBS7 = $(DEPLIBS)
-         DEPLIBS8 = $(DEPLIBS)
-         DEPLIBS9 = $(DEPLIBS)
-         DEPLIBS10 = $(DEPLIBS)
-
-XMULIBONLY = -lXmu
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-
-        CONFIGDIR = $(LIBDIR)/config
-
-    USRLIBDIRPATH = $(USRLIBDIR)
-        LDPRELIBS = -L$(USRLIBDIR)
-       LDPOSTLIBS =
-     TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES)
-  PROJECT_DEFINES =
-
-CXXPROJECT_DEFINES =
-
-# ----------------------------------------------------------------------
-# start of Imakefile
-
-# made subject to an alternative license as permitted in the SGI Free
-# Software License B, Version 1.1 (the "License"), the contents of this
-# file are subject only to the provisions of the License. You may not use
-# this file except in compliance with the License. You may obtain a copy
-# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-#
-# http://oss.sgi.com/projects/FreeB
-#
-# Note that, as provided in the License, the Software is distributed on an
-# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-# PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-#
-# Original Code. The Original Code is: OpenGL Sample Implementation,
-# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-# Copyright in any portions created by third parties is as indicated
-# elsewhere herein. All Rights Reserved.
-#
-# Additional Notice Provisions: The application programming interfaces
-# established by SGI in conjunction with the Original Code are The
-# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-# Window System(R) (Version 1.3), released October 19, 1998. This software
-# was created using the OpenGL(R) version 1.2.1 Sample Implementation
-# published by SGI, but has not been independently verified as being
-# compliant with the OpenGL(R) version 1.2.1 Specification.
-#
-
-# $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-# $XFree86: xc/config/cf/Library.tmpl,v 3.12 1999/10/13 04:20:41 dawes Exp $
-
-         CC = gcc
-  CCOPTIONS =
-STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE    $(PROJECT_DEFINES)
-CDEBUGFLAGS = -O2 -fno-strength-reduce
-CLIBDEBUGFLAGS = -g
-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-
-LIB_MT_DEFINES = LibraryMTDefines
-
-SOSYMLINK = true
-
-OBJS = 	dict.o 	geom.o 	memalloc.o 	mesh.o 	normal.o 	priorityq.o 	render.o 	sweep.o 	tess.o 	tessmono.o
-
-INCLUDES = 	-I../include 	-I$(TOP)/include 	-I$(TOP)/include/GL
-
-DEFINES = 	-DNDEBUG
-
-.c.o:
-	$(RM) $@
-	 $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
-
-all:: libtess.a
-
-libtess.a:  $(OBJS) $(EXTRALIBRARYDEPS)
-	$(RM) $@
-	$(AR) $@  $(OBJS)
-	$(RANLIB) $@
-	$(_NULLCMD_)
-
-depend::
-	$(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-
-cleandir::
-	$(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut  "#"*
-
-# ----------------------------------------------------------------------
-# common rules for all Makefiles - do not edit
-
-.c.i:
-	$(RM) $@
-	 $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
-
-.SUFFIXES: .s
-
-.c.s:
-	$(RM) $@
-	 $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
-
-emptyrule::
-
-cleandir::
-	$(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut  "#"*
-
-Makefile::
-	-@if [ -f Makefile ]; then set -x; \
-	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
-	else exit 0; fi
-	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-tags::
-	$(TAGS) -w *.[ch]
-	$(TAGS) -xw *.[ch] > TAGS
-
-man_keywords::
-
-html_index::
-
-clean:: cleandir
-
-distclean:: cleandir
-
-# ----------------------------------------------------------------------
-# empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
-	@echo "install in $(CURRENT_DIR) done"
-
-install.man::
-	@echo "install.man in $(CURRENT_DIR) done"
-
-install.sdk::
-	@echo "install.sdk in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-depend::
-
-distclean::
-	$(RM) Makefile
-
-# ----------------------------------------------------------------------
-# dependencies generated by makedepend
-
diff --git a/libtess/gluos.h b/libtess/gluos.h
index 2a22f74..0c4ae49 100644
--- a/libtess/gluos.h
+++ b/libtess/gluos.h
@@ -21,7 +21,9 @@
 #define NOIME
 #define NOMINMAX
 
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0400
+#endif
 #ifndef STRICT
   #define STRICT 1
 #endif
@@ -29,9 +31,11 @@
 #include <windows.h>
 
 /* Disable warnings */
+#ifndef __GNUC__
 #pragma warning(disable : 4101)
 #pragma warning(disable : 4244)
 #pragma warning(disable : 4761)
+#endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma comment(linker, "/OPT:NOWIN98")
diff --git a/libtess/render.c b/libtess/render.c
index 7434b03..89b442e 100644
--- a/libtess/render.c
+++ b/libtess/render.c
@@ -486,9 +486,9 @@ GLboolean __gl_renderCache( GLUtesselator *tess )
     return TRUE;
   }
 
-  CALL_BEGIN_OR_BEGIN_DATA( tess->boundaryOnly ? GL_LINE_LOOP
-			  : (tess->cacheCount > 3) ? GL_TRIANGLE_FAN
-			  : GL_TRIANGLES );
+  CALL_BEGIN_OR_BEGIN_DATA((unsigned int) (tess->boundaryOnly ? GL_LINE_LOOP
+					   : (tess->cacheCount > 3) ? GL_TRIANGLE_FAN
+					   : GL_TRIANGLES) );
 
   CALL_VERTEX_OR_VERTEX_DATA( v0->data ); 
   if( sign > 0 ) {
diff --git a/libtess/tess.h b/libtess/tess.h
index 2e990a1..93d5858 100644
--- a/libtess/tess.h
+++ b/libtess/tess.h
@@ -42,12 +42,20 @@
 #ifndef __tess_h_
 #define __tess_h_
 
-#include <GL/glu.h>
 #include <setjmp.h>
+#include "glu.h"
 #include "mesh.h"
 #include "dict.h"
 #include "priorityq.h"
 
+/*
+ * PLC This symbol seems to be undefined with VC98
+ */
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+
 /* The begin/end calls must be properly nested.  We keep track of
  * the current state to enforce the ordering.
  */