diff options
Diffstat (limited to 'xc/config/cf/X11.tmpl')
| -rw-r--r-- | xc/config/cf/X11.tmpl | 51 |
1 files changed, 6 insertions, 45 deletions
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 311899052..29d80c9b8 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.71 2000/06/25 20:17:28 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.73 2000/08/09 02:57:19 tsi Exp $ /*************************************************************************** * * @@ -274,12 +274,6 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.71 2000/06/25 20:17:28 dawes Exp $ #ifndef BuildXvLibrary #define BuildXvLibrary BuildXvExt #endif -#ifndef BuildXantiExt -#define BuildXantiExt NO -#endif -#ifndef BuildXantiLibrary -#define BuildXantiLibrary BuildXantiExt -#endif #ifndef BuildGlxExt #define BuildGlxExt NO #endif @@ -526,6 +520,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #define GlxDefines /**/ #endif #endif +#ifndef MesaSrcDir +#define MesaSrcDir $(TOP)/extras/Mesa +#endif #ifndef ShmDefines #if HasShm #define ShmDefines -DMITSHM @@ -666,14 +663,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #endif #endif -#ifndef XantiExtensionDefines -#if BuildXantiExt -#define XantiExtensionDefines -DXANTI -#else -#define XantiExtensionDefines /**/ -#endif -#endif - #ifndef RECORDDefines #if BuildRECORD #define RECORDDefines -DXRECORD @@ -750,7 +739,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN XCMiscDefines RECORDDefines \ PexDefines ShmDefines XieDefines BigReqDefines VidModeExtensionDefines \ XF86MiscExtensionDefines DBEDefines DPMSDefines EVIDefines \ - ScreenSaverExtensionDefines XvExtensionDefines XantiExtensionDefines \ + ScreenSaverExtensionDefines XvExtensionDefines \ GlxDefines FontCacheExtensionDefines SiteExtensionDefines #endif #define ExtensionDefines BaseExtensionDefines ExtensionOSDefines @@ -1185,6 +1174,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules EXTINCSRC = $(XTOP)/include/extensions FTSOURCEDIR = FreeTypeSrcDir XTTSOURCEDIR = XTrueTypeSrcDir + MESASRCDIR = MesaSrcDir PSWRAPSRC = $(XTOP)/config/pswrap TRANSCOMMSRC = $(LIBSRC)/xtrans TRANS_INCLUDES = -I$(TRANSCOMMSRC) @@ -1418,21 +1408,6 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #endif #endif -#if BuildXantiLibrary -#ifndef SharedLibXanti -#define SharedLibXanti NO -#endif -#ifndef NormalLibXanti -#define NormalLibXanti YES -#endif -#ifndef DebugLibXanti -#define DebugLibXanti NO -#endif -#ifndef ProfileLibXanti -#define ProfileLibXanti NO -#endif -#endif - #if BuildGLXLibrary #ifndef SharedLibGlx #define SharedLibGlx HasSharedLibraries @@ -1622,18 +1597,6 @@ ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) #endif #endif -#if BuildXantiLibrary - XANTILIBSRC = $(LIBSRC)/Xanti -#if SharedLibXanti -#ifndef SharedXantiRev -#define SharedXantiRev 1.0 -#endif -SharedLibReferences(XANTI,Xanti,$(XANTILIBSRC),SOXANTIREV,SharedXantiRev) -#else -ProjectUnsharedLibReferences(XANTI,Xanti,$(XANTILIBSRC),XBuildLibDir) -#endif -#endif - #if BuildGLXLibrary GLXLIBSRC = $(LIBSRC)/GL #if SharedLibGlx @@ -1646,8 +1609,6 @@ ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) #endif #endif - - #if BuildFontCacheLib # ifndef SharedLibXfontcache # define SharedLibXfontcache NO |