Cygwin/XFree86 New Server Architecture (Windows 95/98/Me/NT/2000 compatible)

[Suhaib Siddiqi]

harold,

Your Imakefile-xserver-xxxx.diff file is wrong, sory.  Have a look at it.
You diff file is try to replace your changes with the original lines which
already exists in Imakefile. 

Did you submit it to XFree86.org?  You need to send them a correct one ASAP.

For Imakefile.diff you used again /x5/xc/ which is not adviced.  The patch
should be able to patch xc not x5/xc.

Suhaib
--- x4/xc/programs/Xserver/Imakefile	Wed Mar 28 18:49:10 2001
+++ x5/xc/programs/Xserver/Imakefile	Sun Mar  4 12:40:03 2001
@@ -1080,38 +1080,31 @@
 XCOMM
 XCOMM server with DirectX framebuffer for Windows
 XCOMM
+MFBDIR   = mfb
+CFB8DIR  = cfb
+CFB16DIR = cfb16
+CFB24DIR = cfb24
+CFB32DIR = cfb32
 XWINDDXDIR = hw/xwin
-XWIN = $(XWINDDXDIR)/LibraryTargetName(XWin)
-XWINGDI32 = /lib/libgdi32.a
-XWINDDRAW = /lib/libddraw.a
-/* XWINOLE32 = /lib/libole32.a */
-DDXDIR1 = $(XWINDDXDIR)
-XWINDIRS = $(STDDIRS) $(FB) $(SHADOW) $(XWINDDXDIR) $(DEPDIRS)
-
-XWINOBJSA = $(XWINDDXDIR)/stubs.o dix/main.o
-
+DDXDIR2 = $(XWINDDXDIR)
+XWINDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR)
$(CFB32DIR) $(XWINDDXDIR) $(DEPDIRS)
 #if BuildDPMS
-XWINOBJSB = $(XWINDDXDIR)/dpmsstubs.o
+XWINOBJS = hw/xwin/InitInput.o hw/xwin/InitOutput.o hw/xwin/stubs.o
hw/xwin/directx.o hw/xwin/dpmsstubs.o dix/main.o
+#else
+XWINOBJS = hw/xwin/InitInput.o hw/xwin/InitOutput.o hw/xwin/stubs.o
hw/xwin/directx.o dix/main.o
 #endif
-
-XWINOBJS = $(XWINOBJSA) $(XWINOBJSB)
-
-XWINLIBS = PreFbLibs $(XWIN) FbPostFbLibs $(SHADOW)
-
-XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) \
-	$(XWINGDI32) $(XWINDDRAW)
-
+XWIN = hw/xwin/LibraryTargetName(XWin)
+XWINLIBS = PreFbLibs $(XWIN) $(CFB) PostFbLibs $(MI) $(SURFLIB) 
+XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XWINDIRS) $(XWINOBJS) $(XWIN) $(XWINLIBS) $(XWINSYSLIBS))
 #endif
-
 #if ForceServerRemake
 $(XWINOBJS) $(XWIN) $(XWINLIBS) $(XWINSYSLIBS):: $(XWINDIRS)
 	@if [ -f $@ ]; then touch $@; fi
 #endif
-
 ServerTarget(XWin,$(XWINDIRS),$(XWINOBJS), \
-	     $(XWINLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XWINSYSLIBS)) 
+	$(XWINLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XWINSYSLIBS)) 
 
 #ifndef ServerToInstall
 #define ServerToInstall XWin

-----Original Message-----
From: Harold Hunt
To: Cygx (E-mail)
Sent: 3/31/2001 3:58 PM
Subject: RE: Cygwin/XFree86 New Server Architecture (Windows
95/98/Me/NT/2000 compatible)

For those of you that are interested, the diffs that I sent to XFree86
are
posted on my announcement page:
http://www.msu.edu/~huntharo/xwin/shadow/

Harold