diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-31 17:19:19 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-31 17:19:19 +0000 |
| commit | 62c2819a93c2cd30860b3cef2ae5d517f452b8b9 (patch) | |
| tree | b65e30fbd2b9195628455f602a7c25d9c25b0652 /xorg.cf | |
| parent | 7ce7c908b8e5bf4fa17975c533e2d53b216dc3e1 (diff) | |
Post-merge fixups:
- Disable building the gamma driver
- Fix numerous Imakefiles to get header paths and subdirs right
- Symlink client-side GLX lib source from Mesa
- Add new shader subdirs to the Mesa core build
- Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
since they don't generate protocol, and it was breaking the build.
Diffstat (limited to 'xorg.cf')
| -rw-r--r-- | xorg.cf | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -425,7 +425,7 @@ RELEASE_VERSION = ReleaseVersion /* SiS is 64-bit unclean as of this writing. */ # define i386DRIDrivers /**/ # endif -# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 tdfx +# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx # endif #endif /* i386Architecture || ia64Architecture */ @@ -462,7 +462,7 @@ RELEASE_VERSION = ReleaseVersion /* SiS is 64-bit unclean as of this writing. */ # ifndef DriDrivers -# define DriDrivers i915 gamma mga r128 radeon r200 tdfx +# define DriDrivers i915 mga r128 radeon r200 tdfx # endif #endif /*AMD64Arcitecture*/ @@ -603,7 +603,7 @@ RELEASE_VERSION = ReleaseVersion * SiS is 64-bit unclean as of this writing. */ # ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 +# define DriDrivers tdfx mga r128 radeon r200 # endif #endif /* AlphaArchitecture */ @@ -637,7 +637,7 @@ RELEASE_VERSION = ReleaseVersion # endif /* The tdfx driver needs Glide, which is not available for PPC. */ # ifndef DriDrivers -# define DriDrivers gamma mga r128 radeon r200 +# define DriDrivers mga r128 radeon r200 # endif #endif /* PpcArchitecture || Mc68020Architecture */ @@ -666,7 +666,7 @@ RELEASE_VERSION = ReleaseVersion XF86OSCardDrivers XF86ExtraCardDrivers # endif # ifndef DriDrivers -# define DriDrivers gamma mga r128 radeon r200 +# define DriDrivers mga r128 radeon r200 # endif #endif @@ -767,7 +767,7 @@ RELEASE_VERSION = ReleaseVersion # endif # define TdfxDriDriver /**/ # ifndef DriDrivers -# define DriDrivers gamma r128 +# define DriDrivers r128 # endif #endif /* Ppc64Architecture */ |