diff options
Diffstat (limited to 'xc/config/cf')
| -rw-r--r-- | xc/config/cf/X11.tmpl | 3 | ||||
| -rw-r--r-- | xc/config/cf/host.def | 98 | ||||
| -rw-r--r-- | xc/config/cf/xfree86.cf | 20 |
3 files changed, 114 insertions, 7 deletions
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 74b05aeb9..9be9d010c 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -517,7 +517,8 @@ VENDORMANVERSION = XVendorManVersionString #define BuildOSMesaLib (BuildGlxExt && defined(XFree86Version)) #endif #ifndef BuildGLULibrary -#define BuildGLULibrary (BuildGLXLibrary && HasCplusplus) +#define BuildGLULibrary (BuildGLXLibrary && HasCplusplus && \ + !BuildServersOnly) #endif #ifndef BuildGLwLibrary #define BuildGLwLibrary ((BuildGlxExt || BuildGLXLibrary) && \ diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def new file mode 100644 index 000000000..3ce43dcc7 --- /dev/null +++ b/xc/config/cf/host.def @@ -0,0 +1,98 @@ +/* + * Set this for each DRI branch. It will be appended to the XFree86 version + * information. + */ +#define XFree86CustomVersion "DRI trunk" + + +/* Don't use any special flags by default, but leave this here commented out + * so people see how to if they want + */ +/* +#define DefaultGcc2AxpOpt -O2 -mcpu=ev6 +#define DefaultGcc2PpcOpt -O2 -mcpu=750 +#define DefaultGcc2i386Opt -O2 +#if defined(AlphaArchitecture) +# define LibraryCDebugFlags -O2 -mcpu=ev6 +#elif defined(PpcArchitecture) +# define LibraryCDebugFlags -O2 -mcpu=750 +#else +# define LibraryCDebugFlags -O2 +#endif +*/ + + +#define BuildXFree86ConfigTools YES + +#if defined(PpcArchitecture) + +#define XF86CardDrivers ati +#define DriDrivers r128 radeon r200 + +#else + +#define XF86CardDrivers tdfx i810 mga ati glint vga +#define DriDrivers r200 tdfx mga i810 r128 radeon gamma i830 ffb /* sis */ + +#endif + +#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations \ + -Wnested-externs +#define DefaultCCOptions -ansi GccWarningOptions -pipe -g + +#define NormalLibGlx NO + +#define BuildXF86DRI YES + +/* To do profiling of the dynamically loaded 'xyz_dri.so' object, turn + * this on. + * Use 'xc/lib/GL/makeprofile.sh' to make it work. + */ +/* #define GlxSoProf YES */ + +#ifdef GlxSoProf +# undef DefaultCCOptions +# define DefaultCCOptions -ansi GccWarningOptions -pipe -g -p +#endif + +/* Optionally turn these on for debugging */ +/* #define GlxBuiltInTdfx YES */ +/* #define GlxBuiltInI810 YES */ +/* #define GlxBuiltInMga YES */ +/* #define GlxBuiltInR128 YES */ +/* #define GlxBuiltInRadeon YES */ +/* #define DoLoadableServer NO */ + +/* Optionally turn this on to change the place where you install the build. + * Warning: trailing blanks will cause build failures. + */ +/* #define ProjectRoot /usr/X11R6-DRI */ + +/* Optionally turn this on to force the kernel modules to build */ +/* #define BuildXF86DRM YES */ + +#define XF86AFB NO + +#define XnestServer NO +#define XVirtualFramebufferServer NO + +/* + * Don't change anything below or the build will fail. + */ +#define BuildServersOnly YES +#define BuildXvLibrary YES +#define BuildXvMCLibrary YES +#define BuildLibrariesForXServers NO +#define BuildLibrariesForConfigTools NO +#define BuildXIE NO +#define BuildPexExt NO +#define XprtServer NO +#define SharedLibFont NO +#define XInputDrivers mouse +#if DoLoadableServer +#undef XF1Bpp +#undef XF4Bpp +#define XF1Bpp NO +#define XF4Bpp NO +#endif diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index 42d95cc0f..5243fdb39 100644 --- a/xc/config/cf/xfree86.cf +++ b/xc/config/cf/xfree86.cf @@ -292,7 +292,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ /* * Amiga framebuffer module. - * This is for build testing only. It isn't actually used on this platform. + * This is mostly for build testing, but the vesa driver references it. */ # ifndef XF86AFB # define XF86AFB YES @@ -337,7 +337,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # endif # ifndef DriDrivers -# define DriDrivers gamma i810 i830 mga r128 radeon \ +# define DriDrivers gamma i810 i830 mga r128 radeon r200 \ /*sis*/ tdfx DevelDRIDrivers # endif #endif @@ -421,7 +421,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # define DevelDRIDrivers /**/ -# define DriDrivers gamma i810 mga r128 radeon \ +# define DriDrivers gamma i810 mga r128 radeon r200 \ TdfxDriDriver DevelDRIDrivers #endif /*x86_64Arcitecture*/ @@ -768,7 +768,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ XF86OSCardDrivers XF86ExtraCardDrivers # endif # ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon /*sis*/ +# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ # endif #endif @@ -856,7 +856,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ XF86OSCardDrivers XF86ExtraCardDrivers # endif # ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon +# define DriDrivers gamma tdfx mga r128 radeon r200 # endif #endif @@ -945,7 +945,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # define TdfxDriDriver /**/ # endif # ifndef DriDrivers -# define DriDrivers gamma TdfxDriDriver mga r128 radeon +# define DriDrivers gamma tdfx mga r128 radeon r200 # endif #endif @@ -1159,6 +1159,9 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # ifndef GlxBuiltInRadeon # define GlxBuiltInRadeon NO # endif +# ifndef GlxBuiltInR200 +# define GlxBuiltInR200 NO +# endif # ifndef GlxBuiltInFfb # define GlxBuiltInFfb NO # endif @@ -1172,6 +1175,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 GlxBuiltInI830 || \ GlxBuiltInR128 || \ GlxBuiltInRadeon || \ + GlxBuiltInR200 || \ GlxBuildInFfb || \ GlxBuiltInSIS # define GlxDriverUsesMesa YES @@ -1184,6 +1188,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 GlxBuiltInI830 || \ GlxBuiltInR128 || \ GlxBuiltInRadeon || \ + GlxBuiltInR200 || \ GlxBuiltInFfb || \ GlxBuiltInSIS # define GlxUseBuiltInDRIDriver YES @@ -1216,6 +1221,9 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # if GlxBuiltInRadeon # define DriDrivers radeon # endif +# if GlxBuiltInR200 +# define DriDrivers r200 +# endif # if GlxBuiltInSIS # define DriDrivers sis # endif |