diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2004-09-16 23:37:20 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2004-09-16 23:37:20 +0000 |
| commit | 435c4808e0d4906dc5cda9672139a64694681bce (patch) | |
| tree | 5d317ef7dc7f708febdb2d71c3b9a8fe35281822 | |
| parent | 09e8954fd25b4402a028bed1d7b6879f9b9f11ed (diff) | |
Initially populate the lg3d branch with lg3d code.rel-0-6-1lg3d-rel-0-7-0lg3d-eventlg3d-dev-0-6-latestlg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d
| -rw-r--r-- | X11.tmpl | 55 | ||||
| -rw-r--r-- | xorg.cf | 4 |
2 files changed, 54 insertions, 5 deletions
@@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.34 2004/09/02 05:50:38 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.35 2004/09/03 16:18:18 kem Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -567,7 +567,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ #endif #endif #ifndef BuildGLXLibrary -#define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly) +#define BuildGLXLibrary NO #endif #ifndef BuildOSMesaLib #define BuildOSMesaLib BuildGlxExt @@ -680,6 +680,13 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ #define BuildXevieLibrary !BuildServersOnly #endif +#ifndef BuildLg3d +#define BuildLg3d YES +#endif +#ifndef BuildLg3dLibrary +#define BuildLg3dLibrary !BuildServersOnly +#endif + #ifndef BuildXterm #define BuildXterm BuildClients #endif @@ -1237,6 +1244,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #endif #endif +#ifndef Lg3dDefines +#if BuildLg3d +#define Lg3dDefines -DLG3D +#else +#define Lg3dDefines /**/ +#endif +#endif + #ifndef SitePervasiveExtensionDefines #define SitePervasiveExtensionDefines /**/ #endif @@ -1247,7 +1262,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN XF86BigfontExtensionDefines DPMSDefines \ LowMemDefines XprintDefines XineramaDefines \ SitePervasiveExtensionDefines RenderDefines RandRDefines \ - XfixesDefines XDamageDefines CompositeDefines XevieDefines + XfixesDefines XDamageDefines CompositeDefines XevieDefines Lg3dDefines #endif #ifndef SiteExtensionDefines #define SiteExtensionDefines /**/ @@ -2276,6 +2291,30 @@ ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXevie NO #endif +#if BuildLg3dLibrary +#ifndef SharedLibLg3d +#define SharedLibLg3d HasSharedLibraries +#endif +#ifndef NormalLibLg3d +#define NormalLibLg3d (!SharedLibLg3d || ForceNormalLib) +#endif +#ifndef DebugLibLg3d +#define DebugLibLg3d NO +#endif +#ifndef ProfileLibLg3d +#define ProfileLibLg3d NO +#endif +#else +#undef SharedLibLg3d +#define SharedLibLg3d NO +#undef NormalLibLg3d +#define NormalLibLg3d NO +#undef DebugLibLg3d +#define DebugLibLg3d NO +#undef ProfileLibLg3d +#define ProfileLibLg3d NO +#endif + #if BuildXcursorLibrary #ifndef SharedLibXcursor #define SharedLibXcursor HasSharedLibraries @@ -2720,6 +2759,16 @@ SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) #endif + LG3DRLIBSRC = $(LIBSRC)/Xlg3d +#if SharedLibXlg3d +#ifndef SharedXlg3dRev +#define SharedXlg3dRev 1.0 +#endif +SharedLibReferences(LG3D,Xlg3d,$(LG3DLIBSRC),SOLG3DREV,SharedXlg3dRev) +#else +ProjectUnsharedLibReferences(LG3D,Xlg3d,$(LG3DLIBSRC),XBuildLibDir) +#endif + XCURSORLIBSRC = $(LIBSRC)/Xcursor #if SharedLibXcursor #ifndef SharedXcursorRev @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.26 2004/09/03 16:18:18 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.27 2004/09/03 22:00:10 kem Exp $ /* * This configuration file contains all of the configuration * information for the Xorg based X Servers. @@ -861,7 +861,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # if defined (BuildServersOnly) && BuildServersOnly # define BuildGLXLibrary NO # else -# define BuildGLXLibrary YES +# define BuildGLXLibrary NO # endif #endif |