diff options
| author | dawes <dawes> | 2002-02-28 18:22:13 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2002-02-28 18:22:13 +0000 |
| commit | f9e0d949cf0a0a54b2e66ad8aab15197c431f5dd (patch) | |
| tree | b422d8fa6ca0fa0c68047c4db0d5d60397f96951 | |
| parent | f2bdb0b0998a0933268bf6e2c7602ce45e43f378 (diff) | |
GL/mesa build cleanups/fixes.
48 files changed, 1221 insertions, 1109 deletions
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index fb4a3509b..fd481028e 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -484,6 +484,9 @@ VENDORMANVERSION = XVendorManVersionString #ifndef BuildGLXLibrary #define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly) #endif +#ifndef BuildOSMesaLib +#define BuildOSMesaLib (BuildGlxExt && defined(XFree86Version)) +#endif #ifndef BuildGLULibrary #define BuildGLULibrary (BuildGLXLibrary && HasCplusplus) #endif diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index 5b4f77f11..9d860906b 100644 --- a/xc/config/cf/xfree86.cf +++ b/xc/config/cf/xfree86.cf @@ -313,8 +313,22 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ siliconmotion \ vesa vga XF86OSCardDrivers XF86ExtraCardDrivers # endif + +/* + * DRI drivers under development, or drivers included on this platform + * only for build testing. + */ +# ifndef DevelDRIDrivers +# if XFree86Devel +# define DevelDRIDrivers ffb +# else +# define DevelDRIDrivers /**/ +# endif +# endif + # ifndef DriDrivers -# define DriDrivers gamma tdfx mga i810 i830 r128 radeon sis +# define DriDrivers gamma i810 /*i830*/ mga r128 radeon \ + /*sis*/ tdfx DevelDRIDrivers # endif #endif @@ -826,12 +840,22 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 * If more than one are defined, the compilation will fail with multiply * defined references of GLX and OpenGL functions. */ + +/* + * The first is a built-in driver that does software rendering client-side + * and renders to the X server via Xlib. + */ + +# ifndef GlxBuiltInXMesa +# define GlxBuiltInXMesa NO +# endif + +/* + * The rest are hardware-specific DRI drivers. + */ # ifndef GlxBuiltInGamma # define GlxBuiltInGamma NO # endif -# ifndef GlxBuiltInMesa -# define GlxBuiltInMesa NO -# endif # ifndef GlxBuiltInTdfx # define GlxBuiltInTdfx NO # endif @@ -876,8 +900,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 GlxBuiltInR128 || \ GlxBuiltInRadeon || \ GlxBuiltInFfb || \ - GlxBuiltInSIS || \ - GlxBuiltInMesa + GlxBuiltInSIS # define GlxUseBuiltInDRIDriver YES # define DRIDynLoadDefines /**/ # else diff --git a/xc/lib/GL/GL/Imakefile b/xc/lib/GL/GL/Imakefile index 81e211550..acdab5640 100644 --- a/xc/lib/GL/GL/Imakefile +++ b/xc/lib/GL/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.7 2001/04/03 02:29:31 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.13 2002/02/27 21:09:32 tsi Exp $ #include <Threads.tmpl> @@ -15,12 +15,19 @@ XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.7 2001/04/03 02:29:31 dawes Exp $ BASEREQUIREDLIBS = SharedGLReqs #endif -#define MesaBuildDir $(GLXLIBSRC)/mesa/src/ +#include "../mesa/src/array_cache/Imakefile.inc" +#include "../mesa/src/math/Imakefile.inc" +#include "../mesa/src/swrast/Imakefile.inc" +#include "../mesa/src/swrast_setup/Imakefile.inc" +#include "../mesa/src/tnl/Imakefile.inc" +#include "../mesa/src/tnl_dd/Imakefile.inc" #include "../mesa/src/Imakefile.inc" -#define MesaX86BuildDir $(GLXLIBSRC)/mesa/src/X86/ #ifdef i386Architecture #include "../mesa/src/X86/Imakefile.inc" #endif +#ifdef SparcArchitecture +#include "../mesa/src/SPARC/Imakefile.inc" +#endif XCOMM XCOMM Not related to ProfileLibGlx - I dont know how that works. KW. @@ -108,6 +115,19 @@ OTHERREQUIREDLIBS = -lglide3 -ldl DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) \ $(DRMPOBJS) +#elif GlxBuiltInI830 +#define MesaDrvI830BuildDir $(GLXLIBSRC)/mesa/src/drv/i830/ +#include "../mesa/src/drv/i830/Imakefile.inc" + + DRVOBJS = $(I830OBJS) $(COMMONOBJS) $(MESAOBJS) $(DRIMESAOBJS) \ + $(DRMOBJS) + DRVUOBJS = $(I830UOBJS) $(COMMONUOBJS) $(MESAUOBJS) $(DRIMESAUOBJS) \ + $(DRMUOBJS) + DRVDOBJS = $(I830DOBJS) $(COMMONDOBJS) $(MESADOBJS) $(DRIMESADOBJS) \ + $(DRMDOBJS) + DRVPOBJS = $(I830POBJS) $(COMMONPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) \ + $(DRMPOBJS) + #elif GlxBuiltInMga #define MesaDrvMgaBuildDir $(GLXLIBSRC)/mesa/src/drv/mga/ @@ -170,16 +190,14 @@ OTHERREQUIREDLIBS = -lglide3 -ldl DRVDOBJS = $(SISDOBJS) $(MESADOBJS) $(DRIMESADOBJS) $(DRMDOBJS) DRVPOBJS = $(SISPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) -#elif GlxBuiltInMesa - -#ifndef GlxDriverUsesMesa +#elif GlxBuiltInXMesa - DRVOBJS = $(MESAOBJS) - DRVUOBJS = $(MESAUOBJS) - DRVDOBJS = $(MESADOBJS) - DRVPOBJS = $(MESAPOBJS) +#include "../mesa/src/X/Imakefile.inc" -#endif + DRVOBJS = $(MESAOBJS) $(XMESA_OBJS) + DRVUOBJS = $(MESAUOBJS) $(XMESA_UOBJS) + DRVDOBJS = $(MESADOBJS) $(XMESA_DOBJS) + DRVPOBJS = $(MESAPOBJS) $(XMESA_POBJS) #else @@ -206,8 +224,12 @@ REQUIREDLIBS = $(BASEREQUIREDLIBS) $(OTHERREQUIREDLIBS) POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) #if LocalThreads +#if NeedUIThrStubs + THREADOBJS = $(LDPRELIB) $(XTHRSTUBLIB) +#else THREADOBJS = $(THREADS_LIBS) #endif +#endif #include <Library.tmpl> diff --git a/xc/lib/GL/Imakefile b/xc/lib/GL/Imakefile index 2c884f7e9..b7b2409bd 100644 --- a/xc/lib/GL/Imakefile +++ b/xc/lib/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.37 2001/03/23 20:56:28 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.40 2002/02/27 00:51:14 dawes Exp $ XCOMM XCOMM Imake tokens which are significant to building libGL: @@ -59,17 +59,47 @@ XCOMM GlxUseSGISI LIBGLBUILDDIR = GL GLXDIRS = glx -#if BuildXF86DRI && !GlxUseSGISI && \ - (!GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) - MESADIRS = mesa/src mesa/src/X +/* + * Need to build the Mesa + XMesa source in the following cases: + * BuildXF86DRI && defined(DriDrivers) + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + */ +#if (BuildXF86DRI && defined(DriDrivers)) || \ + GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib + MESADIRS = mesa/src +#endif + +/* + * Only need the OSmesa code in the following case: + * BuildOSMesaLib + */ +#if BuildOSMesaLib OSMESADIRS = mesa/src/OSmesa #endif +/* + * Need to build the DRI code in the following cases: + * BuildXF86DRI + */ #if BuildXF86DRI DRIDIRS = dri +#endif + +/* + * Need to build the DRI drivers in the following cases: + * BuildXF86DRI && defined(DriDrivers) + */ +#if BuildXF86DRI && defined(DriDrivers) DRIVERDIRS = mesa/src/drv #endif +/* + * The build order depends on whether the drivers are loaded into libGL or + * built-in to libGL. In the former case, libGL needs to be built before + * the drivers, and in the latter case, it needs to be built after the driver. + */ #if GlxUseBuiltInDRIDriver SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) #else diff --git a/xc/lib/GL/glx/Imakefile b/xc/lib/GL/glx/Imakefile index 393c022c7..a99be350f 100644 --- a/xc/lib/GL/glx/Imakefile +++ b/xc/lib/GL/glx/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.14 2001/04/03 02:29:32 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.16 2002/02/27 21:09:32 tsi Exp $ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -35,9 +35,12 @@ XCOMM glw LinkSourceFile(glapi.c, $(MESASRCDIR)/src) LinkSourceFile(glthread.c, $(MESASRCDIR)/src) +#ifdef i386Architecture LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/X86) +#endif +#ifdef SparcArchitecture LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/SPARC) - +#endif # Maybe some of these could come from @@ -89,6 +92,13 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/SPARC) GLX_DEFS = GlxDefines +#ifdef i386Architecture + ASM_DIR = X86 +#endif +#ifdef SparcArchitecture + ASM_DIR = SPARC +#endif + #if BuildXF86DRI DRI_INCS = -I$(GLXLIBSRC)/dri #if defined(i386Architecture) @@ -118,8 +128,7 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/SPARC) -I$(GLXLIBSRC)/glx \ -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/X \ - -I$(MESASRCDIR)/src/X86 \ - -I$(MESASRCDIR)/src/SPARC \ + -I$(MESASRCDIR)/src/$(ASM_DIR) \ -I$(MESASRCDIR)/include \ -I$(GLXLIBSRC)/include \ $(DRI_INCS) diff --git a/xc/lib/GL/glx/glxcmds.c b/xc/lib/GL/glx/glxcmds.c index 4b2ee97a9..c12064234 100644 --- a/xc/lib/GL/glx/glxcmds.c +++ b/xc/lib/GL/glx/glxcmds.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.15 2001/04/07 01:39:39 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.17 2002/02/27 21:09:32 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -38,7 +38,7 @@ #include "glxclient.h" #include <extutil.h> #include <Xext.h> -#include <strings.h> +#include <string.h> #include "glapi.h" #ifdef GLX_DIRECT_RENDERING #include "indirect_init.h" diff --git a/xc/lib/GL/mesa/src/Imakefile b/xc/lib/GL/mesa/src/Imakefile index 145babf29..a73cb5b4a 100644 --- a/xc/lib/GL/mesa/src/Imakefile +++ b/xc/lib/GL/mesa/src/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.26 2001/05/02 15:06:02 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30 2002/02/27 00:51:14 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -31,7 +35,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #include "X86/Imakefile.inc" ASM_SUBDIRS = X86 #endif -#ifdef Sparcrchitecture +#ifdef SparcArchitecture #define MesaSparcBuildDir /**/ #include "SPARC/Imakefile.inc" ASM_SUBDIRS = SPARC @@ -62,7 +66,7 @@ NormalLintTarget($(SRCS)) #define IHaveSubdirs #define PassCDebugFlags -SUBDIRS = $(ASM_SUBDIRS) math array_cache swrast swrast_setup tnl tnl_dd X +SUBDIRS = $(ASM_SUBDIRS) math array_cache swrast swrast_setup tnl /*tnl_dd*/ X MakeSubdirs($(SUBDIRS)) diff --git a/xc/lib/GL/mesa/src/Imakefile.inc b/xc/lib/GL/mesa/src/Imakefile.inc index 57473d867..e435bef36 100644 --- a/xc/lib/GL/mesa/src/Imakefile.inc +++ b/xc/lib/GL/mesa/src/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.5 2001/04/02 22:15:47 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7 2002/02/23 00:45:46 dawes Exp $ #ifndef MesaBuildDir #define MesaBuildDir $(GLXLIBSRC)/mesa/src/ @@ -262,72 +262,11 @@ COREMESABASEOBJS = \ $(MESABUILDDIR)vtxfmt.o COREMESAOBJS = $(COREMESABASEOBJS) \ - $(MESABUILDDIR)array_cache/ac_context.o \ - $(MESABUILDDIR)array_cache/ac_import.o \ - $(MESABUILDDIR)math/m_debug_clip.o \ - $(MESABUILDDIR)math/m_debug_norm.o \ - $(MESABUILDDIR)math/m_debug_vertex.o \ - $(MESABUILDDIR)math/m_debug_xform.o \ - $(MESABUILDDIR)math/m_eval.o \ - $(MESABUILDDIR)math/m_matrix.o \ - $(MESABUILDDIR)math/m_translate.o \ - $(MESABUILDDIR)math/m_vector.o \ - $(MESABUILDDIR)math/m_vertices.o \ - $(MESABUILDDIR)math/m_xform.o \ - $(MESABUILDDIR)swrast/s_aaline.o \ - $(MESABUILDDIR)swrast/s_aatriangle.o \ - $(MESABUILDDIR)swrast/s_accum.o \ - $(MESABUILDDIR)swrast/s_alpha.o \ - $(MESABUILDDIR)swrast/s_alphabuf.o \ - $(MESABUILDDIR)swrast/s_bitmap.o \ - $(MESABUILDDIR)swrast/s_blend.o \ - $(MESABUILDDIR)swrast/s_buffers.o \ - $(MESABUILDDIR)swrast/s_copypix.o \ - $(MESABUILDDIR)swrast/s_context.o \ - $(MESABUILDDIR)swrast/s_depth.o \ - $(MESABUILDDIR)swrast/s_drawpix.o \ - $(MESABUILDDIR)swrast/s_feedback.o \ - $(MESABUILDDIR)swrast/s_fog.o \ - $(MESABUILDDIR)swrast/s_histogram.o \ - $(MESABUILDDIR)swrast/s_imaging.o \ - $(MESABUILDDIR)swrast/s_lines.o \ - $(MESABUILDDIR)swrast/s_logic.o \ - $(MESABUILDDIR)swrast/s_masking.o \ - $(MESABUILDDIR)swrast/s_pb.o \ - $(MESABUILDDIR)swrast/s_pixeltex.o \ - $(MESABUILDDIR)swrast/s_points.o \ - $(MESABUILDDIR)swrast/s_readpix.o \ - $(MESABUILDDIR)swrast/s_scissor.o \ - $(MESABUILDDIR)swrast/s_span.o \ - $(MESABUILDDIR)swrast/s_stencil.o \ - $(MESABUILDDIR)swrast/s_texture.o \ - $(MESABUILDDIR)swrast/s_texstore.o \ - $(MESABUILDDIR)swrast/s_triangle.o \ - $(MESABUILDDIR)swrast/s_zoom.o \ - $(MESABUILDDIR)swrast_setup/ss_context.o \ - $(MESABUILDDIR)swrast_setup/ss_triangle.o \ - $(MESABUILDDIR)swrast_setup/ss_vb.o \ - $(MESABUILDDIR)tnl/t_array_api.o \ - $(MESABUILDDIR)tnl/t_array_import.o \ - $(MESABUILDDIR)tnl/t_context.o \ - $(MESABUILDDIR)tnl/t_eval_api.o \ - $(MESABUILDDIR)tnl/t_imm_alloc.o \ - $(MESABUILDDIR)tnl/t_imm_api.o \ - $(MESABUILDDIR)tnl/t_imm_debug.o \ - $(MESABUILDDIR)tnl/t_imm_dlist.o \ - $(MESABUILDDIR)tnl/t_imm_elt.o \ - $(MESABUILDDIR)tnl/t_imm_eval.o \ - $(MESABUILDDIR)tnl/t_imm_exec.o \ - $(MESABUILDDIR)tnl/t_imm_fixup.o \ - $(MESABUILDDIR)tnl/t_pipeline.o \ - $(MESABUILDDIR)tnl/t_vb_fog.o \ - $(MESABUILDDIR)tnl/t_vb_light.o \ - $(MESABUILDDIR)tnl/t_vb_normals.o \ - $(MESABUILDDIR)tnl/t_vb_points.o \ - $(MESABUILDDIR)tnl/t_vb_render.o \ - $(MESABUILDDIR)tnl/t_vb_texgen.o \ - $(MESABUILDDIR)tnl/t_vb_texmat.o \ - $(MESABUILDDIR)tnl/t_vb_vertex.o + $(MESA_AC_OBJS) \ + $(MESA_MATH_OBJS) \ + $(MESA_SWRAST_OBJS) \ + $(MESA_SWR_SETUP_OBJS) \ + $(MESA_TNL_OBJS) #ifdef NeedAllMesaSrc DISPATCHUOBJS = $(MESABUILDDIR)unshared/dispatch.o @@ -336,7 +275,8 @@ GLAPINOOPUOBJS = $(MESABUILDDIR)unshared/glapinoop.o GLTHREADUOBJS = $(MESABUILDDIR)unshared/glthread.o #endif -COREMESAUOBJS = $(MESABUILDDIR)unshared/accum.o \ +#if DoSharedLib +COREMESABASEUOBJS = $(MESABUILDDIR)unshared/accum.o \ $(MESABUILDDIR)unshared/api_arrayelt.o \ $(MESABUILDDIR)unshared/api_eval.o \ $(MESABUILDDIR)unshared/api_loopback.o \ @@ -388,72 +328,16 @@ COREMESAUOBJS = $(MESABUILDDIR)unshared/accum.o \ $(MESABUILDDIR)unshared/texutil.o \ $(MESABUILDDIR)unshared/varray.o \ $(MESABUILDDIR)unshared/vtxfmt.o \ - $(MESABUILDDIR)array_cache/unshared/ac_context.o \ - $(MESABUILDDIR)array_cache/unshared/ac_import.o \ - $(MESABUILDDIR)math/unshared/m_debug_clip.o \ - $(MESABUILDDIR)math/unshared/m_debug_norm.o \ - $(MESABUILDDIR)math/unshared/m_debug_vertex.o \ - $(MESABUILDDIR)math/unshared/m_debug_xform.o \ - $(MESABUILDDIR)math/unshared/m_eval.o \ - $(MESABUILDDIR)math/unshared/m_matrix.o \ - $(MESABUILDDIR)math/unshared/m_translate.o \ - $(MESABUILDDIR)math/unshared/m_vector.o \ - $(MESABUILDDIR)math/unshared/m_vertices.o \ - $(MESABUILDDIR)math/unshared/m_xform.o \ - $(MESABUILDDIR)swrast/unshared/s_aaline.o \ - $(MESABUILDDIR)swrast/unshared/s_aatriangle.o \ - $(MESABUILDDIR)swrast/unshared/s_accum.o \ - $(MESABUILDDIR)swrast/unshared/s_alpha.o \ - $(MESABUILDDIR)swrast/unshared/s_alphabuf.o \ - $(MESABUILDDIR)swrast/unshared/s_bitmap.o \ - $(MESABUILDDIR)swrast/unshared/s_blend.o \ - $(MESABUILDDIR)swrast/unshared/s_buffers.o \ - $(MESABUILDDIR)swrast/unshared/s_copypix.o \ - $(MESABUILDDIR)swrast/unshared/s_context.o \ - $(MESABUILDDIR)swrast/unshared/s_depth.o \ - $(MESABUILDDIR)swrast/unshared/s_drawpix.o \ - $(MESABUILDDIR)swrast/unshared/s_feedback.o \ - $(MESABUILDDIR)swrast/unshared/s_fog.o \ - $(MESABUILDDIR)swrast/unshared/s_histogram.o \ - $(MESABUILDDIR)swrast/unshared/s_imaging.o \ - $(MESABUILDDIR)swrast/unshared/s_lines.o \ - $(MESABUILDDIR)swrast/unshared/s_logic.o \ - $(MESABUILDDIR)swrast/unshared/s_masking.o \ - $(MESABUILDDIR)swrast/unshared/s_pb.o \ - $(MESABUILDDIR)swrast/unshared/s_pixeltex.o \ - $(MESABUILDDIR)swrast/unshared/s_points.o \ - $(MESABUILDDIR)swrast/unshared/s_readpix.o \ - $(MESABUILDDIR)swrast/unshared/s_scissor.o \ - $(MESABUILDDIR)swrast/unshared/s_span.o \ - $(MESABUILDDIR)swrast/unshared/s_stencil.o \ - $(MESABUILDDIR)swrast/unshared/s_texture.o \ - $(MESABUILDDIR)swrast/unshared/s_texstore.o \ - $(MESABUILDDIR)swrast/unshared/s_triangle.o \ - $(MESABUILDDIR)swrast/unshared/s_zoom.o \ - $(MESABUILDDIR)swrast_setup/unshared/ss_context.o \ - $(MESABUILDDIR)swrast_setup/unshared/ss_triangle.o \ - $(MESABUILDDIR)swrast_setup/unshared/ss_vb.o \ - $(MESABUILDDIR)tnl/unshared/t_array_api.o \ - $(MESABUILDDIR)tnl/unshared/t_array_import.o \ - $(MESABUILDDIR)tnl/unshared/t_context.o \ - $(MESABUILDDIR)tnl/unshared/t_eval_api.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_alloc.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_api.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_debug.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_dlist.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_elt.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_eval.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_exec.o \ - $(MESABUILDDIR)tnl/unshared/t_imm_fixup.o \ - $(MESABUILDDIR)tnl/unshared/t_pipeline.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_fog.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_light.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_normals.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_points.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_render.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_texgen.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_texmat.o \ - $(MESABUILDDIR)tnl/unshared/t_vb_vertex.o +#else +COREMESABASEUOBJS = $(COREMESABASEOBJS) +#endif + +COREMESAUOBJS = $(COREMESABASEUOBJS) \ + $(MESA_AC_UOBJS) \ + $(MESA_MATH_UOBJS) \ + $(MESA_SWRAST_UOBJS) \ + $(MESA_SWR_SETUP_UOBJS) \ + $(MESA_TNL_UOBJS) #ifdef NeedAllMesaSrc DISPATCHDOBJS = $(MESABUILDDIR)debugger/dispatch.o @@ -462,7 +346,7 @@ GLAPINOOPDOBJS = $(MESABUILDDIR)debugger/glapinoop.o GLTHREADDOBJS = $(MESABUILDDIR)debugger/glthread.o #endif -COREMESADOBJS = $(MESABUILDDIR)debugger/accum.o \ +COREMESABASEDOBJS = $(MESABUILDDIR)debugger/accum.o \ $(MESABUILDDIR)debugger/api_arrayelt.o \ $(MESABUILDDIR)debugger/api_eval.o \ $(MESABUILDDIR)debugger/api_loopback.o \ @@ -514,72 +398,13 @@ COREMESADOBJS = $(MESABUILDDIR)debugger/accum.o \ $(MESABUILDDIR)debugger/texutil.o \ $(MESABUILDDIR)debugger/varray.o \ $(MESABUILDDIR)debugger/vtxfmt.o \ - $(MESABUILDDIR)array_cache/debugger/ac_context.o \ - $(MESABUILDDIR)array_cache/debugger/ac_import.o \ - $(MESABUILDDIR)math/debugger/m_debug_clip.o \ - $(MESABUILDDIR)math/debugger/m_debug_norm.o \ - $(MESABUILDDIR)math/debugger/m_debug_vertex.o \ - $(MESABUILDDIR)math/debugger/m_debug_xform.o \ - $(MESABUILDDIR)math/debugger/m_eval.o \ - $(MESABUILDDIR)math/debugger/m_matrix.o \ - $(MESABUILDDIR)math/debugger/m_translate.o \ - $(MESABUILDDIR)math/debugger/m_vector.o \ - $(MESABUILDDIR)math/debugger/m_vertices.o \ - $(MESABUILDDIR)math/debugger/m_xform.o \ - $(MESABUILDDIR)swrast/debugger/s_aaline.o \ - $(MESABUILDDIR)swrast/debugger/s_aatriangle.o \ - $(MESABUILDDIR)swrast/debugger/s_accum.o \ - $(MESABUILDDIR)swrast/debugger/s_alpha.o \ - $(MESABUILDDIR)swrast/debugger/s_alphabuf.o \ - $(MESABUILDDIR)swrast/debugger/s_bitmap.o \ - $(MESABUILDDIR)swrast/debugger/s_blend.o \ - $(MESABUILDDIR)swrast/debugger/s_buffers.o \ - $(MESABUILDDIR)swrast/debugger/s_copypix.o \ - $(MESABUILDDIR)swrast/debugger/s_context.o \ - $(MESABUILDDIR)swrast/debugger/s_depth.o \ - $(MESABUILDDIR)swrast/debugger/s_drawpix.o \ - $(MESABUILDDIR)swrast/debugger/s_feedback.o \ - $(MESABUILDDIR)swrast/debugger/s_fog.o \ - $(MESABUILDDIR)swrast/debugger/s_histogram.o \ - $(MESABUILDDIR)swrast/debugger/s_imaging.o \ - $(MESABUILDDIR)swrast/debugger/s_lines.o \ - $(MESABUILDDIR)swrast/debugger/s_logic.o \ - $(MESABUILDDIR)swrast/debugger/s_masking.o \ - $(MESABUILDDIR)swrast/debugger/s_pb.o \ - $(MESABUILDDIR)swrast/debugger/s_pixeltex.o \ - $(MESABUILDDIR)swrast/debugger/s_points.o \ - $(MESABUILDDIR)swrast/debugger/s_readpix.o \ - $(MESABUILDDIR)swrast/debugger/s_scissor.o \ - $(MESABUILDDIR)swrast/debugger/s_span.o \ - $(MESABUILDDIR)swrast/debugger/s_stencil.o \ - $(MESABUILDDIR)swrast/debugger/s_texture.o \ - $(MESABUILDDIR)swrast/debugger/s_texstore.o \ - $(MESABUILDDIR)swrast/debugger/s_triangle.o \ - $(MESABUILDDIR)swrast/debugger/s_zoom.o \ - $(MESABUILDDIR)swrast_setup/debugger/ss_context.o \ - $(MESABUILDDIR)swrast_setup/debugger/ss_triangle.o \ - $(MESABUILDDIR)swrast_setup/debugger/ss_vb.o \ - $(MESABUILDDIR)tnl/debugger/t_array_api.o \ - $(MESABUILDDIR)tnl/debugger/t_array_import.o \ - $(MESABUILDDIR)tnl/debugger/t_context.o \ - $(MESABUILDDIR)tnl/debugger/t_eval_api.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_alloc.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_api.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_debug.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_dlist.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_elt.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_eval.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_exec.o \ - $(MESABUILDDIR)tnl/debugger/t_imm_fixup.o \ - $(MESABUILDDIR)tnl/debugger/t_pipeline.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_fog.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_light.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_normals.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_points.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_render.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_texgen.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_texmat.o \ - $(MESABUILDDIR)tnl/debugger/t_vb_vertex.o + +COREMESADOBJS = $(COREMESABASEDOBJS) \ + $(MESA_AC_DOBJS) \ + $(MESA_MATH_DOBJS) \ + $(MESA_SWRAST_DOBJS) \ + $(MESA_SWR_SETUP_DOBJS) \ + $(MESA_TNL_DOBJS) #ifdef NeedAllMesaSrc DISPATCHPOBJS = $(MESABUILDDIR)profiled/dispatch.o @@ -588,7 +413,7 @@ GLAPINOOPPOBJS = $(MESABUILDDIR)profiled/glapinoop.o GLTHREADPOBJS = $(MESABUILDDIR)profiled/glthread.o #endif -COREMESAPOBJS = $(MESABUILDDIR)profiled/accum.o \ +COREMESABASEPOBJS = $(MESABUILDDIR)profiled/accum.o \ $(MESABUILDDIR)profiled/api_arrayelt.o \ $(MESABUILDDIR)profiled/api_eval.o \ $(MESABUILDDIR)profiled/api_loopback.o \ @@ -640,70 +465,11 @@ COREMESAPOBJS = $(MESABUILDDIR)profiled/accum.o \ $(MESABUILDDIR)profiled/texutil.o \ $(MESABUILDDIR)profiled/varray.o \ $(MESABUILDDIR)profiled/vtxfmt.o \ - $(MESABUILDDIR)array_cache/profiled/ac_context.o \ - $(MESABUILDDIR)array_cache/profiled/ac_import.o \ - $(MESABUILDDIR)math/profiled/m_debug_clip.o \ - $(MESABUILDDIR)math/profiled/m_debug_norm.o \ - $(MESABUILDDIR)math/profiled/m_debug_vertex.o \ - $(MESABUILDDIR)math/profiled/m_debug_xform.o \ - $(MESABUILDDIR)math/profiled/m_eval.o \ - $(MESABUILDDIR)math/profiled/m_matrix.o \ - $(MESABUILDDIR)math/profiled/m_translate.o \ - $(MESABUILDDIR)math/profiled/m_vector.o \ - $(MESABUILDDIR)math/profiled/m_vertices.o \ - $(MESABUILDDIR)math/profiled/m_xform.o \ - $(MESABUILDDIR)swrast/profiled/s_aaline.o \ - $(MESABUILDDIR)swrast/profiled/s_aatriangle.o \ - $(MESABUILDDIR)swrast/profiled/s_accum.o \ - $(MESABUILDDIR)swrast/profiled/s_alpha.o \ - $(MESABUILDDIR)swrast/profiled/s_alphabuf.o \ - $(MESABUILDDIR)swrast/profiled/s_bitmap.o \ - $(MESABUILDDIR)swrast/profiled/s_blend.o \ - $(MESABUILDDIR)swrast/profiled/s_buffers.o \ - $(MESABUILDDIR)swrast/profiled/s_copypix.o \ - $(MESABUILDDIR)swrast/profiled/s_context.o \ - $(MESABUILDDIR)swrast/profiled/s_depth.o \ - $(MESABUILDDIR)swrast/profiled/s_drawpix.o \ - $(MESABUILDDIR)swrast/profiled/s_feedback.o \ - $(MESABUILDDIR)swrast/profiled/s_fog.o \ - $(MESABUILDDIR)swrast/profiled/s_histogram.o \ - $(MESABUILDDIR)swrast/profiled/s_imaging.o \ - $(MESABUILDDIR)swrast/profiled/s_lines.o \ - $(MESABUILDDIR)swrast/profiled/s_logic.o \ - $(MESABUILDDIR)swrast/profiled/s_masking.o \ - $(MESABUILDDIR)swrast/profiled/s_pb.o \ - $(MESABUILDDIR)swrast/profiled/s_pixeltex.o \ - $(MESABUILDDIR)swrast/profiled/s_points.o \ - $(MESABUILDDIR)swrast/profiled/s_readpix.o \ - $(MESABUILDDIR)swrast/profiled/s_scissor.o \ - $(MESABUILDDIR)swrast/profiled/s_span.o \ - $(MESABUILDDIR)swrast/profiled/s_stencil.o \ - $(MESABUILDDIR)swrast/profiled/s_texture.o \ - $(MESABUILDDIR)swrast/profiled/s_texstore.o \ - $(MESABUILDDIR)swrast/profiled/s_triangle.o \ - $(MESABUILDDIR)swrast/profiled/s_zoom.o \ - $(MESABUILDDIR)swrast_setup/profiled/ss_context.o \ - $(MESABUILDDIR)swrast_setup/profiled/ss_triangle.o \ - $(MESABUILDDIR)swrast_setup/profiled/ss_vb.o \ - $(MESABUILDDIR)tnl/profiled/t_array_api.o \ - $(MESABUILDDIR)tnl/profiled/t_array_import.o \ - $(MESABUILDDIR)tnl/profiled/t_context.o \ - $(MESABUILDDIR)tnl/profiled/t_eval_api.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_alloc.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_api.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_debug.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_dlist.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_elt.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_eval.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_exec.o \ - $(MESABUILDDIR)tnl/profiled/t_imm_fixup.o \ - $(MESABUILDDIR)tnl/profiled/t_pipeline.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_fog.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_light.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_normals.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_points.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_render.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_texgen.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_texmat.o \ - $(MESABUILDDIR)tnl/profiled/t_vb_vertex.o + +COREMESAPOBJS = $(COREMESABASEPOBJS) \ + $(MESA_AC_POBJS) \ + $(MESA_MATH_POBJS) \ + $(MESA_SWRAST_POBJS) \ + $(MESA_SWR_SETUP_POBJS) \ + $(MESA_TNL_POBJS) diff --git a/xc/lib/GL/mesa/src/OSmesa/Imakefile b/xc/lib/GL/mesa/src/OSmesa/Imakefile index 374807548..a2c704dce 100644 --- a/xc/lib/GL/mesa/src/OSmesa/Imakefile +++ b/xc/lib/GL/mesa/src/OSmesa/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.11 2001/06/04 20:43:30 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.13 2002/02/23 00:45:47 dawes Exp $ #include <Threads.tmpl> @@ -8,6 +8,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.11 2001/06/04 20:43:30 d #define DoDebugLib DebugLibGlx #define DoProfileLib ProfileLibGlx +#include "../array_cache/Imakefile.inc" +#include "../math/Imakefile.inc" +#include "../swrast/Imakefile.inc" +#include "../swrast_setup/Imakefile.inc" +#include "../tnl/Imakefile.inc" +#include "../tnl_dd/Imakefile.inc" #include "../Imakefile.inc" #ifdef i386Architecture #include "../X86/Imakefile.inc" diff --git a/xc/lib/GL/mesa/src/SPARC/Imakefile b/xc/lib/GL/mesa/src/SPARC/Imakefile index f2201099b..7c958924b 100644 --- a/xc/lib/GL/mesa/src/SPARC/Imakefile +++ b/xc/lib/GL/mesa/src/SPARC/Imakefile @@ -1,12 +1,16 @@ -XCOMM $XFree86$ +XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.2 2002/02/27 00:51:14 dawes Exp $ /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -20,6 +24,7 @@ XCOMM $XFree86$ #define DoProfileLib NO #endif + #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif diff --git a/xc/lib/GL/mesa/src/X/Imakefile b/xc/lib/GL/mesa/src/X/Imakefile index 14ed71d02..2fc8bfd22 100644 --- a/xc/lib/GL/mesa/src/X/Imakefile +++ b/xc/lib/GL/mesa/src/X/Imakefile @@ -1,16 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12 2002/02/28 17:52:15 dawes Exp $ #include <Threads.tmpl> -#include "Imakefile.inc" - /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -24,16 +26,10 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/X) -LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/X) -LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/X) -LinkSourceFile(realglx.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/X) + +#define MesaXBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL @@ -42,14 +38,13 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(TOP)/include -I$(TOP)/include/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif MESA_INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/X \ -I$(MESASRCDIR)/include \ - -I../../../include + -I../../../include -I$(XINCLUDESRC) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/X/Imakefile.inc b/xc/lib/GL/mesa/src/X/Imakefile.inc index 3eff4375d..4c18af1b0 100644 --- a/xc/lib/GL/mesa/src/X/Imakefile.inc +++ b/xc/lib/GL/mesa/src/X/Imakefile.inc @@ -1,57 +1,98 @@ -XCOMM $XFree86$ - -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/src -#endif - -MESABUILDDIR = MesaBuildDir - - XMESA_SRCS = $(MESABUILDDIR)/X/fakeglx.c \ - $(MESABUILDDIR)/X/glxapi.c \ - $(MESABUILDDIR)/X/realglx.c \ - $(MESABUILDDIR)/X/xfonts.c \ - $(MESABUILDDIR)/X/xm_api.c \ - $(MESABUILDDIR)/X/xm_dd.c \ - $(MESABUILDDIR)/X/xm_line.c \ - $(MESABUILDDIR)/X/xm_span.c \ - $(MESABUILDDIR)/X/xm_tri.c - - XMESA_OBJS = $(MESABUILDDIR)/X/fakeglx.o \ - $(MESABUILDDIR)/X/glxapi.o \ - $(MESABUILDDIR)/X/realglx.o \ - $(MESABUILDDIR)/X/xfonts.o \ - $(MESABUILDDIR)/X/xm_api.o \ - $(MESABUILDDIR)/X/xm_dd.o \ - $(MESABUILDDIR)/X/xm_line.o \ - $(MESABUILDDIR)/X/xm_span.o \ - $(MESABUILDDIR)/X/xm_tri.o - - XMESA_DOBJS = $(MESABUILDDIR)/X/debugger/fakeglx.o \ - $(MESABUILDDIR)/X/debugger/glxapi.o \ - $(MESABUILDDIR)/X/debugger/realglx.o \ - $(MESABUILDDIR)/X/debugger/xfonts.o \ - $(MESABUILDDIR)/X/debugger/xm_api.o \ - $(MESABUILDDIR)/X/debugger/xm_dd.o \ - $(MESABUILDDIR)/X/debugger/xm_line.o \ - $(MESABUILDDIR)/X/debugger/xm_span.o \ - $(MESABUILDDIR)/X/debugger/xm_tri.o - - XMESA_POBJS = $(MESABUILDDIR)/X/profiled/fakeglx.o \ - $(MESABUILDDIR)/X/profiled/glxapi.o \ - $(MESABUILDDIR)/X/profiled/realglx.o \ - $(MESABUILDDIR)/X/profiled/xfonts.o \ - $(MESABUILDDIR)/X/profiled/xm_api.o \ - $(MESABUILDDIR)/X/profiled/xm_dd.o \ - $(MESABUILDDIR)/X/profiled/xm_line.o \ - $(MESABUILDDIR)/X/profiled/xm_span.o \ - $(MESABUILDDIR)/X/profiled/xm_tri.o - - XMESA_UOBJS = $(MESABUILDDIR)/X/unshared/fakeglx.o \ - $(MESABUILDDIR)/X/unshared/glxapi.o \ - $(MESABUILDDIR)/X/unshared/realglx.o \ - $(MESABUILDDIR)/X/unshared/xfonts.o \ - $(MESABUILDDIR)/X/unshared/xm_api.o \ - $(MESABUILDDIR)/X/unshared/xm_dd.o \ - $(MESABUILDDIR)/X/unshared/xm_line.o \ - $(MESABUILDDIR)/X/unshared/xm_span.o \ - $(MESABUILDDIR)/X/unshared/xm_tri.o +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3 2002/02/25 00:45:40 dawes Exp $ + +#ifndef MesaXBuildDir +#define MesaXBuildDir $(GLXLIBSRC)/mesa/src/X/ +#endif + +MESAXBUILDDIR = MesaXBuildDir + +#ifndef MesaInXServer +XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \ + $(MESAXBUILDDIR)glxapi.c \ + $(MESAXBUILDDIR)realglx.c \ + $(MESAXBUILDDIR)xfonts.c +#endif + + XMESA_SRCS = $(XMESA_GLX_SRCS) \ + $(MESAXBUILDDIR)xm_api.c \ + $(MESAXBUILDDIR)xm_dd.c \ + $(MESAXBUILDDIR)xm_line.c \ + $(MESAXBUILDDIR)xm_span.c \ + $(MESAXBUILDDIR)xm_tri.c + +#ifdef NeedToLinkMesaSrc +#ifndef MesaInXServer +LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/X) +LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/X) +LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/X) +LinkSourceFile(realglx.c, $(MESASRCDIR)/src/X) +LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/X) +#endif +LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/X) +LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/X) +LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/X) +LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/X) +LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/X) +#endif + +#ifndef MesaInXServer +XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \ + $(MESAXBUILDDIR)glxapi.o \ + $(MESAXBUILDDIR)realglx.o \ + $(MESAXBUILDDIR)xfonts.o +#endif + + XMESA_OBJS = $(XMESA_GLX_OBJS) \ + $(MESAXBUILDDIR)xm_api.o \ + $(MESAXBUILDDIR)xm_dd.o \ + $(MESAXBUILDDIR)xm_line.o \ + $(MESAXBUILDDIR)xm_span.o \ + $(MESAXBUILDDIR)xm_tri.o + +#if DoSharedLib +#ifndef MesaInXServer +XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \ + $(MESAXBUILDDIR)unshared/glxapi.o \ + $(MESAXBUILDDIR)unshared/realglx.o \ + $(MESAXBUILDDIR)unshared/xfonts.o +#endif + + XMESA_UOBJS = $(XMESA_GLX_UOBJS) \ + $(MESAXBUILDDIR)unshared/xm_api.o \ + $(MESAXBUILDDIR)unshared/xm_dd.o \ + $(MESAXBUILDDIR)unshared/xm_line.o \ + $(MESAXBUILDDIR)unshared/xm_span.o \ + $(MESAXBUILDDIR)unshared/xm_tri.o +#else +XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS) + XMESA_UOBJS = $(XMESA_OBJS) +#endif + +#ifndef MesaInXServer +XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \ + $(MESAXBUILDDIR)debugger/glxapi.o \ + $(MESAXBUILDDIR)debugger/realglx.o \ + $(MESAXBUILDDIR)debugger/xfonts.o +#endif + + XMESA_DOBJS = $(XMESA_GLX_DOBJS) \ + $(MESAXBUILDDIR)debugger/xm_api.o \ + $(MESAXBUILDDIR)debugger/xm_dd.o \ + $(MESAXBUILDDIR)debugger/xm_line.o \ + $(MESAXBUILDDIR)debugger/xm_span.o \ + $(MESAXBUILDDIR)debugger/xm_tri.o + +#ifndef MesaInXServer +XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \ + $(MESAXBUILDDIR)profiled/glxapi.o \ + $(MESAXBUILDDIR)profiled/realglx.o \ + $(MESAXBUILDDIR)profiled/xfonts.o +#endif + + XMESA_POBJS = $(XMESA_GLX_POBJS) \ + $(MESAXBUILDDIR)profiled/xm_api.o \ + $(MESAXBUILDDIR)profiled/xm_dd.o \ + $(MESAXBUILDDIR)profiled/xm_line.o \ + $(MESAXBUILDDIR)profiled/xm_span.o \ + $(MESAXBUILDDIR)profiled/xm_tri.o + diff --git a/xc/lib/GL/mesa/src/X86/Imakefile b/xc/lib/GL/mesa/src/X86/Imakefile index 799a7b9c1..93e4e8f98 100644 --- a/xc/lib/GL/mesa/src/X86/Imakefile +++ b/xc/lib/GL/mesa/src/X86/Imakefile @@ -1,12 +1,16 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.18 2001/05/02 15:06:03 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.20 2002/02/27 00:51:15 dawes Exp $ /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -20,6 +24,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.18 2001/05/02 15:06:03 dawe #define DoProfileLib NO #endif + #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif diff --git a/xc/lib/GL/mesa/src/X86/Imakefile.inc b/xc/lib/GL/mesa/src/X86/Imakefile.inc index df57677c9..143073c74 100644 --- a/xc/lib/GL/mesa/src/X86/Imakefile.inc +++ b/xc/lib/GL/mesa/src/X86/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.4 2002/02/27 21:09:33 tsi Exp $ #ifndef MesaX86BuildDir #define MesaX86BuildDir $(GLXLIBSRC)/mesa/src/X86/ @@ -217,5 +217,5 @@ MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \ MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \ $(MESA_SSE_POBJS) -MESA_ASM_DEFINES = -DUSE_X86_ASM $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS) +MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS) diff --git a/xc/lib/GL/mesa/src/array_cache/Imakefile b/xc/lib/GL/mesa/src/array_cache/Imakefile index 00e5eea04..1007a0497 100644 --- a/xc/lib/GL/mesa/src/array_cache/Imakefile +++ b/xc/lib/GL/mesa/src/array_cache/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.5 2002/02/28 17:52:16 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -22,9 +26,10 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/array_cache) -LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/array_cache) +#define MesaACBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL @@ -33,20 +38,18 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(TOP)/include -I$(TOP)/include/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif MESA_INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/array_cache \ -I$(MESASRCDIR)/src/math \ -I$(MESASRCDIR)/include \ - -I../../../include + -I../../../include -I$(XINCLUDESRC) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = ac_context.c ac_import.c - OBJS = ac_context.o ac_import.o - + SRCS = $(MESA_AC_SRCS) + OBJS = $(MESA_AC_OBJS) #ifdef i386Architecture diff --git a/xc/lib/GL/mesa/src/drv/ffb/Imakefile b/xc/lib/GL/mesa/src/drv/ffb/Imakefile index 991d213ee..b373c463b 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/Imakefile +++ b/xc/lib/GL/mesa/src/drv/ffb/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.12 2001/05/10 16:56:10 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.15 2002/02/23 00:45:48 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.12 2001/05/10 16:56:10 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" diff --git a/xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc b/xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc index 1a9c4886c..e42c08c98 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc +++ b/xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc,v 1.4 2002/02/26 23:37:33 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(GLXLIBSRC)/mesa/src/drv @@ -9,7 +9,7 @@ MESADRVSRCDIR = MesaDrvSrcDir #ifndef MesaDrvFfbBuildDir #define MesaDrvFfbBuildDir /**/ #endif -MESADRVRADEONBUILDDIR = MesaDrvFfbBuildDir +MESADRVFFBBUILDDIR = MesaDrvFfbBuildDir #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL @@ -34,87 +34,87 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESADRVSRCDIR)/ffb X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) - FFBSRCS = $(MESADRVRADEONBUILDDIR)ffb_bitmap.c \ - $(MESADRVRADEONBUILDDIR)ffb_clear.c \ - $(MESADRVRADEONBUILDDIR)ffb_dd.c \ - $(MESADRVRADEONBUILDDIR)ffb_depth.c \ - $(MESADRVRADEONBUILDDIR)ffb_fog.c \ - $(MESADRVRADEONBUILDDIR)ffb_lines.c \ - $(MESADRVRADEONBUILDDIR)ffb_points.c \ - $(MESADRVRADEONBUILDDIR)ffb_span.c \ - $(MESADRVRADEONBUILDDIR)ffb_state.c \ - $(MESADRVRADEONBUILDDIR)ffb_stencil.c \ - $(MESADRVRADEONBUILDDIR)ffb_tex.c \ - $(MESADRVRADEONBUILDDIR)ffb_tris.c \ - $(MESADRVRADEONBUILDDIR)ffb_vb.c \ - $(MESADRVRADEONBUILDDIR)ffb_xmesa.c + FFBSRCS = $(MESADRVFFBBUILDDIR)ffb_bitmap.c \ + $(MESADRVFFBBUILDDIR)ffb_clear.c \ + $(MESADRVFFBBUILDDIR)ffb_dd.c \ + $(MESADRVFFBBUILDDIR)ffb_depth.c \ + /* $(MESADRVFFBBUILDDIR)ffb_fog.c */ \ + $(MESADRVFFBBUILDDIR)ffb_lines.c \ + $(MESADRVFFBBUILDDIR)ffb_points.c \ + $(MESADRVFFBBUILDDIR)ffb_span.c \ + $(MESADRVFFBBUILDDIR)ffb_state.c \ + $(MESADRVFFBBUILDDIR)ffb_stencil.c \ + $(MESADRVFFBBUILDDIR)ffb_tex.c \ + $(MESADRVFFBBUILDDIR)ffb_tris.c \ + $(MESADRVFFBBUILDDIR)ffb_vb.c \ + $(MESADRVFFBBUILDDIR)ffb_xmesa.c - FFBOBJS = $(MESADRVRADEONBUILDDIR)ffb_bitmap.o \ - $(MESADRVRADEONBUILDDIR)ffb_clear.o \ - $(MESADRVRADEONBUILDDIR)ffb_dd.o \ - $(MESADRVRADEONBUILDDIR)ffb_depth.o \ - $(MESADRVRADEONBUILDDIR)ffb_fog.o \ - $(MESADRVRADEONBUILDDIR)ffb_lines.o \ - $(MESADRVRADEONBUILDDIR)ffb_points.o \ - $(MESADRVRADEONBUILDDIR)ffb_span.o \ - $(MESADRVRADEONBUILDDIR)ffb_state.o \ - $(MESADRVRADEONBUILDDIR)ffb_stencil.o \ - $(MESADRVRADEONBUILDDIR)ffb_tex.o \ - $(MESADRVRADEONBUILDDIR)ffb_tris.o \ - $(MESADRVRADEONBUILDDIR)ffb_vb.o \ - $(MESADRVRADEONBUILDDIR)ffb_xmesa.o + FFBOBJS = $(MESADRVFFBBUILDDIR)ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)ffb_clear.o \ + $(MESADRVFFBBUILDDIR)ffb_dd.o \ + $(MESADRVFFBBUILDDIR)ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)ffb_lines.o \ + $(MESADRVFFBBUILDDIR)ffb_points.o \ + $(MESADRVFFBBUILDDIR)ffb_span.o \ + $(MESADRVFFBBUILDDIR)ffb_state.o \ + $(MESADRVFFBBUILDDIR)ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)ffb_tex.o \ + $(MESADRVFFBBUILDDIR)ffb_tris.o \ + $(MESADRVFFBBUILDDIR)ffb_vb.o \ + $(MESADRVFFBBUILDDIR)ffb_xmesa.o - FFBUOBJS = $(MESADRVRADEONBUILDDIR)unshared/ffb_bitmap.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_clear.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_dd.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_depth.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_fog.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_lines.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_points.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_span.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_state.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_stencil.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_tex.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_tris.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_vb.o \ - $(MESADRVRADEONBUILDDIR)unshared/ffb_xmesa.o + FFBUOBJS = $(MESADRVFFBBUILDDIR)unshared/ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_clear.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_dd.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)unshared/ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)unshared/ffb_lines.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_points.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_span.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_state.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_tex.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_tris.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_vb.o \ + $(MESADRVFFBBUILDDIR)unshared/ffb_xmesa.o - FFBDOBJS = $(MESADRVRADEONBUILDDIR)debugger/ffb_bitmap.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_clear.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_dd.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_depth.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_fog.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_lines.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_points.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_span.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_state.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_stencil.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_tex.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_tris.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_vb.o \ - $(MESADRVRADEONBUILDDIR)debugger/ffb_xmesa.o + FFBDOBJS = $(MESADRVFFBBUILDDIR)debugger/ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_clear.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_dd.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)debugger/ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)debugger/ffb_lines.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_points.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_span.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_state.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_tex.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_tris.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_vb.o \ + $(MESADRVFFBBUILDDIR)debugger/ffb_xmesa.o - FFBPOBJS = $(MESADRVRADEONBUILDDIR)profiled/ffb_bitmap.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_clear.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_dd.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_depth.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_fog.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_lines.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_points.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_span.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_state.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_stencil.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_tex.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_tris.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_vb.o \ - $(MESADRVRADEONBUILDDIR)profiled/ffb_xmesa.o + FFBPOBJS = $(MESADRVFFBBUILDDIR)profiled/ffb_bitmap.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_clear.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_dd.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_depth.o \ + /* $(MESADRVFFBBUILDDIR)profiled/ffb_fog.o */ \ + $(MESADRVFFBBUILDDIR)profiled/ffb_lines.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_points.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_span.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_state.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_stencil.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_tex.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_tris.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_vb.o \ + $(MESADRVFFBBUILDDIR)profiled/ffb_xmesa.o #ifdef NeedToLinkMesaSrc LinkSourceFile(ffb_bitmap.c, $(MESADRVSRCDIR)/ffb) LinkSourceFile(ffb_clear.c, $(MESADRVSRCDIR)/ffb) LinkSourceFile(ffb_dd.c, $(MESADRVSRCDIR)/ffb) LinkSourceFile(ffb_depth.c, $(MESADRVSRCDIR)/ffb) -LinkSourceFile(ffb_fog.c, $(MESADRVSRCDIR)/ffb) +/* LinkSourceFile(ffb_fog.c, $(MESADRVSRCDIR)/ffb) */ LinkSourceFile(ffb_lines.c, $(MESADRVSRCDIR)/ffb) LinkSourceFile(ffb_points.c, $(MESADRVSRCDIR)/ffb) LinkSourceFile(ffb_span.c, $(MESADRVSRCDIR)/ffb) diff --git a/xc/lib/GL/mesa/src/drv/gamma/Imakefile b/xc/lib/GL/mesa/src/drv/gamma/Imakefile index 7515867e7..aa9021bb5 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/Imakefile +++ b/xc/lib/GL/mesa/src/drv/gamma/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.23 2001/05/10 16:56:11 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.25 2002/02/23 00:45:49 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.23 2001/05/10 16:56:1 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" @@ -26,6 +32,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.23 2001/05/10 16:56:1 #include "../../SPARC/Imakefile.inc" #endif + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/drv/i810/Imakefile b/xc/lib/GL/mesa/src/drv/i810/Imakefile index 0bc38b49d..182654f6d 100644 --- a/xc/lib/GL/mesa/src/drv/i810/Imakefile +++ b/xc/lib/GL/mesa/src/drv/i810/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.19 2001/05/10 16:56:11 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.21 2002/02/23 00:45:49 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.19 2001/05/10 16:56:11 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" @@ -26,6 +32,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.19 2001/05/10 16:56:11 #include "../../SPARC/Imakefile.inc" #endif + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/drv/i830/Imakefile b/xc/lib/GL/mesa/src/drv/i830/Imakefile index 809f90232..926900c67 100644 --- a/xc/lib/GL/mesa/src/drv/i830/Imakefile +++ b/xc/lib/GL/mesa/src/drv/i830/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.1 2001/10/04 18:28:21 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.2 2002/02/23 00:45:50 dawes Exp $ #include <Threads.tmpl> @@ -18,11 +18,18 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i830/Imakefile,v 1.1 2001/10/04 18:28:21 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" #endif + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/drv/mga/Imakefile b/xc/lib/GL/mesa/src/drv/mga/Imakefile index 81b377006..f7e7ebc09 100644 --- a/xc/lib/GL/mesa/src/drv/mga/Imakefile +++ b/xc/lib/GL/mesa/src/drv/mga/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.20 2001/05/10 16:56:11 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.22 2002/02/23 00:45:50 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.20 2001/05/10 16:56:11 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" @@ -27,6 +33,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.20 2001/05/10 16:56:11 #endif + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/drv/r128/Imakefile b/xc/lib/GL/mesa/src/drv/r128/Imakefile index 68243040e..ff032a38a 100644 --- a/xc/lib/GL/mesa/src/drv/r128/Imakefile +++ b/xc/lib/GL/mesa/src/drv/r128/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.17 2001/05/10 16:56:11 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.19 2002/02/23 00:45:50 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.17 2001/05/10 16:56:11 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" @@ -26,6 +32,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.17 2001/05/10 16:56:11 #include "../../SPARC/Imakefile.inc" #endif + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/drv/radeon/Imakefile b/xc/lib/GL/mesa/src/drv/radeon/Imakefile index f4c1ef7ca..2a0922ccf 100644 --- a/xc/lib/GL/mesa/src/drv/radeon/Imakefile +++ b/xc/lib/GL/mesa/src/drv/radeon/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.7 2001/11/02 23:29:26 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.9 2002/02/23 00:45:50 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.7 2001/11/02 23:29:2 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" diff --git a/xc/lib/GL/mesa/src/drv/sis/Imakefile b/xc/lib/GL/mesa/src/drv/sis/Imakefile index 66c421073..653d687c1 100644 --- a/xc/lib/GL/mesa/src/drv/sis/Imakefile +++ b/xc/lib/GL/mesa/src/drv/sis/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.18 2001/11/02 23:29:27 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.20 2002/02/27 21:09:33 tsi Exp $ #include <Threads.tmpl> @@ -18,10 +18,19 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.18 2001/11/02 23:29:27 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" #endif +#ifdef SparcArchitecture +#include "../../SPARC/Imakefile.inc" +#endif XCOMM SIS_DEFINES = -DSIS_USE_HW_CULL -DSIS_USE_FASTPATH SIS_DEFINES = -DSIS_USE_HW_CULL diff --git a/xc/lib/GL/mesa/src/drv/tdfx/Imakefile b/xc/lib/GL/mesa/src/drv/tdfx/Imakefile index c6ad9e6a0..19eb8c613 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/Imakefile +++ b/xc/lib/GL/mesa/src/drv/tdfx/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.25.2.1 2001/06/01 07:42:23 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.30 2002/02/23 00:45:51 dawes Exp $ #include <Threads.tmpl> @@ -18,6 +18,12 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.25.2.1 2001/06/01 07:4 #include "../common/Imakefile.inc" #include "Imakefile.inc" +#include "../../array_cache/Imakefile.inc" +#include "../../math/Imakefile.inc" +#include "../../swrast/Imakefile.inc" +#include "../../swrast_setup/Imakefile.inc" +#include "../../tnl/Imakefile.inc" +#include "../../tnl_dd/Imakefile.inc" #include "../../Imakefile.inc" #ifdef i386Architecture #include "../../X86/Imakefile.inc" diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h index 935e0e24b..7decaa97e 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h @@ -23,7 +23,7 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h,v 1.3 2001/10/02 11:44:13 alanh Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h,v 1.5 2002/02/24 21:51:10 dawes Exp $ */ /* * Original rewrite: @@ -673,10 +673,8 @@ struct tdfx_glide { void (*grDisable)( GrEnableMode_t mode ); void (*grCoordinateSpace)( GrCoordinateSpaceMode_t mode ); void (*grDepthRange)( FxFloat n, FxFloat f ); -#ifdef __linux__ void (*grStippleMode)( GrStippleMode_t mode ); void (*grStipplePattern)( GrStipplePattern_t mode ); -#endif /* __linux__ */ void (*grViewport)( FxI32 x, FxI32 y, FxI32 width, FxI32 height ); FxU32 (*grTexCalcMemRequired)(GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt); diff --git a/xc/lib/GL/mesa/src/math/Imakefile b/xc/lib/GL/mesa/src/math/Imakefile index afb7e4b0d..83dd51e0c 100644 --- a/xc/lib/GL/mesa/src/math/Imakefile +++ b/xc/lib/GL/mesa/src/math/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.5 2002/02/28 17:52:16 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -22,16 +26,10 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_vertex.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_vertices.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math) + +#define MesaMathBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" #if Malloc0ReturnsNull @@ -41,40 +39,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(TOP)/include -I$(TOP)/include/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/X86 \ - -I$(MESASRCDIR)/include \ - -I../../../include - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = m_debug_clip.c \ - m_debug_norm.c \ - m_debug_xform.c \ - m_debug_vertex.c \ - m_eval.c \ - m_matrix.c \ - m_translate.c \ - m_vector.c \ - m_vertices.c \ - m_xform.c - - OBJS = m_debug_clip.o \ - m_debug_norm.o \ - m_debug_xform.o \ - m_debug_vertex.o \ - m_eval.o \ - m_matrix.o \ - m_translate.o \ - m_vector.o \ - m_vertices.o \ - m_xform.o - #ifdef i386Architecture + ASM_DIR = X86 ASM_SRCS = ASM_OBJS = #if MesaUseMMX @@ -90,6 +59,7 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ #endif #ifdef SparcArchitecture + ASM_DIR = SPARC ASM_SRCS = ASM_OBJS = ASM_DEFS = -DUSE_SPARC_ASM @@ -99,7 +69,17 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ MATHDEF = -DCCPML #endif +MESA_INCLUDES = -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/math \ + -I$(MESASRCDIR)/src/$(ASM_DIR) \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + SRCS = $(MESA_MATH_SRCS) + OBJS = $(MESA_MATH_OBJS) + #include <Library.tmpl> diff --git a/xc/lib/GL/mesa/src/math/Imakefile.inc b/xc/lib/GL/mesa/src/math/Imakefile.inc new file mode 100644 index 000000000..75104fbe0 --- /dev/null +++ b/xc/lib/GL/mesa/src/math/Imakefile.inc @@ -0,0 +1,80 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1 2002/02/23 00:45:52 dawes Exp $ + +#ifndef MesaMathBuildDir +#define MesaMathBuildDir $(GLXLIBSRC)/mesa/src/math/ +#endif + +MESAMATHBUILDDIR = MesaMathBuildDir + + MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ + $(MESAMATHBUILDDIR)m_debug_norm.c \ + $(MESAMATHBUILDDIR)m_debug_xform.c \ + $(MESAMATHBUILDDIR)m_debug_vertex.c \ + $(MESAMATHBUILDDIR)m_eval.c \ + $(MESAMATHBUILDDIR)m_matrix.c \ + $(MESAMATHBUILDDIR)m_translate.c \ + $(MESAMATHBUILDDIR)m_vector.c \ + $(MESAMATHBUILDDIR)m_vertices.c \ + $(MESAMATHBUILDDIR)m_xform.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_debug_vertex.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_vertices.c, $(MESASRCDIR)/src/math) +LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math) +#endif + + MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \ + $(MESAMATHBUILDDIR)m_debug_norm.o \ + $(MESAMATHBUILDDIR)m_debug_xform.o \ + $(MESAMATHBUILDDIR)m_debug_vertex.o \ + $(MESAMATHBUILDDIR)m_eval.o \ + $(MESAMATHBUILDDIR)m_matrix.o \ + $(MESAMATHBUILDDIR)m_translate.o \ + $(MESAMATHBUILDDIR)m_vector.o \ + $(MESAMATHBUILDDIR)m_vertices.o \ + $(MESAMATHBUILDDIR)m_xform.o + +#if DoSharedLib + MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \ + $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \ + $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \ + $(MESAMATHBUILDDIR)unshared/m_debug_vertex.o \ + $(MESAMATHBUILDDIR)unshared/m_eval.o \ + $(MESAMATHBUILDDIR)unshared/m_matrix.o \ + $(MESAMATHBUILDDIR)unshared/m_translate.o \ + $(MESAMATHBUILDDIR)unshared/m_vector.o \ + $(MESAMATHBUILDDIR)unshared/m_vertices.o \ + $(MESAMATHBUILDDIR)unshared/m_xform.o +#else + MATH_MESA_UOBJS = $(MESA_MATH_OBJS) +#endif + + MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \ + $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \ + $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \ + $(MESAMATHBUILDDIR)debugger/m_debug_vertex.o \ + $(MESAMATHBUILDDIR)debugger/m_eval.o \ + $(MESAMATHBUILDDIR)debugger/m_matrix.o \ + $(MESAMATHBUILDDIR)debugger/m_translate.o \ + $(MESAMATHBUILDDIR)debugger/m_vector.o \ + $(MESAMATHBUILDDIR)debugger/m_vertices.o \ + $(MESAMATHBUILDDIR)debugger/m_xform.o + + MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \ + $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \ + $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \ + $(MESAMATHBUILDDIR)profiled/m_debug_vertex.o \ + $(MESAMATHBUILDDIR)profiled/m_eval.o \ + $(MESAMATHBUILDDIR)profiled/m_matrix.o \ + $(MESAMATHBUILDDIR)profiled/m_translate.o \ + $(MESAMATHBUILDDIR)profiled/m_vector.o \ + $(MESAMATHBUILDDIR)profiled/m_vertices.o \ + $(MESAMATHBUILDDIR)profiled/m_xform.o + diff --git a/xc/lib/GL/mesa/src/swrast/Imakefile b/xc/lib/GL/mesa/src/swrast/Imakefile index 75c32cb65..aca5cbc57 100644 --- a/xc/lib/GL/mesa/src/swrast/Imakefile +++ b/xc/lib/GL/mesa/src/swrast/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile,v 1.5 2002/02/28 17:52:17 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -22,36 +26,11 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(s_aaline.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_aatriangle.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_accum.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_alpha.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_alphabuf.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_bitmap.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_blend.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_buffers.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_context.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_copypix.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_depth.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_histogram.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_masking.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pb.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pixeltex.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_points.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_readpix.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_scissor.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_span.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_stencil.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_texstore.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_texture.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_triangle.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_zoom.c, $(MESASRCDIR)/src/swrast) + +#define MesaSwrastBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" + #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL @@ -60,83 +39,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(TOP)/include -I$(TOP)/include/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/array_cache \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/swrast \ - -I$(MESASRCDIR)/src/X86 \ - -I$(MESASRCDIR)/include \ - -I../../../include - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = s_aaline.c \ - s_aatriangle.c \ - s_accum.c \ - s_alpha.c \ - s_alphabuf.c \ - s_bitmap.c \ - s_blend.c \ - s_buffers.c \ - s_context.c \ - s_copypix.c \ - s_depth.c \ - s_drawpix.c \ - s_feedback.c \ - s_fog.c \ - s_histogram.c \ - s_imaging.c \ - s_lines.c \ - s_logic.c \ - s_masking.c \ - s_pb.c \ - s_pixeltex.c \ - s_points.c \ - s_readpix.c \ - s_scissor.c \ - s_span.c \ - s_stencil.c \ - s_texstore.c \ - s_texture.c \ - s_triangle.c \ - s_zoom.c - - OBJS = s_aaline.o \ - s_aatriangle.o \ - s_accum.o \ - s_alpha.o \ - s_alphabuf.o \ - s_bitmap.o \ - s_blend.o \ - s_buffers.o \ - s_context.o \ - s_copypix.o \ - s_depth.o \ - s_drawpix.o \ - s_feedback.o \ - s_fog.o \ - s_histogram.o \ - s_imaging.o \ - s_lines.o \ - s_logic.o \ - s_masking.o \ - s_pb.o \ - s_pixeltex.o \ - s_points.o \ - s_readpix.o \ - s_scissor.o \ - s_span.o \ - s_stencil.o \ - s_texstore.o \ - s_texture.o \ - s_triangle.o \ - s_zoom.o - - #ifdef i386Architecture + ASM_DIR = X86 ASM_SRCS = ASM_OBJS = #if MesaUseMMX @@ -152,6 +59,7 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ #endif #ifdef SparcArchitecture + ASM_DIR = SPARC ASM_SRCS = ASM_OBJS = ASM_DEFS = -DUSE_SPARC_ASM @@ -161,7 +69,19 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ MATHDEF = -DCCPML #endif +MESA_INCLUDES = -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/array_cache \ + -I$(MESASRCDIR)/src/math \ + -I$(MESASRCDIR)/src/swrast \ + -I$(MESASRCDIR)/src/$(ASM_DIR) \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + SRCS = $(MESA_SWRAST_SRCS) + OBJS = $(MESA_SWRAST_OBJS) + #include <Library.tmpl> diff --git a/xc/lib/GL/mesa/src/swrast/Imakefile.inc b/xc/lib/GL/mesa/src/swrast/Imakefile.inc new file mode 100644 index 000000000..6ea372416 --- /dev/null +++ b/xc/lib/GL/mesa/src/swrast/Imakefile.inc @@ -0,0 +1,200 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1 2002/02/23 00:45:52 dawes Exp $ + +#ifndef MesaSwrastBuildDir +#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/src/swrast/ +#endif + +MESASWRASTBUILDDIR = MesaSwrastBuildDir + + MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \ + $(MESASWRASTBUILDDIR)s_aatriangle.c \ + $(MESASWRASTBUILDDIR)s_accum.c \ + $(MESASWRASTBUILDDIR)s_alpha.c \ + $(MESASWRASTBUILDDIR)s_alphabuf.c \ + $(MESASWRASTBUILDDIR)s_bitmap.c \ + $(MESASWRASTBUILDDIR)s_blend.c \ + $(MESASWRASTBUILDDIR)s_buffers.c \ + $(MESASWRASTBUILDDIR)s_context.c \ + $(MESASWRASTBUILDDIR)s_copypix.c \ + $(MESASWRASTBUILDDIR)s_depth.c \ + $(MESASWRASTBUILDDIR)s_drawpix.c \ + $(MESASWRASTBUILDDIR)s_feedback.c \ + $(MESASWRASTBUILDDIR)s_fog.c \ + $(MESASWRASTBUILDDIR)s_histogram.c \ + $(MESASWRASTBUILDDIR)s_imaging.c \ + $(MESASWRASTBUILDDIR)s_lines.c \ + $(MESASWRASTBUILDDIR)s_logic.c \ + $(MESASWRASTBUILDDIR)s_masking.c \ + $(MESASWRASTBUILDDIR)s_pb.c \ + $(MESASWRASTBUILDDIR)s_pixeltex.c \ + $(MESASWRASTBUILDDIR)s_points.c \ + $(MESASWRASTBUILDDIR)s_readpix.c \ + $(MESASWRASTBUILDDIR)s_scissor.c \ + $(MESASWRASTBUILDDIR)s_span.c \ + $(MESASWRASTBUILDDIR)s_stencil.c \ + $(MESASWRASTBUILDDIR)s_texstore.c \ + $(MESASWRASTBUILDDIR)s_texture.c \ + $(MESASWRASTBUILDDIR)s_triangle.c \ + $(MESASWRASTBUILDDIR)s_zoom.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(s_aaline.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_aatriangle.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_accum.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_alpha.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_alphabuf.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_bitmap.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_blend.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_buffers.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_context.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_copypix.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_depth.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_histogram.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_masking.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_pb.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_pixeltex.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_points.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_readpix.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_scissor.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_span.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_stencil.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_texstore.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_texture.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_triangle.c, $(MESASRCDIR)/src/swrast) +LinkSourceFile(s_zoom.c, $(MESASRCDIR)/src/swrast) +#endif + + MESA_SWRAST_OBJS = $(MESASWRASTBUILDDIR)s_aaline.o \ + $(MESASWRASTBUILDDIR)s_aatriangle.o \ + $(MESASWRASTBUILDDIR)s_accum.o \ + $(MESASWRASTBUILDDIR)s_alpha.o \ + $(MESASWRASTBUILDDIR)s_alphabuf.o \ + $(MESASWRASTBUILDDIR)s_bitmap.o \ + $(MESASWRASTBUILDDIR)s_blend.o \ + $(MESASWRASTBUILDDIR)s_buffers.o \ + $(MESASWRASTBUILDDIR)s_context.o \ + $(MESASWRASTBUILDDIR)s_copypix.o \ + $(MESASWRASTBUILDDIR)s_depth.o \ + $(MESASWRASTBUILDDIR)s_drawpix.o \ + $(MESASWRASTBUILDDIR)s_feedback.o \ + $(MESASWRASTBUILDDIR)s_fog.o \ + $(MESASWRASTBUILDDIR)s_histogram.o \ + $(MESASWRASTBUILDDIR)s_imaging.o \ + $(MESASWRASTBUILDDIR)s_lines.o \ + $(MESASWRASTBUILDDIR)s_logic.o \ + $(MESASWRASTBUILDDIR)s_masking.o \ + $(MESASWRASTBUILDDIR)s_pb.o \ + $(MESASWRASTBUILDDIR)s_pixeltex.o \ + $(MESASWRASTBUILDDIR)s_points.o \ + $(MESASWRASTBUILDDIR)s_readpix.o \ + $(MESASWRASTBUILDDIR)s_scissor.o \ + $(MESASWRASTBUILDDIR)s_span.o \ + $(MESASWRASTBUILDDIR)s_stencil.o \ + $(MESASWRASTBUILDDIR)s_texstore.o \ + $(MESASWRASTBUILDDIR)s_texture.o \ + $(MESASWRASTBUILDDIR)s_triangle.o \ + $(MESASWRASTBUILDDIR)s_zoom.o + +#if DoSharedLib + MESA_SWRAST_UOBJS = $(MESASWRASTBUILDDIR)unshared/s_aaline.o \ + $(MESASWRASTBUILDDIR)unshared/s_aatriangle.o \ + $(MESASWRASTBUILDDIR)unshared/s_accum.o \ + $(MESASWRASTBUILDDIR)unshared/s_alpha.o \ + $(MESASWRASTBUILDDIR)unshared/s_alphabuf.o \ + $(MESASWRASTBUILDDIR)unshared/s_bitmap.o \ + $(MESASWRASTBUILDDIR)unshared/s_blend.o \ + $(MESASWRASTBUILDDIR)unshared/s_buffers.o \ + $(MESASWRASTBUILDDIR)unshared/s_context.o \ + $(MESASWRASTBUILDDIR)unshared/s_copypix.o \ + $(MESASWRASTBUILDDIR)unshared/s_depth.o \ + $(MESASWRASTBUILDDIR)unshared/s_drawpix.o \ + $(MESASWRASTBUILDDIR)unshared/s_feedback.o \ + $(MESASWRASTBUILDDIR)unshared/s_fog.o \ + $(MESASWRASTBUILDDIR)unshared/s_histogram.o \ + $(MESASWRASTBUILDDIR)unshared/s_imaging.o \ + $(MESASWRASTBUILDDIR)unshared/s_lines.o \ + $(MESASWRASTBUILDDIR)unshared/s_logic.o \ + $(MESASWRASTBUILDDIR)unshared/s_masking.o \ + $(MESASWRASTBUILDDIR)unshared/s_pb.o \ + $(MESASWRASTBUILDDIR)unshared/s_pixeltex.o \ + $(MESASWRASTBUILDDIR)unshared/s_points.o \ + $(MESASWRASTBUILDDIR)unshared/s_readpix.o \ + $(MESASWRASTBUILDDIR)unshared/s_scissor.o \ + $(MESASWRASTBUILDDIR)unshared/s_span.o \ + $(MESASWRASTBUILDDIR)unshared/s_stencil.o \ + $(MESASWRASTBUILDDIR)unshared/s_texstore.o \ + $(MESASWRASTBUILDDIR)unshared/s_texture.o \ + $(MESASWRASTBUILDDIR)unshared/s_triangle.o \ + $(MESASWRASTBUILDDIR)unshared/s_zoom.o +#else + MESA_SWRAST_UOBJS = $(MESA_SWRAST_OBJS) +#endif + + MESA_SWRAST_DOBJS = $(MESASWRASTBUILDDIR)debugger/s_aaline.o \ + $(MESASWRASTBUILDDIR)debugger/s_aatriangle.o \ + $(MESASWRASTBUILDDIR)debugger/s_accum.o \ + $(MESASWRASTBUILDDIR)debugger/s_alpha.o \ + $(MESASWRASTBUILDDIR)debugger/s_alphabuf.o \ + $(MESASWRASTBUILDDIR)debugger/s_bitmap.o \ + $(MESASWRASTBUILDDIR)debugger/s_blend.o \ + $(MESASWRASTBUILDDIR)debugger/s_buffers.o \ + $(MESASWRASTBUILDDIR)debugger/s_context.o \ + $(MESASWRASTBUILDDIR)debugger/s_copypix.o \ + $(MESASWRASTBUILDDIR)debugger/s_depth.o \ + $(MESASWRASTBUILDDIR)debugger/s_drawpix.o \ + $(MESASWRASTBUILDDIR)debugger/s_feedback.o \ + $(MESASWRASTBUILDDIR)debugger/s_fog.o \ + $(MESASWRASTBUILDDIR)debugger/s_histogram.o \ + $(MESASWRASTBUILDDIR)debugger/s_imaging.o \ + $(MESASWRASTBUILDDIR)debugger/s_lines.o \ + $(MESASWRASTBUILDDIR)debugger/s_logic.o \ + $(MESASWRASTBUILDDIR)debugger/s_masking.o \ + $(MESASWRASTBUILDDIR)debugger/s_pb.o \ + $(MESASWRASTBUILDDIR)debugger/s_pixeltex.o \ + $(MESASWRASTBUILDDIR)debugger/s_points.o \ + $(MESASWRASTBUILDDIR)debugger/s_readpix.o \ + $(MESASWRASTBUILDDIR)debugger/s_scissor.o \ + $(MESASWRASTBUILDDIR)debugger/s_span.o \ + $(MESASWRASTBUILDDIR)debugger/s_stencil.o \ + $(MESASWRASTBUILDDIR)debugger/s_texstore.o \ + $(MESASWRASTBUILDDIR)debugger/s_texture.o \ + $(MESASWRASTBUILDDIR)debugger/s_triangle.o \ + $(MESASWRASTBUILDDIR)debugger/s_zoom.o + + MESA_SWRAST_POBJS = $(MESASWRASTBUILDDIR)profiled/s_aaline.o \ + $(MESASWRASTBUILDDIR)profiled/s_aatriangle.o \ + $(MESASWRASTBUILDDIR)profiled/s_accum.o \ + $(MESASWRASTBUILDDIR)profiled/s_alpha.o \ + $(MESASWRASTBUILDDIR)profiled/s_alphabuf.o \ + $(MESASWRASTBUILDDIR)profiled/s_bitmap.o \ + $(MESASWRASTBUILDDIR)profiled/s_blend.o \ + $(MESASWRASTBUILDDIR)profiled/s_buffers.o \ + $(MESASWRASTBUILDDIR)profiled/s_context.o \ + $(MESASWRASTBUILDDIR)profiled/s_copypix.o \ + $(MESASWRASTBUILDDIR)profiled/s_depth.o \ + $(MESASWRASTBUILDDIR)profiled/s_drawpix.o \ + $(MESASWRASTBUILDDIR)profiled/s_feedback.o \ + $(MESASWRASTBUILDDIR)profiled/s_fog.o \ + $(MESASWRASTBUILDDIR)profiled/s_histogram.o \ + $(MESASWRASTBUILDDIR)profiled/s_imaging.o \ + $(MESASWRASTBUILDDIR)profiled/s_lines.o \ + $(MESASWRASTBUILDDIR)profiled/s_logic.o \ + $(MESASWRASTBUILDDIR)profiled/s_masking.o \ + $(MESASWRASTBUILDDIR)profiled/s_pb.o \ + $(MESASWRASTBUILDDIR)profiled/s_pixeltex.o \ + $(MESASWRASTBUILDDIR)profiled/s_points.o \ + $(MESASWRASTBUILDDIR)profiled/s_readpix.o \ + $(MESASWRASTBUILDDIR)profiled/s_scissor.o \ + $(MESASWRASTBUILDDIR)profiled/s_span.o \ + $(MESASWRASTBUILDDIR)profiled/s_stencil.o \ + $(MESASWRASTBUILDDIR)profiled/s_texstore.o \ + $(MESASWRASTBUILDDIR)profiled/s_texture.o \ + $(MESASWRASTBUILDDIR)profiled/s_triangle.o \ + $(MESASWRASTBUILDDIR)profiled/s_zoom.o + diff --git a/xc/lib/GL/mesa/src/swrast_setup/Imakefile b/xc/lib/GL/mesa/src/swrast_setup/Imakefile index bc362eef9..9fe6c3886 100644 --- a/xc/lib/GL/mesa/src/swrast_setup/Imakefile +++ b/xc/lib/GL/mesa/src/swrast_setup/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.5 2002/02/28 17:52:17 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -22,10 +26,10 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_vb.c, $(MESASRCDIR)/src/swrast_setup) +#define MesaSwrastSetupBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL @@ -34,23 +38,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(TOP)/include -I$(TOP)/include/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/X86 \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/swrast_setup \ - -I$(MESASRCDIR)/src/tnl \ - -I$(MESASRCDIR)/include \ - -I../../../include - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = ss_context.c ss_triangle.c ss_vb.c - OBJS = ss_context.o ss_triangle.o ss_vb.o - #ifdef i386Architecture + ASM_DIR = X86 ASM_SRCS = ASM_OBJS = #if MesaUseMMX @@ -66,6 +58,7 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ #endif #ifdef SparcArchitecture + ASM_DIR = SPARC ASM_SRCS = ASM_OBJS = ASM_DEFS = -DUSE_SPARC_ASM @@ -75,7 +68,19 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ MATHDEF = -DCCPML #endif +MESA_INCLUDES = -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/$(ASM_DIR) \ + -I$(MESASRCDIR)/src/math \ + -I$(MESASRCDIR)/src/swrast_setup \ + -I$(MESASRCDIR)/src/tnl \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + SRCS = $(MESA_SWR_SETUP_SRCS) + OBJS = $(MESA_SWR_SETUP_OBJS) + #include <Library.tmpl> diff --git a/xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc b/xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc new file mode 100644 index 000000000..f1bab9061 --- /dev/null +++ b/xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc @@ -0,0 +1,38 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1 2002/02/23 00:45:52 dawes Exp $ + +#ifndef MesaSwrastSetupBuildDir +#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/src/swrast_setup/ +#endif + +MESASWRSETUPDIR = MesaSwrastSetupBuildDir + + MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ + $(MESASWRSETUPDIR)ss_triangle.c \ + $(MESASWRSETUPDIR)ss_vb.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/swrast_setup) +LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/swrast_setup) +LinkSourceFile(ss_vb.c, $(MESASRCDIR)/src/swrast_setup) +#endif + + MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \ + $(MESASWRSETUPDIR)ss_triangle.o \ + $(MESASWRSETUPDIR)ss_vb.o + +#if DoSharedLib +MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \ + $(MESASWRSETUPDIR)unshared/ss_triangle.o \ + $(MESASWRSETUPDIR)unshared/ss_vb.o +#else +MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS) +#endif + +MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \ + $(MESASWRSETUPDIR)debugger/ss_triangle.o \ + $(MESASWRSETUPDIR)debugger/ss_vb.o + +MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \ + $(MESASWRSETUPDIR)profiled/ss_triangle.o \ + $(MESASWRSETUPDIR)profiled/ss_vb.o + diff --git a/xc/lib/GL/mesa/src/tnl/Imakefile b/xc/lib/GL/mesa/src/tnl/Imakefile index fe7aaca86..f3cd2ca48 100644 --- a/xc/lib/GL/mesa/src/tnl/Imakefile +++ b/xc/lib/GL/mesa/src/tnl/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile,v 1.5 2002/02/28 17:52:17 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -22,27 +26,10 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_context.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_eval_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_alloc.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_debug.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_dlist.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_elt.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_eval.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_exec.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_fixup.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) + +#define MesaTnlBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" #if Malloc0ReturnsNull @@ -52,65 +39,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(TOP)/include -I$(TOP)/include/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/X86 \ - -I$(MESASRCDIR)/src/array_cache \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/swrast_setup \ - -I$(MESASRCDIR)/src/tnl \ - -I$(MESASRCDIR)/include \ - -I../../../include - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = t_array_api.c \ - t_array_import.c \ - t_context.c \ - t_eval_api.c \ - t_imm_alloc.c \ - t_imm_api.c \ - t_imm_debug.c \ - t_imm_dlist.c \ - t_imm_elt.c \ - t_imm_eval.c \ - t_imm_exec.c \ - t_imm_fixup.c \ - t_pipeline.c \ - t_vb_fog.c \ - t_vb_light.c \ - t_vb_normals.c \ - t_vb_points.c \ - t_vb_render.c \ - t_vb_texgen.c \ - t_vb_texmat.c \ - t_vb_vertex.c - - OBJS = t_array_api.o \ - t_array_import.o \ - t_context.o \ - t_eval_api.o \ - t_imm_alloc.o \ - t_imm_api.o \ - t_imm_debug.o \ - t_imm_dlist.o \ - t_imm_elt.o \ - t_imm_eval.o \ - t_imm_exec.o \ - t_imm_fixup.o \ - t_pipeline.o \ - t_vb_fog.o \ - t_vb_light.o \ - t_vb_normals.o \ - t_vb_points.o \ - t_vb_render.o \ - t_vb_texgen.o \ - t_vb_texmat.o \ - t_vb_vertex.o - #ifdef i386Architecture + ASM_DIR = X86 ASM_SRCS = ASM_OBJS = #if MesaUseMMX @@ -126,6 +59,7 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ #endif #ifdef SparcArchitecture + ASM_DIR = SPARC ASM_SRCS = ASM_OBJS = ASM_DEFS = -DUSE_SPARC_ASM @@ -135,7 +69,20 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ MATHDEF = -DCCPML #endif +MESA_INCLUDES = -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/$(ASM_DIR) \ + -I$(MESASRCDIR)/src/array_cache \ + -I$(MESASRCDIR)/src/math \ + -I$(MESASRCDIR)/src/swrast_setup \ + -I$(MESASRCDIR)/src/tnl \ + -I$(MESASRCDIR)/include \ + -I../../../include -I$(XINCLUDESRC) + DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) + SRCS = $(MESA_TNL_SRCS) + OBJS = $(MESA_TNL_OBJS) + #include <Library.tmpl> diff --git a/xc/lib/GL/mesa/src/tnl/Imakefile.inc b/xc/lib/GL/mesa/src/tnl/Imakefile.inc new file mode 100644 index 000000000..87b6dafcf --- /dev/null +++ b/xc/lib/GL/mesa/src/tnl/Imakefile.inc @@ -0,0 +1,146 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1 2002/02/23 00:45:53 dawes Exp $ + +#ifndef MesaTnlBuildDir +#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/src/tnl/ +#endif + +MESATNLBUILDDIR = MesaTnlBuildDir + + MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ + $(MESATNLBUILDDIR)t_array_import.c \ + $(MESATNLBUILDDIR)t_context.c \ + $(MESATNLBUILDDIR)t_eval_api.c \ + $(MESATNLBUILDDIR)t_imm_alloc.c \ + $(MESATNLBUILDDIR)t_imm_api.c \ + $(MESATNLBUILDDIR)t_imm_debug.c \ + $(MESATNLBUILDDIR)t_imm_dlist.c \ + $(MESATNLBUILDDIR)t_imm_elt.c \ + $(MESATNLBUILDDIR)t_imm_eval.c \ + $(MESATNLBUILDDIR)t_imm_exec.c \ + $(MESATNLBUILDDIR)t_imm_fixup.c \ + $(MESATNLBUILDDIR)t_pipeline.c \ + $(MESATNLBUILDDIR)t_vb_fog.c \ + $(MESATNLBUILDDIR)t_vb_light.c \ + $(MESATNLBUILDDIR)t_vb_normals.c \ + $(MESATNLBUILDDIR)t_vb_points.c \ + $(MESATNLBUILDDIR)t_vb_render.c \ + $(MESATNLBUILDDIR)t_vb_texgen.c \ + $(MESATNLBUILDDIR)t_vb_texmat.c \ + $(MESATNLBUILDDIR)t_vb_vertex.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_context.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_eval_api.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_alloc.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_api.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_debug.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_dlist.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_elt.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_eval.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_exec.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_imm_fixup.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) +#endif + + MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \ + $(MESATNLBUILDDIR)t_array_import.o \ + $(MESATNLBUILDDIR)t_context.o \ + $(MESATNLBUILDDIR)t_eval_api.o \ + $(MESATNLBUILDDIR)t_imm_alloc.o \ + $(MESATNLBUILDDIR)t_imm_api.o \ + $(MESATNLBUILDDIR)t_imm_debug.o \ + $(MESATNLBUILDDIR)t_imm_dlist.o \ + $(MESATNLBUILDDIR)t_imm_elt.o \ + $(MESATNLBUILDDIR)t_imm_eval.o \ + $(MESATNLBUILDDIR)t_imm_exec.o \ + $(MESATNLBUILDDIR)t_imm_fixup.o \ + $(MESATNLBUILDDIR)t_pipeline.o \ + $(MESATNLBUILDDIR)t_vb_fog.o \ + $(MESATNLBUILDDIR)t_vb_light.o \ + $(MESATNLBUILDDIR)t_vb_normals.o \ + $(MESATNLBUILDDIR)t_vb_points.o \ + $(MESATNLBUILDDIR)t_vb_render.o \ + $(MESATNLBUILDDIR)t_vb_texgen.o \ + $(MESATNLBUILDDIR)t_vb_texmat.o \ + $(MESATNLBUILDDIR)t_vb_vertex.o + +#if DoSharedLib + MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \ + $(MESATNLBUILDDIR)unshared/t_array_import.o \ + $(MESATNLBUILDDIR)unshared/t_context.o \ + $(MESATNLBUILDDIR)unshared/t_eval_api.o \ + $(MESATNLBUILDDIR)unshared/t_imm_alloc.o \ + $(MESATNLBUILDDIR)unshared/t_imm_api.o \ + $(MESATNLBUILDDIR)unshared/t_imm_debug.o \ + $(MESATNLBUILDDIR)unshared/t_imm_dlist.o \ + $(MESATNLBUILDDIR)unshared/t_imm_elt.o \ + $(MESATNLBUILDDIR)unshared/t_imm_eval.o \ + $(MESATNLBUILDDIR)unshared/t_imm_exec.o \ + $(MESATNLBUILDDIR)unshared/t_imm_fixup.o \ + $(MESATNLBUILDDIR)unshared/t_pipeline.o \ + $(MESATNLBUILDDIR)unshared/t_vb_fog.o \ + $(MESATNLBUILDDIR)unshared/t_vb_light.o \ + $(MESATNLBUILDDIR)unshared/t_vb_normals.o \ + $(MESATNLBUILDDIR)unshared/t_vb_points.o \ + $(MESATNLBUILDDIR)unshared/t_vb_render.o \ + $(MESATNLBUILDDIR)unshared/t_vb_texgen.o \ + $(MESATNLBUILDDIR)unshared/t_vb_texmat.o \ + $(MESATNLBUILDDIR)unshared/t_vb_vertex.o +#else + MESA_TNL_UOBJS = $(MESA_TNL_OBJS) +#endif + + MESA_TNL_DOBJS = $(MESATNLBUILDDIR)debugger/t_array_api.o \ + $(MESATNLBUILDDIR)debugger/t_array_import.o \ + $(MESATNLBUILDDIR)debugger/t_context.o \ + $(MESATNLBUILDDIR)debugger/t_eval_api.o \ + $(MESATNLBUILDDIR)debugger/t_imm_alloc.o \ + $(MESATNLBUILDDIR)debugger/t_imm_api.o \ + $(MESATNLBUILDDIR)debugger/t_imm_debug.o \ + $(MESATNLBUILDDIR)debugger/t_imm_dlist.o \ + $(MESATNLBUILDDIR)debugger/t_imm_elt.o \ + $(MESATNLBUILDDIR)debugger/t_imm_eval.o \ + $(MESATNLBUILDDIR)debugger/t_imm_exec.o \ + $(MESATNLBUILDDIR)debugger/t_imm_fixup.o \ + $(MESATNLBUILDDIR)debugger/t_pipeline.o \ + $(MESATNLBUILDDIR)debugger/t_vb_fog.o \ + $(MESATNLBUILDDIR)debugger/t_vb_light.o \ + $(MESATNLBUILDDIR)debugger/t_vb_normals.o \ + $(MESATNLBUILDDIR)debugger/t_vb_points.o \ + $(MESATNLBUILDDIR)debugger/t_vb_render.o \ + $(MESATNLBUILDDIR)debugger/t_vb_texgen.o \ + $(MESATNLBUILDDIR)debugger/t_vb_texmat.o \ + $(MESATNLBUILDDIR)debugger/t_vb_vertex.o + + MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \ + $(MESATNLBUILDDIR)profiled/t_array_import.o \ + $(MESATNLBUILDDIR)profiled/t_context.o \ + $(MESATNLBUILDDIR)profiled/t_eval_api.o \ + $(MESATNLBUILDDIR)profiled/t_imm_alloc.o \ + $(MESATNLBUILDDIR)profiled/t_imm_api.o \ + $(MESATNLBUILDDIR)profiled/t_imm_profiled.o \ + $(MESATNLBUILDDIR)profiled/t_imm_dlist.o \ + $(MESATNLBUILDDIR)profiled/t_imm_elt.o \ + $(MESATNLBUILDDIR)profiled/t_imm_eval.o \ + $(MESATNLBUILDDIR)profiled/t_imm_exec.o \ + $(MESATNLBUILDDIR)profiled/t_imm_fixup.o \ + $(MESATNLBUILDDIR)profiled/t_pipeline.o \ + $(MESATNLBUILDDIR)profiled/t_vb_fog.o \ + $(MESATNLBUILDDIR)profiled/t_vb_light.o \ + $(MESATNLBUILDDIR)profiled/t_vb_normals.o \ + $(MESATNLBUILDDIR)profiled/t_vb_points.o \ + $(MESATNLBUILDDIR)profiled/t_vb_render.o \ + $(MESATNLBUILDDIR)profiled/t_vb_texgen.o \ + $(MESATNLBUILDDIR)profiled/t_vb_texmat.o \ + $(MESATNLBUILDDIR)profiled/t_vb_vertex.o + diff --git a/xc/lib/GL/mesa/src/tnl_dd/Imakefile b/xc/lib/GL/mesa/src/tnl_dd/Imakefile index 56740b16d..b0143b3a7 100644 --- a/xc/lib/GL/mesa/src/tnl_dd/Imakefile +++ b/xc/lib/GL/mesa/src/tnl_dd/Imakefile @@ -1,14 +1,18 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile,v 1.4 2002/02/28 17:52:17 dawes Exp $ #include <Threads.tmpl> /* - * Only need SharedLib build unless OSMesa lib is built, or driver is built - * in to libGL + * Need both shared and unshared Mesa objects in the following cases: + * GlxDriverUsesMesa + * GlxBuiltInXMesa + * BuildOSMesaLib + * + * In other cases, only the shared version is needed to link in to loadable + * driver modules. */ -#if BuildXF86DRI && !GlxUseSGISI && \ - (GlxUseBuiltInDRIDriver || \ - !GlxBuiltInMesa || !defined(GlxDriverUsesMesa)) + +#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib #define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) #define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) #define DoExtraLib SharedLibGlx @@ -22,10 +26,10 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes E #define DoProfileLib NO #endif -LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_dd.c, $(MESASRCDIR)/src/tnl_dd) -LinkSourceFile(t_dd_vb.c, $(MESASRCDIR)/src/tnl_dd) +#define MesaTnlDdBuildDir /**/ +#define NeedToLinkMesaSrc +#include "Imakefile.inc" #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL @@ -34,7 +38,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(TOP)/include -I$(TOP)/include/GL \ + -I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \ -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif @@ -45,9 +49,8 @@ MESA_INCLUDES = -I$(MESASRCDIR)/src \ -I../../../include INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = - - OBJS = + SRCS = $(MESA_TNL_DD_SRCS) + OBJS = $(MESA_TNL_DD_OBJS) #ifdef i386Architecture ASM_SRCS = diff --git a/xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc b/xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc new file mode 100644 index 000000000..e6af80713 --- /dev/null +++ b/xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc @@ -0,0 +1,38 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc,v 1.1 2002/02/23 00:45:53 dawes Exp $ + +#ifndef MesaTnlDdBuildDir +#define MesaTnlDdBuildDir $(GLXLIBSRC)/mesa/src/tnl_dd/ +#endif + +MESATNLDDBUILDDIR = MesaTnlDdBuildDir + + MESA_TNL_DD_SRCS = $(MESATNLDDBUILDDIR)t_array_api.c \ + $(MESATNLDDBUILDDIR)t_dd.c \ + $(MESATNLDDBUILDDIR)t_dd_vb.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_dd.c, $(MESASRCDIR)/src/tnl_dd) +LinkSourceFile(t_dd_vb.c, $(MESASRCDIR)/src/tnl_dd) +#endif + + MESA_TNL_DD_OBJS = $(MESATNLDDBUILDDIR)t_array_api.o \ + $(MESATNLDDBUILDDIR)t_dd.o \ + $(MESATNLDDBUILDDIR)t_dd_vb.o + +#if DoSharedLib +MESA_TNL_DD_UOBJS = $(MESATNLDDBUILDDIR)unshared/t_array_api.o \ + $(MESATNLDDBUILDDIR)unshared/t_dd.o \ + $(MESATNLDDBUILDDIR)unshared/t_dd_vb.o +#else +MESA_TNL_DD_UOBJS = $(MESA_TNL_DD_OBJS) +#endif + +MESA_TNL_DD_DOBJS = $(MESATNLDDBUILDDIR)debugger/t_array_api.o \ + $(MESATNLDDBUILDDIR)debugger/t_dd.o \ + $(MESATNLDDBUILDDIR)debugger/t_dd_vb.o + +MESA_TNL_DD_POBJS = $(MESATNLDDBUILDDIR)profiled/t_array_api.o \ + $(MESATNLDDBUILDDIR)profiled/t_dd.o \ + $(MESATNLDDBUILDDIR)profiled/t_dd_vb.o + diff --git a/xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp b/xc/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp index 67822f290..080b2efa3 100644 --- a/xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp +++ b/xc/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp @@ -1480,4 +1480,4 @@ xmesa_get_line_func xmesa_get_points_func xmesa_get_triangle_func -/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp,v 1.1 2000/08/10 17:40:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ diff --git a/xc/programs/Xserver/GL/mesa/src/GLcoremodule.c b/xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c index c112e9fe9..9369db1f2 100644 --- a/xc/programs/Xserver/GL/mesa/src/GLcoremodule.c +++ b/xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.3 1999/06/14 07:31:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -30,7 +30,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin <kevin@precisioninsight.com> * - * $PI: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.6 1999/05/27 03:43:46 jens Exp $ */ #include "xf86Module.h" @@ -51,7 +50,7 @@ static XF86ModuleVersionInfo VersRec = {0,0,0,0} }; -XF86ModuleData libGLcoreModuleData = { &VersRec, GLcoreSetup, NULL }; +XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL }; static pointer GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin) diff --git a/xc/programs/Xserver/GL/mesa/GLcore/Imakefile b/xc/programs/Xserver/GL/mesa/GLcore/Imakefile new file mode 100644 index 000000000..b7dd75f39 --- /dev/null +++ b/xc/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -0,0 +1,56 @@ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.2 2002/02/25 18:00:38 dawes Exp $ + +#define IHaveModules +#include <Server.tmpl> + +#define NeedAllMesaSrc +#define MesaInXServer +#define MesaBuildDir ../src/ +#define MesaACBuildDir ../src/array_cache/ +#define MesaMathBuildDir ../src/math/ +#define MesaSwrastBuildDir ../src/swrast/ +#define MesaSwrastSetupBuildDir ../src/swrast_setup/ +#define MesaTnlBuildDir ../src/tnl/ +#define MesaXBuildDir ../src/X/ + +#include "../../../../../lib/GL/mesa/src/array_cache/Imakefile.inc" +#include "../../../../../lib/GL/mesa/src/swrast/Imakefile.inc" +#include "../../../../../lib/GL/mesa/src/swrast_setup/Imakefile.inc" +#include "../../../../../lib/GL/mesa/src/tnl/Imakefile.inc" +#include "../../../../../lib/GL/mesa/src/math/Imakefile.inc" +#include "../../../../../lib/GL/mesa/src/X/Imakefile.inc" +#include "../../../../../lib/GL/mesa/src/Imakefile.inc" + +#if DoLoadableServer + MSRCS = GLcoremodule.c + MOBJS = GLcoremodule.o +#endif + + XOBJS = ../src/X/?*.o + + OBJS = $(COREMESAOBJS) $(MOBJS) + + DONES = ../src/DONE ../src/X/DONE ../src/array_cache/DONE \ + ../src/math/DONE ../src/swrast/DONE ../src/swrast_setup/DONE \ + ../src/tnl/DONE + + INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ + -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/src \ + -I$(SERVERSRC)/include + + DEFINES = $(GLX_DEFINES) + +#if DoLoadableServer +ModuleObjectRule() + +DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS)) +InstallLibraryModule(GLcore,$(MODULEDIR),extensions) + +#else +NormalDepLibraryTarget(GLcore, $(DONES) $(OBJS), $(OBJS) $(XOBJS)) +NormalLibraryObjectRule() +#endif + +InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) + diff --git a/xc/programs/Xserver/GL/mesa/Imakefile b/xc/programs/Xserver/GL/mesa/Imakefile index 397cb646d..29b9d7ec9 100644 --- a/xc/programs/Xserver/GL/mesa/Imakefile +++ b/xc/programs/Xserver/GL/mesa/Imakefile @@ -1,12 +1,11 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/Imakefile,v 1.3 1999/06/14 14:37:12 dawes Exp $ -XCOMM $PI: xc/programs/Xserver/GL/mesa/Imakefile,v 1.3 1999/03/15 17:11:59 martin Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/Imakefile,v 1.6 2002/02/25 00:45:41 dawes Exp $ #define IHaveModules #include <Server.tmpl> #define IHaveSubdirs - SUBDIRS = include src + SUBDIRS = src GLcore DEFINES = $(GLX_DEFINES) MakeSubdirs($(SUBDIRS)) diff --git a/xc/programs/Xserver/GL/mesa/src/Imakefile b/xc/programs/Xserver/GL/mesa/src/Imakefile index 619697211..66c0335c3 100644 --- a/xc/programs/Xserver/GL/mesa/src/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.18 2001/04/26 16:54:47 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.20 2002/02/25 00:45:42 dawes Exp $ #define IHaveModules #include <Server.tmpl> @@ -10,18 +10,10 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.18 2001/04/26 16:5 #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaBuildDir /**/ - #include "../../../../../lib/GL/mesa/src/Imakefile.inc" -#if DoLoadableServer - MSRCS = GLcoremodule.c - MOBJS = GLcoremodule.o -#endif - - XOBJS = X/?*.o - - SRCS = $(COREMESABASESRCS) $(MSRCS) - OBJS = $(COREMESAOBJS) $(MOBJS) + SRCS = $(COREMESABASESRCS) + OBJS = $(COREMESABASEOBJS) INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ @@ -30,31 +22,15 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.18 2001/04/26 16:5 DEFINES = $(GLX_DEFINES) - DONES = X/DONE math/DONE array_cache/DONE \ - swrast/DONE swrast_setup/DONE tnl/DONE - - -#if HasParallelMake -MakeMutex($(SUBDIRS) $(OBJS) $(DONES)) -#endif - #if DoLoadableServer ModuleObjectRule() - -DepLibraryModuleTarget(GLcore,$(SUBDIRS) $(DONES) $(OBJS),$(OBJS) $(XOBJS)) -InstallLibraryModule(GLcore,$(MODULEDIR),extensions) -ForceSubdirs($(SUBDIRS)) - #else -NormalDepLibraryTarget(GLcore,$(SUBDIRS) $(DONES) $(OBJS), $(OBJS) $(XOBJS)) NormalLibraryObjectRule() -ForceSubdirs($(SUBDIRS)) #endif -DependTarget() +MakeSubdirs($(SUBDIRS)) +SubdirLibraryRule($(OBJS)) +DependSubdirs($(SUBDIRS)) -InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) +DependTarget() -DependSubdirs($(SUBDIRS)) -MakeLintLibSubdirs($(SUBDIRS)) -LintSubdirs($(SUBDIRS)) diff --git a/xc/programs/Xserver/GL/mesa/src/X/Imakefile b/xc/programs/Xserver/GL/mesa/src/X/Imakefile index 8cbba612d..0a19a05e7 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/X/Imakefile @@ -1,28 +1,19 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.11 2002/01/10 21:51:47 tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.13 2002/02/25 00:45:43 dawes Exp $ #define IHaveModules #include <Server.tmpl> +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaXBuildDir /**/ +#define MesaInXServer +#include "../../../../../../lib/GL/mesa/src/X/Imakefile.inc" -LinkSourceFile(glxheader.h, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/X) -LinkSourceFile(xmesaP.h, $(MESASRCDIR)/src/X) LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx) - DRIVER_SRCS = xm_api.c xm_dd.c xm_line.c xm_span.c xm_tri.c - DRIVER_OBJS = xm_api.o xm_dd.o xm_line.o xm_span.o xm_tri.o - -#ifndef XFree86Version - -/* This appears to be the quickest way to build a non-XFree86 server */ -GLXSRV_DEFINES = -DXFree86Server - -#endif + DRIVER_SRCS = $(XMESA_SRCS) + DRIVER_OBJS = $(XMESA_OBJS) #ifndef XFree86Version diff --git a/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile b/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile index d04986abe..eafe62420 100644 --- a/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile @@ -1,24 +1,24 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $ #define IHaveModules #include <Server.tmpl> +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaACBuildDir /**/ +#include "../../../../../../lib/GL/mesa/src/array_cache/Imakefile.inc" -LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/array_cache) -LinkSourceFile(ac_context.h, $(MESASRCDIR)/src/array_cache) -LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/array_cache) -LinkSourceFile(acache.h, $(MESASRCDIR)/src/array_cache) - - SRCS = ac_context.c ac_import.c - OBJS = ac_context.o ac_import.o + SRCS = $(MESA_AC_SRCS) + OBJS = $(MESA_AC_OBJS) INCLUDES = -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/array_cache \ -I$(MESASRCDIR)/src/math \ -I$(MESASRCDIR)/include \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I../../../include -I../../../glx \ -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(XTOP)/include + -I$(XF86SRC) -I$(INCLUDESRC) DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ diff --git a/xc/programs/Xserver/GL/mesa/src/math/Imakefile b/xc/programs/Xserver/GL/mesa/src/math/Imakefile index 71a5eb13c..6c6238678 100644 --- a/xc/programs/Xserver/GL/mesa/src/math/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/math/Imakefile @@ -1,58 +1,15 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $ #define IHaveModules #include <Server.tmpl> +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaMathBuildDir /**/ +#include "../../../../../../lib/GL/mesa/src/math/Imakefile.inc" - -LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_vertex.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_matrix.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_norm_tmp.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_trans_tmp.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_translate.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_vector.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_vertices.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_vertices.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math) -LinkSourceFile(m_xform.h, $(MESASRCDIR)/src/math) -LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/math) -LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/math) - - SRCS = m_debug_clip.c \ - m_debug_norm.c \ - m_debug_vertex.c \ - m_debug_xform.c \ - m_eval.c \ - m_matrix.c \ - m_translate.c \ - m_vector.c \ - m_vertices.c \ - m_xform.c - - OBJS = m_debug_clip.o \ - m_debug_norm.o \ - m_debug_vertex.o \ - m_debug_xform.o \ - m_eval.o \ - m_matrix.o \ - m_translate.o \ - m_vector.o \ - m_vertices.o \ - m_xform.o - + SRCS = $(MESA_MATH_SRCS) + OBJS = $(MESA_MATH_OBJS) INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/math \ @@ -60,7 +17,7 @@ LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/math) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I../../../include -I../../../glx \ -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(XTOP)/include + -I$(XF86SRC) -I$(INCLUDESRC) DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ diff --git a/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile b/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile index 2292a81b7..04d3d657e 100644 --- a/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile @@ -1,131 +1,16 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $ #define IHaveModules #include <Server.tmpl> -LinkSourceFile(s_aaline.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_aaline.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_aalinetemp.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_aatriangle.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_aatriangle.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_aatritemp.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_accum.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_accum.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_alpha.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_alpha.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_alphabuf.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_alphabuf.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_bitmap.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_blend.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_blend.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_buffers.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_context.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_context.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_copypix.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_depth.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_depth.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_drawpix.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_feedback.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_fog.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_histogram.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_histogram.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_lines.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_linetemp.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_logic.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_masking.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_masking.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pb.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pb.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pixeltex.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pixeltex.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_pointtemp.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_points.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_points.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_readpix.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_scissor.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_scissor.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_span.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_span.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_stencil.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_stencil.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_texstore.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_texture.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_texture.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_triangle.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_triangle.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_trispan.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_tritemp.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_zoom.c, $(MESASRCDIR)/src/swrast) -LinkSourceFile(s_zoom.h, $(MESASRCDIR)/src/swrast) -LinkSourceFile(swrast.h, $(MESASRCDIR)/src/swrast) +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaSwrastBuildDir /**/ +#include "../../../../../../lib/GL/mesa/src/swrast/Imakefile.inc" - SRCS = s_aaline.c \ - s_aatriangle.c \ - s_accum.c \ - s_alpha.c \ - s_alphabuf.c \ - s_bitmap.c \ - s_blend.c \ - s_buffers.c \ - s_context.c \ - s_copypix.c \ - s_depth.c \ - s_drawpix.c \ - s_feedback.c \ - s_fog.c \ - s_histogram.c \ - s_imaging.c \ - s_lines.c \ - s_logic.c \ - s_masking.c \ - s_pb.c \ - s_pixeltex.c \ - s_points.c \ - s_readpix.c \ - s_scissor.c \ - s_span.c \ - s_stencil.c \ - s_texstore.c \ - s_texture.c \ - s_triangle.c \ - s_zoom.c - OBJS = s_aaline.o \ - s_aatriangle.o \ - s_accum.o \ - s_alpha.o \ - s_alphabuf.o \ - s_bitmap.o \ - s_blend.o \ - s_buffers.o \ - s_context.o \ - s_copypix.o \ - s_depth.o \ - s_drawpix.o \ - s_feedback.o \ - s_fog.o \ - s_histogram.o \ - s_imaging.o \ - s_lines.o \ - s_logic.o \ - s_masking.o \ - s_pb.o \ - s_pixeltex.o \ - s_points.o \ - s_readpix.o \ - s_scissor.o \ - s_span.o \ - s_stencil.o \ - s_texture.o \ - s_texstore.o \ - s_triangle.o \ - s_zoom.o + SRCS = $(MESA_SWRAST_SRCS) + OBJS = $(MESA_SWRAST_OBJS) INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/swrast \ @@ -134,7 +19,7 @@ LinkSourceFile(swrast.h, $(MESASRCDIR)/src/swrast) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I../../../include -I../../../glx \ -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(XTOP)/include + -I$(XF86SRC) -I$(INCLUDESRC) DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ diff --git a/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile b/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile index 5a8c53819..dfa2ece31 100644 --- a/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile @@ -1,20 +1,15 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $ #define IHaveModules #include <Server.tmpl> -LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_context.h, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_triangle.h, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_tritmp.h, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_vb.c, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_vb.h, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(ss_vbtmp.h, $(MESASRCDIR)/src/swrast_setup) -LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/swrast_setup) +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaSwrastSetupBuildDir /**/ +#include "../../../../../../lib/GL/mesa/src/swrast_setup/Imakefile.inc" - SRCS = ss_context.c ss_triangle.c ss_vb.c - OBJS = ss_context.o ss_triangle.o ss_vb.o + SRCS = $(MESA_SWR_SETUP_SRCS) + OBJS = $(MESA_SWR_SETUP_OBJS) INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/swrast_setup \ @@ -22,7 +17,7 @@ LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/swrast_setup) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I../../../include -I../../../glx \ -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(XTOP)/include + -I$(XF86SRC) -I$(INCLUDESRC) DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ diff --git a/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile b/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile index f0fae1093..137670dc1 100644 --- a/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile @@ -1,101 +1,26 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.3 2002/02/28 17:52:19 dawes Exp $ #define IHaveModules #include <Server.tmpl> +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaTnlBuildDir /**/ +#include "../../../../../../lib/GL/mesa/src/tnl/Imakefile.inc" -LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_array_api.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_array_import.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_context.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_context.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_eval_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_eval_api.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_alloc.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_alloc.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_api.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_api.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_debug.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_debug.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_dlist.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_dlist.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_elt.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_elt.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_eval.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_eval.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_exec.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_exec.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_fixup.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_imm_fixup.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_pipeline.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_cliptmp.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_lighttmp.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_rendertmp.h, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) -LinkSourceFile(tnl.h, $(MESASRCDIR)/src/tnl) - - SRCS = t_array_api.c \ - t_array_import.c \ - t_context.c \ - t_eval_api.c \ - t_imm_alloc.c \ - t_imm_api.c \ - t_imm_debug.c \ - t_imm_dlist.c \ - t_imm_elt.c \ - t_imm_eval.c \ - t_imm_exec.c \ - t_imm_fixup.c \ - t_pipeline.c \ - t_vb_fog.c \ - t_vb_light.c \ - t_vb_normals.c \ - t_vb_points.c \ - t_vb_render.c \ - t_vb_texgen.c \ - t_vb_texmat.c \ - t_vb_vertex.c - - OBJS = t_array_api.o \ - t_array_import.o \ - t_context.o \ - t_eval_api.o \ - t_imm_alloc.o \ - t_imm_api.o \ - t_imm_debug.o \ - t_imm_dlist.o \ - t_imm_elt.o \ - t_imm_eval.o \ - t_imm_exec.o \ - t_imm_fixup.o \ - t_pipeline.o \ - t_vb_fog.o \ - t_vb_light.o \ - t_vb_normals.o \ - t_vb_points.o \ - t_vb_render.o \ - t_vb_texgen.o \ - t_vb_texmat.o \ - t_vb_vertex.o + SRCS = $(MESA_TNL_SRCS) + OBJS = $(MESA_TNL_OBJS) INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/array_cache \ -I$(MESASRCDIR)/src/math \ + -I$(MESASRCDIR)/src/tnl \ -I$(MESASRCDIR)/include \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I../../../include -I../../../glx \ -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(XTOP)/include + -I$(XF86SRC) -I$(INCLUDESRC) DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile index 179c33344..c2818a352 100644 --- a/xc/programs/Xserver/Imakefile +++ b/xc/programs/Xserver/Imakefile @@ -2,7 +2,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $ /* * Server Master Makefile */ -XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.254 2002/01/07 20:38:21 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.257 2002/02/25 00:45:40 dawes Exp $ #ifndef InstallXserverSetUID #define InstallXserverSetUID NO @@ -85,10 +85,10 @@ INSTPGMFLAGS = #else #if DoLoadableServer GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/src/ModuleLibraryTargetName(GLcore) + GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) #else GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/src/ModuleLibraryTargetName(GLcore) \ + GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \ $(DRILIB) #endif #endif |