diff options
Diffstat (limited to 'xc/lib/GL/mesa/src/swrast_setup/Imakefile')
| -rw-r--r-- | xc/lib/GL/mesa/src/swrast_setup/Imakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xc/lib/GL/mesa/src/swrast_setup/Imakefile b/xc/lib/GL/mesa/src/swrast_setup/Imakefile index 9fe6c3886..d77cea578 100644 --- a/xc/lib/GL/mesa/src/swrast_setup/Imakefile +++ b/xc/lib/GL/mesa/src/swrast_setup/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.5 2002/02/28 17:52:17 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.9 2002/11/25 14:04:52 eich Exp $ #include <Threads.tmpl> @@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.5 2002/02/28 17:52 * driver modules. */ -#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib +#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -41,7 +41,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif -#ifdef i386Architecture +#if defined(i386Architecture) && MesaUseX86Asm ASM_DIR = X86 ASM_SRCS = ASM_OBJS = |