CVS Update: xc (branch: trunk)

[Alan Hourihane]

Actually,

I had to turn off building of Xft1 because we don't have a concept
of shared library versions.

We had this on unixes.

	libXft.so.2.0
	libXft.so.1.0

On Windows...

	libXft.dll  (libXft.a)
	(bang)...

We build Xft (v2) first, then Xft1 came along and blew libXft.dll
away with v1 of the library..

I suspect the usage of the Xft1 (v1) library is pretty minimal on
Windows so we won't be impacted. But it might be worth thinking of
a solution here, we may have to call it libXft2.dll for our purposes
and hack around with the .cf and Imakefiles.

We could use the SOREV stuff here. Takers ?

Alan.

On Sat, May 25, 2002 at 02:06:31 -0400, Harold Hunt wrote:
> Alan,
> 
> I'm not so sure I fixed this correctly...
> 
> A straight through build of the XFree86 tree with this patch still exhibits
> the same problem (i.e., x11perf, xlogo, and xclock don't build because
> XftDrawPicture and XftDrawSrcPicture are missing).
> 
> However, I can do the following and all three of them build:
> cd lib/Xft
> rm libXft.a
> rm libXft.dll
> make
> cd ../programs/xlogo
> make
> cd ../x11perf
> make
> cd ../xclock
> make
> 
> 
> Any ideas why the straight-through build still fails?
> 
> 
> Harold
> 
> > -----Original Message-----
> > From: cvs-commit-admin@XFree86.Org
> > [mailto:cvs-commit-admin@XFree86.Org]On Behalf Of Alan Hourihane
> > Sent: Saturday, May 25, 2002 8:03 AM
> > To: cvs-commit@XFree86.Org
> > Subject: CVS Update: xc (branch: trunk)
> >
> >
> > CVSROOT:	/home/x-cvs
> > Module name:	xc
> > Changes by:	alanh@public.xfree86.org.	02/05/25 05:03:14
> >
> > Log message:
> >   #5283, Fix Xft-def.cpp for Cygwin/XFree86
> >
> > Modified files:
> >       xc/programs/Xserver/hw/xfree86/:
> >         CHANGELOG
> >       xc/lib/Xft/:
> >         Xft-def.cpp
> >
> >   Revision      Changes    Path
> >   3.2222        +2 -1      xc/programs/Xserver/hw/xfree86/CHANGELOG
> >   1.3           +3 -1      xc/lib/Xft/Xft-def.cpp
> >
> > _______________________________________________
> > Cvs-commit mailing list
> > Cvs-commit@XFree86.Org
> > http://XFree86.Org/mailman/listinfo/cvs-commit