XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 27 insertions, 21 deletions

diff --git a/os2Lib.tmpl b/os2Lib.tmpl
index 94b94e5..afd0a40 100644
--- a/os2Lib.tmpl
+++ b/os2Lib.tmpl
@@ -2,31 +2,29 @@ XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
+XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
 
 /*
  * OS2/EMX shared library template
- */
+ *
 #ifndef __UNIXOS2__
 #error You must edit os2Lib.tmpl for your (non-EMX) OS/2 dev system
-#endif
+#endif */
 
 #define SharedLibFont NO
 
 #define SharedX11Reqs $(LDPRELIB) -lshm
-#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
-#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
+#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
+#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
 #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
 #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
 #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
+#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB)
-#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
+#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
 #define SharedXtstReqs $(LDPRELIB) $(XLIB)
 #define SharedSMReqs $(LDPRELIB) $(ICELIB) 
-#define SharedXieReqs $(LDPRELIB) $(XLIB)
 #define SharedXpReqs $(LDPRELIB) $(XLIB)
 #define SharedXvReqs $(LDPRELIB) $(XLIB)
 #define SharedGLReqs $(LDPRELIB) $(XLIB)
@@ -35,7 +33,18 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
 #define SharedDPSReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
 #define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
 #define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedXrandrReqs $(LDPRELIB) $(XLIB)
+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXssReqs $(LDPRELIB) $(XLIB)
+#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
+#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
+#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
+#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
+#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
+#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
+#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
+#define SharedXResReqs	$(LDPRELIB) $(XLIB)
+#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
 
 /* library revisions, these are typically empty! */
 #define SharedX11Rev /**/
@@ -65,9 +74,6 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
 #define SharedXaw6Rev 6
 #define SharedXiRev /**/
 #define SharedXtstRev /**/
-#define SharedPexRev /**/
-#define SharedXieRev /**/
-#define SharedPhigsRev /**/
 #define SharedICERev /**/
 #define SharedSMRev /**/
 #define SharedXkeyRev /**/
@@ -78,8 +84,16 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
 #define SharedXrenderRev /**/
 #define SharedXrandrRev /**/
 #define SharedXftRev /**/
+#define SharedXft1Rev 1
 #define SharedFreetype2Rev /**/
 #define SharedXTrapRev /**/
+#define SharedExpatRev /**/
+#define SharedFontconfigRev /**/
+#define	SharedXcursorRev /**/
+#define SharedxkbfileRev /**/
+#define SharedXvMCRev /**/
+#define SharedXResRev /**/
+#define SharedFontEncRev /**/
 
 /*
  * By setting this in your Imakefile, you can force using static libraries
@@ -97,9 +111,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
 #define SDlibXaw -lXaw_s
 #define SDlibXaw6 -lXaw_s
 #define SDlibXi -lXi_s
-#define SDlibXIE -lXIE_s
 #define SDlibXtst -lXtst_s
-#define SDlibPEX5 -lPEX5_s
 #define SDlibXp -lXp_s
 #define SDlibXv -lXv_s
 #define SDlibGL -lGL_s
@@ -113,9 +125,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
 #define SDlibXaw -lXaw
 #define SDlibXaw6 -lXaw
 #define SDlibXi -lXi
-#define SDlibXIE -lXIE
 #define SDlibXtst -lXtst
-#define SDlibPEX5 -lPEX5
 #define SDlibXp -lXp
 #define SDlibXv -lXv
 #define SDlibGL -lGL
@@ -166,10 +176,6 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.12 2002/05/31 16:31:19 dawes Exp $
     DEPXTESTLIB = 
        XTESTLIB = _Use(SDlibXtst,-L$(EXTENSIONSRC)/lib/xtest SDlibXtst)
 #endif
-#if SharedLibPex
-      DEPPEXLIB = 
-         PEXLIB = _Use(SDlibPEX5,-L$(PEXLIBSRC) SDlibPEX5)
-#endif
 #if SharedLibXp
        DEPXPLIB = 
           XPLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp)