diff options
| author | Egbert Eich <eich@suse.de> | 2005-01-04 17:27:26 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2005-01-04 17:27:26 +0000 |
| commit | dc4ef63a7248109a4775efa64b3a0e67e5d5a3d8 (patch) | |
| tree | 3f34f62498107d0e9bc117effdbca7902a5bc848 | |
| parent | d443986813489a72069a792f9b65d68ddadef8f5 (diff) | |
- made structure of PPC64 part look more like the other structures.
- added VBE driver to PPC64. I don't know if this really makes sense, but
since we are building the int10 module we should also build the vbe
module.
- added i915 DRM driver to list of drivers for the AMD64 architecture.
- added a check for gcc versions > 3 for setting GccAliasingFlags.
| -rw-r--r-- | xorg.cf | 38 |
1 files changed, 21 insertions, 17 deletions
@@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.33 2004/11/24 02:45:33 krh Exp $ +XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.34 2004/12/14 01:41:58 nolan Exp $ /* * This configuration file contains all of the configuration * information for the Xorg based X Servers. @@ -418,7 +418,7 @@ RELEASE_VERSION = ReleaseVersion # define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \ sis tdfx # endif -#endif +#endif /* i386Architecture || ia64Architecture */ #if defined(AMD64Architecture) /* vgahw module */ @@ -454,7 +454,7 @@ RELEASE_VERSION = ReleaseVersion /* The tdfx driver needs Glide, which is not available for AMD64. SiS is 64-bit * unclean as of this writing. */ -# define DriDrivers gamma mga r128 radeon r200 +# define DriDrivers i915 gamma mga r128 radeon r200 #endif /*AMD64Arcitecture*/ @@ -540,7 +540,7 @@ RELEASE_VERSION = ReleaseVersion DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -#endif +#endif /* OpenBSDArchitecture && Sparc64Architecture */ /* MIPS drivers */ @@ -564,7 +564,7 @@ RELEASE_VERSION = ReleaseVersion DevelDrivers newport \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -#endif +#endif /* MipsArchitecture */ /* * DEC Alpha drivers @@ -593,7 +593,7 @@ RELEASE_VERSION = ReleaseVersion # ifndef DriDrivers # define DriDrivers gamma tdfx mga r128 radeon r200 # endif -#endif +#endif /* AlphaArchitecture */ /* * Motorola 68k and PowerPC drivers @@ -672,10 +672,6 @@ RELEASE_VERSION = ReleaseVersion # ifndef XorgServer # define XorgServer YES # endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif /* 1bpp module */ # ifndef XF1Bpp # define XF1Bpp NO @@ -696,10 +692,6 @@ RELEASE_VERSION = ReleaseVersion # ifndef XFShadowFB # define XFShadowFB YES # endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw NO -# endif /* fbdevhw module */ # ifndef XF86FBDevHw # define XF86FBDevHw YES @@ -724,11 +716,23 @@ RELEASE_VERSION = ReleaseVersion # ifndef XF86RAC # define XF86RAC YES # endif - /* int10 module */ # ifndef XF86Int10 # define XF86Int10 YES # endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw NO +# endif +/* Amiga framebuffer module */ +# ifndef XF86AFB +# define XF86AFB NO +# endif # ifndef DevelDrivers # if XFree86Devel @@ -748,7 +752,7 @@ RELEASE_VERSION = ReleaseVersion # ifndef DriDrivers # define DriDrivers gamma r128 # endif -#endif +#endif /* Ppc64Architecture */ /* * For Mips/Arc platforms, the default is to build all modules which @@ -1531,7 +1535,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # endif #endif -#if (GccMajorVersion == 3) && (GccMinorVersion >= 1) +#if ((GccMajorVersion == 3) && (GccMinorVersion >= 1)) || (GccMajorVersion > 3) # define GccAliasingArgs -fno-strict-aliasing #else # define GccAliasingArgs /* */ |