diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-03-18 02:18:27 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-03-18 02:18:27 +0000 |
| commit | 39cf4c1a23aacbab64ef39af8242bb2d8a1fbb5c (patch) | |
| tree | 23a592a52b789e75a0395f04057f1be4a3773884 /sun.cf | |
| parent | a4079b84696552f6041ef0afd391b565e2ac2a3b (diff) | |
49. Merge fixes required to build and run on Solaris x86 with Sun compilersXPRINT_BASE
from XORG-CURRENT branch. (Alan Coopersmith)
Diffstat (limited to 'sun.cf')
| -rw-r--r-- | sun.cf | 25 |
1 files changed, 17 insertions, 8 deletions
@@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.1.4.8.2.2 2004/03/14 03:27:09 alanc Exp $ +XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.1.4.8.2.3 2004/03/17 17:16:56 alanc Exp $ XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ @@ -174,19 +174,28 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion #ifdef i386Architecture # if OSMajorVersion > 4 # if OSMinorVersion >= 8 -# define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ - -D__SOL8__ -# else -# define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines +# define OSServerExtraDefines -D__SOL8__ +# endif +# if HasSunC +# define CompilerServerExtraDefines $(XF86SRC)/os-support/sunos/ia32.il # endif -# else -# define ServerExtraDefines AllocateLocalDefines # endif #else -# define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines # define HasPlugin YES #endif + +#ifndef CompilerServerExtraDefines +# define CompilerServerExtraDefines /**/ +#endif + +#ifndef OSServerExtraDefines +# define OSServerExtraDefines /**/ +#endif + + #define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine +#define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ + CompilerServerExtraDefines OSServerExtraDefines #ifndef HasPerl /* Solaris 8 comes with perl. Earlier versions don't. */ |