From: Yaakov Selkowitz <[email protected]>
Signed-off-by: Yaakov Selkowitz <[email protected]>
---
cygwin.cf | 27 +++++++++++++++++----------
cygwin.rules | 13 ++++++-------
cygwin.tmpl | 9 +++++----
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/cygwin.cf b/cygwin.cf
index 73ed8ce..78f9710 100644
--- a/cygwin.cf
+++ b/cygwin.cf
@@ -62,12 +62,23 @@
# define OSTeenyVersion DefaultOSTeenyVersion
#endif
-#ifndef ProjectRoot
-# define ProjectRoot /usr/X11R6
+#ifndef XAppLoadDir
+# define XAppLoadDir EtcX11Directory/app-defaults
+#endif
+#ifndef SystemManDirectory
+# define SystemManDirectory /usr/share/man
+#endif
+#ifndef FontDir
+# define FontDir /usr/share/fonts
+#endif
+#ifndef FontEncDir
+# define FontEncDir /usr/share/fonts/encodings
#endif
#if !CrossCompiling
+#ifndef HasGcc2
# define HasGcc2 YES
+#endif /* HasGcc2 */
#endif /* !CrossCompiling */
#define HasGcc2ForCplusplus YES
#define GccUsesGas YES
@@ -98,15 +109,12 @@
*/
#define Hastcl YES
#define Hastk YES
-#define TclLibName tcl80
-#define TkLibName tk80
+#define TclLibName tcl84
+#define TkLibName tk84
#define HasSockets YES
#define GzipFontCompression YES
#define HasZlib YES
-#ifndef GzipLibrary
-# define GzipLibrary -lz.dll
-#endif
/* We don't need -lm */
#define MathLibrary /**/
@@ -115,7 +123,7 @@
* /lib/libtermcap.a doesn't have tgetent, which is needed for
* xc/programs/xterm/resize.exe
*/
-#define TermcapLibrary -lncurses.dll
+#define TermcapLibrary -lncurses
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
@@ -364,7 +372,6 @@
#define XWinServerDefines -DPIXPRIV \
-DXFree86Server \
-DX_BYTE_ORDER=ByteOrder \
- XvExtensionDefines \
XWinXF86ConfigDefines XWinNativeGDIDefines \
XWinPrimaryFBDefines \
XWinEmulatePseudoDefines \
@@ -406,7 +413,7 @@
# define BuildGlxExt YES /* Not enabled by default */
#endif
#ifndef BuildXprintLib
-# define BuildXprintLib YES /* Not enabled when Xprt
disabled */
+# define BuildXprintLib NO /* Not enabled when Xprt
disabled */
#endif
#ifndef BuildXterm
# define BuildXterm NO /* Built separately on Cygwin */
diff --git a/cygwin.rules b/cygwin.rules
index d144755..a2215bd 100644
--- a/cygwin.rules
+++ b/cygwin.rules
@@ -22,11 +22,11 @@
#define SharedLibXext YES
#define SharedLibXi YES
#define SharedLibXtst YES
-#define SharedOldX YES
-#define SharedLibXp YES
+#define SharedOldX NO
+#define SharedLibXp NO
#define SharedLibGlx YES
-#define SharedLibDps YES
-#define SharedLibDpsTk YES
+#define SharedLibDps NO
+#define SharedLibDpsTk NO
#define SharedLibGlu YES
#define SharedLibWindowsWM NO
#ifndef SharedDataSeparation
@@ -59,7 +59,7 @@
Concat3(cyg,libname,-$(shell echo rev|sed s=\\..*==).dll)
#define ImportLibraryName(libname, rev) \
-Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a)
+Concat3(lib,libname,.dll.a)
#define ShortImportLibraryName(libname, rev) \
Concat3(lib,libname,.dll.a)
@@ -233,8 +233,7 @@ step::
@@\
#define InstallSharedLibrary(libname,rev,dest) @@\
InstallTarget(install,ImportLibraryName(libname,rev),$(INSTLIBFLAGS),$(USRLIBDIR))
@@\
-InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR))
@@\
-InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR))
+InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR))
/*
diff --git a/cygwin.tmpl b/cygwin.tmpl
index 404b628..a392a34 100644
--- a/cygwin.tmpl
+++ b/cygwin.tmpl
@@ -30,10 +30,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19
08:27:05 herrb Exp $
#define SharedXResReqs $(LDPRELIB) $(XLIB)
#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
-/*
- * We don't build Xss
- * #define SharedXssReqs $(LDPRELIB) $(XLIB)
- */
+#define SharedXssReqs $(LDPRELIB) $(XLIB)
#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
@@ -54,6 +51,10 @@ XMULIBONLY = -lXmu
@@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
+#ifndef SharedXawRev
+# define SharedXawRev 7.0
+#endif
+
#ifndef XawClientLibs
# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB)
$(EXTRAXAWCLIENTLIBS) $(XLIB)
#endif
--
1.6.4.2
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel
