diff options
Diffstat (limited to 'nx-X11/lib/GL/mesa')
34 files changed, 0 insertions, 3415 deletions
diff --git a/nx-X11/lib/GL/mesa/Imakefile b/nx-X11/lib/GL/mesa/Imakefile deleted file mode 100644 index 9e1db00a0..000000000 --- a/nx-X11/lib/GL/mesa/Imakefile +++ /dev/null @@ -1,84 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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. - */ - -NULL = - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if defined(i386Architecture) && MesaUseX86Asm -#define MesaX86BuildDir /**/ -ASM_SUBDIRS = x86 -#endif -#ifdef SparcArchitecture -#define MesaSparcBuildDir /**/ -ASM_SUBDIRS = sparc -#endif -#define MesaBuildDir /**/ -#define NeedToLinkMesaSrc - -#ifdef UseCompaqMathLibrary - MATH_DEFINES = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) GlxDefines \ - $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(GLXLIBSRC)/dri \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include - -#include <Library.tmpl> - -LibraryObjectRule() - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = \ - $(ASM_SUBDIRS) \ - array_cache \ - main \ - math \ - swrast \ - swrast_setup \ - tnl \ - tnl_dd \ - shader \ - $(NULL) - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/Imakefile.inc b/nx-X11/lib/GL/mesa/Imakefile.inc deleted file mode 100644 index 03a7971f8..000000000 --- a/nx-X11/lib/GL/mesa/Imakefile.inc +++ /dev/null @@ -1,57 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ - -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/ -#endif - -MESABUILDDIR = MesaBuildDir - -COREMESASRCS = $(COREMESABASESRCS) \ - $(MESA_AC_SRCS) \ - $(MESA_MATH_SRCS) \ - $(MESA_SWRAST_SRCS) \ - $(MESA_SWR_SETUP_SRCS) \ - $(MESA_TNL_SRCS) \ - $(MESA_SHADER_SRCS) \ - $(MESA_GRAMMAR_SRCS) \ - $(MESA_SLANG_SRCS) - -COREMESAOBJS = $(COREMESABASEOBJS) \ - $(MESA_AC_OBJS) \ - $(MESA_MATH_OBJS) \ - $(MESA_SWRAST_OBJS) \ - $(MESA_SWR_SETUP_OBJS) \ - $(MESA_TNL_OBJS) \ - $(MESA_SHADER_OBJS) \ - $(MESA_GRAMMAR_OBJS) \ - $(MESA_SLANG_OBJS) - -COREMESAUOBJS = $(COREMESABASEUOBJS) \ - $(MESA_AC_UOBJS) \ - $(MESA_MATH_UOBJS) \ - $(MESA_SWRAST_UOBJS) \ - $(MESA_SWR_SETUP_UOBJS) \ - $(MESA_TNL_UOBJS) \ - $(MESA_SHADER_UOBJS) \ - $(MESA_GRAMMAR_UOBJS) \ - $(MESA_SLANG_UOBJS) - -COREMESADOBJS = $(COREMESABASEDOBJS) \ - $(MESA_AC_DOBJS) \ - $(MESA_MATH_DOBJS) \ - $(MESA_SWRAST_DOBJS) \ - $(MESA_SWR_SETUP_DOBJS) \ - $(MESA_TNL_DOBJS) \ - $(MESA_SHADER_DOBJS) \ - $(MESA_GRAMMAR_DOBJS) \ - $(MESA_SLANG_DOBJS) - -COREMESAPOBJS = $(COREMESABASEPOBJS) \ - $(MESA_AC_POBJS) \ - $(MESA_MATH_POBJS) \ - $(MESA_SWRAST_POBJS) \ - $(MESA_SWR_SETUP_POBJS) \ - $(MESA_TNL_POBJS) \ - $(MESA_SHADER_POBJS) \ - $(MESA_GRAMMAR_POBJS) \ - $(MESA_SLANG_POBJS) diff --git a/nx-X11/lib/GL/mesa/array_cache/Imakefile b/nx-X11/lib/GL/mesa/array_cache/Imakefile deleted file mode 100644 index 40c9c6b52..000000000 --- a/nx-X11/lib/GL/mesa/array_cache/Imakefile +++ /dev/null @@ -1,91 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#define MesaACBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_AC_SRCS) - OBJS = $(MESA_AC_OBJS) - - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc b/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc deleted file mode 100644 index 9a5044791..000000000 --- a/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc +++ /dev/null @@ -1,34 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaACBuildDir -#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/ -#endif - -MESAACBUILDDIR = MesaACBuildDir - - MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ - $(MESAACBUILDDIR)ac_import.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(acache.h, $(MESASRCDIR)/src/mesa/array_cache) -LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/mesa/array_cache) -LinkSourceFile(ac_context.h, $(MESASRCDIR)/src/mesa/array_cache) -LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/mesa/array_cache) -#endif - - MESA_AC_OBJS = $(MESAACBUILDDIR)ac_context.o \ - $(MESAACBUILDDIR)ac_import.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_AC_UOBJS = $(MESAACBUILDDIR)unshared/ac_context.o \ - $(MESAACBUILDDIR)unshared/ac_import.o -#else - MESA_AC_UOBJS = $(MESA_AC_OBJS) -#endif - - MESA_AC_DOBJS = $(MESAACBUILDDIR)debugger/ac_context.o \ - $(MESAACBUILDDIR)debugger/ac_import.o - - MESA_AC_POBJS = $(MESAACBUILDDIR)profiled/ac_context.o \ - $(MESAACBUILDDIR)profiled/ac_import.o - diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile deleted file mode 100644 index 5c910489f..000000000 --- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile +++ /dev/null @@ -1,44 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:34 dawes Exp $ - -#include <Threads.tmpl> - -#if GlxUseBuiltInDRIDriver -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtrasLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -#if defined(i386Architecture) && MesaUseX86Asm -#include "../../../x86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../../../sparc/Imakefile.inc" -#endif - -#define NeedToLinkMesaSrc -#define MesaDrvCommonBuildDir /**/ -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \ - $(COMMON_DRI_INCLUDES) - - SRCS = $(COMMONSRCS) - OBJS = $(COMMONOBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc deleted file mode 100644 index 388b724b2..000000000 --- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc +++ /dev/null @@ -1,105 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile.inc,v 1.3 2003/05/27 16:34:32 tsi Exp $ - -#ifndef MesaDrvSrcDir -#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri -#endif - -MESADRVSRCDIR = MesaDrvSrcDir - -#ifndef MesaDrvCommonBuildDir -#define MesaDrvCommonBuildDir $(MESADRVSRCDIR)/common/ -#endif - -MESADRVCOMMONBUILDDIR = MesaDrvCommonBuildDir - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - COMMON_DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) -DIN_DRI_DRIVER - COMMON_DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ - -I$(GLXLIBSRC)/glx \ - -I$(GLXLIBSRC)/include \ - -I$(SERVERSRC)/GL/dri \ - -I$(XF86OSSRC) \ - -I$(XF86COMSRC) \ - -I$(GLXLIBSRC)/dri/drm \ - -I$(GLXLIBSRC)/include \ - -I$(DRMSRCDIR)/shared-core \ - -I$(MESASRCDIR)/include/GL/internal -#endif - -COMMON_MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESADRVSRCDIR)/common \ - -I$(MESADRVSRCDIR)/../common \ - -I$(MESASRCDIR)/include - COMMON_X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) - - COMMONSRCS = $(MESADRVCOMMONBUILDDIR)utils.c \ - $(MESADRVCOMMONBUILDDIR)vblank.c \ - $(MESADRVCOMMONBUILDDIR)texmem.c \ - $(MESADRVCOMMONBUILDDIR)xmlconfig.c \ - $(MESADRVCOMMONBUILDDIR)driverfuncs.c \ - $(MESADRVCOMMONBUILDDIR)dri_util.c \ - $(MESADRVCOMMONBUILDDIR)glcontextmodes.c \ - $(MESADRVCOMMONBUILDDIR)drirenderbuffer.c - - COMMONOBJS = $(MESADRVCOMMONBUILDDIR)utils.o \ - $(MESADRVCOMMONBUILDDIR)vblank.o \ - $(MESADRVCOMMONBUILDDIR)texmem.o \ - $(MESADRVCOMMONBUILDDIR)xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)dri_util.o \ - $(MESADRVCOMMONBUILDDIR)glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)drirenderbuffer.o - - COMMONUOBJS = $(MESADRVCOMMONBUILDDIR)unshared/utils.o \ - $(MESADRVCOMMONBUILDDIR)unshared/vblank.o \ - $(MESADRVCOMMONBUILDDIR)unshared/texmem.o \ - $(MESADRVCOMMONBUILDDIR)unshared/xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)unshared/driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)unshared/dri_util.o \ - $(MESADRVCOMMONBUILDDIR)unshared/glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)unshared/drirenderbuffer.o - - COMMONDOBJS = $(MESADRVCOMMONBUILDDIR)debugger/utils.o \ - $(MESADRVCOMMONBUILDDIR)debugger/vblank.o \ - $(MESADRVCOMMONBUILDDIR)debugger/texmem.o \ - $(MESADRVCOMMONBUILDDIR)debugger/xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)debugger/driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)debugger/dri_util.o \ - $(MESADRVCOMMONBUILDDIR)debugger/glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)debugger/drirenderbuffer.o - - COMMONPOBJS = $(MESADRVCOMMONBUILDDIR)profiled/utils.o \ - $(MESADRVCOMMONBUILDDIR)profiled/vblank.o \ - $(MESADRVCOMMONBUILDDIR)profiled/texmem.o \ - $(MESADRVCOMMONBUILDDIR)profiled/xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)profiled/driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)profiled/dri_util.o \ - $(MESADRVCOMMONBUILDDIR)profiled/glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)profiled/drirenderbuffer.o - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(texmem.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(texmem.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(utils.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(utils.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(vblank.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(vblank.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(xmlconfig.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(xmlconfig.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(driverfuncs.c, $(MESADRVSRCDIR)/../common) -LinkSourceFile(driverfuncs.h, $(MESADRVSRCDIR)/../common) -LinkSourceFile(dri_util.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(dri_util.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(glcontextmodes.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(glcontextmodes.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(drirenderbuffer.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(drirenderbuffer.h, $(MESADRVSRCDIR)/common) -#endif diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile b/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile deleted file mode 100644 index 014945699..000000000 --- a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile +++ /dev/null @@ -1,111 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.16 2002/11/25 14:04:50 eich Exp $ - -#include <Threads.tmpl> - -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#include "../../array_cache/Imakefile.inc" -#include "../../math/Imakefile.inc" -#include "../../main/Imakefile.inc" -#include "../../shader/Imakefile.inc" -#include "../../shader/grammar/Imakefile.inc" -#include "../../shader/slang/Imakefile.inc" -#include "../../swrast/Imakefile.inc" -#include "../../swrast_setup/Imakefile.inc" -#include "../../tnl/Imakefile.inc" -#include "../../tnl_dd/Imakefile.inc" -#include "../../Imakefile.inc" -#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm -#include "../../x86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../../sparc/Imakefile.inc" -#endif - -LinkSourceFile(osmesa.c, $(MESASRCDIR)/src/mesa/drivers/osmesa) -LinkSourceFile(driverfuncs.c, $(MESASRCDIR)/src/mesa/drivers/common) -LinkSourceFile(driverfuncs.h, $(MESASRCDIR)/src/mesa/drivers/common) - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/include - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) - INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \ - $(DRI_INCLUDES) -I$(GLXLIBSRC)/include - - MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS) - MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS) - MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS) - MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS) - - SRCS = osmesa.c driverfuncs.c - OBJS = osmesa.o driverfuncs.o $(MESAOBJS) -#if DoSharedLib - UOBJS = unshared/osmesa.o unshared/driverfuncs.o $(MESAUOBJS) -#else - UOBJS = $(OBJS) -#endif - DOBJS = debugger/osmesa.o debugger/driverfuncs.o $(MESADOBJS) - POBJS = profiled/osmesa.o profiled/driverfuncs.o $(MESAPOBJS) - -#if LocalThreads - THREADOBJS = $(THREADS_LIBS) -#endif - -#if !GlxUseBuiltInDRIDriver -# ifdef SharedOSMesaReqs - REQUIREDLIBS = SharedOSMesaReqs -# else - REQUIREDLIBS = MathLibrary $(LDPRELIB) $(XLIB) $(GLXLIB) -# endif -#endif - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -LIBNAME = OSMesa -SOREV = 4.0 - - -#if DoNormalLib -NormalLibraryTarget($(LIBNAME), $(UOBJS)) -InstallLibrary($(LIBNAME),$(USRLIBDIR)) -#endif - -#if SharedLibGlx -SharedLibraryTarget($(LIBNAME),$(SOREV), $(OBJS), ., .) -InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -#endif - -#if DoDebugLib -DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) -InstallLibrary($(LIBNAME_d,$(USRLIBDIR)) -#endif - -#if DoProfileLib -ProfiledLibraryTarget($(LIBNAME), $(POBJS)) -InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -#endif - -DependTarget() - diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp b/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp deleted file mode 100644 index e69de29bb..000000000 --- a/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp +++ /dev/null diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile deleted file mode 100644 index ab9a91970..000000000 --- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile +++ /dev/null @@ -1,70 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#define MesaXBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -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$(XINCLUDESRC) - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -#if BuildXF86DRI && GlxBuiltInXMesa - XMESA_DEFINES = -DGLX_BUILT_IN_XMESA -#endif - - SRCS = $(XMESA_SRCS) - OBJS = $(XMESA_OBJS) - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(XMESA_OBJS)) -NormalLintTarget($(XMESA_SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc deleted file mode 100644 index d62800e7d..000000000 --- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc +++ /dev/null @@ -1,104 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ - -#ifndef MesaXBuildDir -#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/ -#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_buffer.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/mesa/drivers/x11) -LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(realglx.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/mesa/drivers/x11) -#endif -LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_buffer.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/mesa/drivers/x11) -LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/mesa/drivers/x11) -#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_buffer.o \ - $(MESAXBUILDDIR)xm_dd.o \ - $(MESAXBUILDDIR)xm_line.o \ - $(MESAXBUILDDIR)xm_span.o \ - $(MESAXBUILDDIR)xm_tri.o - -#if defined(DoSharedLib) && 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_buffer.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_buffer.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_buffer.o \ - $(MESAXBUILDDIR)profiled/xm_dd.o \ - $(MESAXBUILDDIR)profiled/xm_line.o \ - $(MESAXBUILDDIR)profiled/xm_span.o \ - $(MESAXBUILDDIR)profiled/xm_tri.o - diff --git a/nx-X11/lib/GL/mesa/main/Imakefile b/nx-X11/lib/GL/mesa/main/Imakefile deleted file mode 100644 index 3093cedd1..000000000 --- a/nx-X11/lib/GL/mesa/main/Imakefile +++ /dev/null @@ -1,66 +0,0 @@ -XCOMM $XdotOrg: xc/lib/GL/mesa/main/Imakefile,v 1.3 2005/12/20 22:30:49 alanc Exp $ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris/SPARC builds */ -#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) -# define LargePICTable YES -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#ifdef UseCompaqMathLibrary - MATH_DEFINES = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \ - $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa -I$(GLXLIBSRC)/dri \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include - SRCS = $(COREMESABASESRCS) - OBJS = $(COREMESABASEOBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc deleted file mode 100644 index 80b3aef07..000000000 --- a/nx-X11/lib/GL/mesa/main/Imakefile.inc +++ /dev/null @@ -1,487 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ - -/* gcc on ppc64 defines this, causes macro recursion with pixel below */ -#undef pixel - -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/main/ -#endif - -MESABUILDDIR = MesaBuildDir - -#ifdef NeedAllMesaSrc - DISPATCHSRCS = $(MESABUILDDIR)dispatch.c - GLAPISRCS = $(MESABUILDDIR)glapi.c - GLTHREADSRCS = $(MESABUILDDIR)glthread.c -#endif - -MESA_CORE_INCLUDES = -I$(MESASRCDIR)/src/array_cache \ - -I$(MESASRCDIR)/src/math -I$(MESASRCDIR)/src/shader \ - -I$(MESASRCDIR)/src/swrast -I$(MESASRCDIR)/src/swrast_setup \ - -I$(MESASRCDIR)/src/tnl -I$(MESASRCDIR)/src/tnl_dd - -COREMESABASESRCS = \ - $(MESABUILDDIR)api_arrayelt.c \ - $(MESABUILDDIR)api_loopback.c \ - $(MESABUILDDIR)api_noop.c \ - $(MESABUILDDIR)api_validate.c \ - $(MESABUILDDIR)accum.c \ - $(MESABUILDDIR)attrib.c \ - $(MESABUILDDIR)blend.c \ - $(MESABUILDDIR)bufferobj.c \ - $(MESABUILDDIR)buffers.c \ - $(MESABUILDDIR)clip.c \ - $(MESABUILDDIR)colortab.c \ - $(MESABUILDDIR)context.c \ - $(MESABUILDDIR)convolve.c \ - $(MESABUILDDIR)debug.c \ - $(MESABUILDDIR)depth.c \ - $(MESABUILDDIR)dlist.c \ - $(MESABUILDDIR)drawpix.c \ - $(MESABUILDDIR)enable.c \ - $(MESABUILDDIR)enums.c \ - $(MESABUILDDIR)eval.c \ - $(MESABUILDDIR)execmem.c \ - $(MESABUILDDIR)extensions.c \ - $(MESABUILDDIR)feedback.c \ - $(MESABUILDDIR)fbobject.c \ - $(MESABUILDDIR)fog.c \ - $(MESABUILDDIR)framebuffer.c \ - $(MESABUILDDIR)get.c \ - $(MESABUILDDIR)getstring.c \ - $(MESABUILDDIR)hash.c \ - $(MESABUILDDIR)hint.c \ - $(MESABUILDDIR)histogram.c \ - $(MESABUILDDIR)image.c \ - $(MESABUILDDIR)imports.c \ - $(MESABUILDDIR)light.c \ - $(MESABUILDDIR)lines.c \ - $(MESABUILDDIR)matrix.c \ - $(MESABUILDDIR)mm.c \ - $(MESABUILDDIR)occlude.c \ - $(MESABUILDDIR)pixel.c \ - $(MESABUILDDIR)points.c \ - $(MESABUILDDIR)polygon.c \ - $(MESABUILDDIR)rastpos.c \ - $(MESABUILDDIR)renderbuffer.c \ - $(MESABUILDDIR)state.c \ - $(MESABUILDDIR)stencil.c \ - $(MESABUILDDIR)texcompress.c \ - $(MESABUILDDIR)texcompress_fxt1.c \ - $(MESABUILDDIR)texcompress_s3tc.c \ - $(MESABUILDDIR)texenvprogram.c \ - $(MESABUILDDIR)texformat.c \ - $(MESABUILDDIR)teximage.c \ - $(MESABUILDDIR)texobj.c \ - $(MESABUILDDIR)texrender.c \ - $(MESABUILDDIR)texstate.c \ - $(MESABUILDDIR)texstore.c \ - $(MESABUILDDIR)varray.c \ - $(MESABUILDDIR)vtxfmt.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(api_arrayelt.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_arrayelt.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_eval.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_loopback.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_loopback.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_noop.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_noop.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_validate.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(api_validate.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(accum.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(accum.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(attrib.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(attrib.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(blend.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(blend.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(bufferobj.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(bufferobj.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(buffers.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(buffers.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(clip.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(clip.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(colormac.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(colortab.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(colortab.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(config.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(context.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(context.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(convolve.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(convolve.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(dd.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(debug.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(debug.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(depth.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(depth.h, $(MESASRCDIR)/src/mesa/main) -#ifdef NeedAllMesaSrc -LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main) -#endif -LinkSourceFile(dlist.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(dlist.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(drawpix.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(drawpix.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enable.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enable.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enums.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(enums.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(eval.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(eval.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(execmem.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(extensions.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(extensions.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fbobject.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fbobject.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(feedback.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(feedback.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fog.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(fog.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(framebuffer.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(framebuffer.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(get.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(get.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(getstring.c, $(MESASRCDIR)/src/mesa/main) -#ifdef NeedAllMesaSrc -LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi) -LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi) -#endif -LinkSourceFile(glheader.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hash.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hash.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hint.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(hint.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(histogram.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(histogram.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(image.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(image.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(imports.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(imports.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(light.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(light.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(lines.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(lines.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(macros.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(matrix.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(matrix.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(mm.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(mm.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(mtypes.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(occlude.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(occlude.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(pixel.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(pixel.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(points.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(points.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(polygon.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(polygon.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(rastpos.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(rastpos.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(renderbuffer.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(renderbuffer.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(simple_list.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(state.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(state.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(stencil.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(stencil.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress_fxt1.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress_s3tc.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texcompress.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texenvprogram.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texenvprogram.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texformat.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texformat.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texformat_tmp.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(teximage.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(teximage.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texobj.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texobj.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texrender.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texrender.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstate.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstate.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstore.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(texstore.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(varray.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(varray.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(version.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(vtxfmt.c, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(vtxfmt.h, $(MESASRCDIR)/src/mesa/main) -LinkSourceFile(vtxfmt_tmp.h, $(MESASRCDIR)/src/mesa/main) -#endif - -#ifdef NeedAllMesaSrc - DISPATCHOBJS = $(MESABUILDDIR)dispatch.o - GLAPIOBJS = $(MESABUILDDIR)glapi.o - GLTHREADOBJS = $(MESABUILDDIR)glthread.o -#endif - -COREMESABASEOBJS = \ - $(DISPATCHOBJS) \ - $(GLAPIOBJS) \ - $(GLTHREADOBJS) \ - $(MESABUILDDIR)api_arrayelt.o \ - $(MESABUILDDIR)api_loopback.o \ - $(MESABUILDDIR)api_noop.o \ - $(MESABUILDDIR)api_validate.o \ - $(MESABUILDDIR)accum.o \ - $(MESABUILDDIR)attrib.o \ - $(MESABUILDDIR)blend.o \ - $(MESABUILDDIR)bufferobj.o \ - $(MESABUILDDIR)buffers.o \ - $(MESABUILDDIR)clip.o \ - $(MESABUILDDIR)colortab.o \ - $(MESABUILDDIR)context.o \ - $(MESABUILDDIR)convolve.o \ - $(MESABUILDDIR)debug.o \ - $(MESABUILDDIR)depth.o \ - $(MESABUILDDIR)dlist.o \ - $(MESABUILDDIR)drawpix.o \ - $(MESABUILDDIR)enable.o \ - $(MESABUILDDIR)enums.o \ - $(MESABUILDDIR)eval.o \ - $(MESABUILDDIR)execmem.o \ - $(MESABUILDDIR)extensions.o \ - $(MESABUILDDIR)fbobject.o \ - $(MESABUILDDIR)feedback.o \ - $(MESABUILDDIR)fog.o \ - $(MESABUILDDIR)framebuffer.o \ - $(MESABUILDDIR)get.o \ - $(MESABUILDDIR)getstring.o \ - $(MESABUILDDIR)hash.o \ - $(MESABUILDDIR)hint.o \ - $(MESABUILDDIR)histogram.o \ - $(MESABUILDDIR)image.o \ - $(MESABUILDDIR)imports.o \ - $(MESABUILDDIR)light.o \ - $(MESABUILDDIR)lines.o \ - $(MESABUILDDIR)matrix.o \ - $(MESABUILDDIR)mm.o \ - $(MESABUILDDIR)occlude.o \ - $(MESABUILDDIR)pixel.o \ - $(MESABUILDDIR)points.o \ - $(MESABUILDDIR)polygon.o \ - $(MESABUILDDIR)rastpos.o \ - $(MESABUILDDIR)renderbuffer.o \ - $(MESABUILDDIR)state.o \ - $(MESABUILDDIR)stencil.o \ - $(MESABUILDDIR)texcompress.o \ - $(MESABUILDDIR)texcompress_fxt1.o \ - $(MESABUILDDIR)texcompress_s3tc.o \ - $(MESABUILDDIR)texenvprogram.o \ - $(MESABUILDDIR)texformat.o \ - $(MESABUILDDIR)teximage.o \ - $(MESABUILDDIR)texrender.o \ - $(MESABUILDDIR)texobj.o \ - $(MESABUILDDIR)texstate.o \ - $(MESABUILDDIR)texstore.o \ - $(MESABUILDDIR)varray.o \ - $(MESABUILDDIR)vtxfmt.o - -#ifdef NeedAllMesaSrc - DISPATCHUOBJS = $(MESABUILDDIR)unshared/dispatch.o - GLAPIUOBJS = $(MESABUILDDIR)unshared/glapi.o - GLTHREADUOBJS = $(MESABUILDDIR)unshared/glthread.o -#endif - -#if defined(DoSharedLib) && DoSharedLib -COREMESABASEUOBJS = \ - $(DISPATCHUOBJS) \ - $(GLAPIUOBJS) \ - $(GLTHREADUOBJS) \ - $(MESABUILDDIR)unshared/api_arrayelt.o \ - $(MESABUILDDIR)unshared/api_loopback.o \ - $(MESABUILDDIR)unshared/api_noop.o \ - $(MESABUILDDIR)unshared/api_validate.o \ - $(MESABUILDDIR)unshared/accum.o \ - $(MESABUILDDIR)unshared/attrib.o \ - $(MESABUILDDIR)unshared/blend.o \ - $(MESABUILDDIR)unshared/bufferobj.o \ - $(MESABUILDDIR)unshared/buffers.o \ - $(MESABUILDDIR)unshared/clip.o \ - $(MESABUILDDIR)unshared/colortab.o \ - $(MESABUILDDIR)unshared/context.o \ - $(MESABUILDDIR)unshared/convolve.o \ - $(MESABUILDDIR)unshared/debug.o \ - $(MESABUILDDIR)unshared/depth.o \ - $(MESABUILDDIR)unshared/dlist.o \ - $(MESABUILDDIR)unshared/drawpix.o \ - $(MESABUILDDIR)unshared/enable.o \ - $(MESABUILDDIR)unshared/enums.o \ - $(MESABUILDDIR)unshared/eval.o \ - $(MESABUILDDIR)unshared/execmem.o \ - $(MESABUILDDIR)unshared/extensions.o \ - $(MESABUILDDIR)unshared/fbobject.o \ - $(MESABUILDDIR)unshared/feedback.o \ - $(MESABUILDDIR)unshared/fog.o \ - $(MESABUILDDIR)unshared/framebuffer.o \ - $(MESABUILDDIR)unshared/get.o \ - $(MESABUILDDIR)unshared/getstring.o \ - $(MESABUILDDIR)unshared/hash.o \ - $(MESABUILDDIR)unshared/hint.o \ - $(MESABUILDDIR)unshared/histogram.o \ - $(MESABUILDDIR)unshared/image.o \ - $(MESABUILDDIR)unshared/imports.o \ - $(MESABUILDDIR)unshared/light.o \ - $(MESABUILDDIR)unshared/lines.o \ - $(MESABUILDDIR)unshared/matrix.o \ - $(MESABUILDDIR)unshared/mm.o \ - $(MESABUILDDIR)unshared/occlude.o \ - $(MESABUILDDIR)unshared/pixel.o \ - $(MESABUILDDIR)unshared/points.o \ - $(MESABUILDDIR)unshared/polygon.o \ - $(MESABUILDDIR)unshared/rastpos.o \ - $(MESABUILDDIR)unshared/renderbuffer.o \ - $(MESABUILDDIR)unshared/state.o \ - $(MESABUILDDIR)unshared/stencil.o \ - $(MESABUILDDIR)unshared/texcompress.o \ - $(MESABUILDDIR)unshared/texcompress_fxt1.o \ - $(MESABUILDDIR)unshared/texcompress_s3tc.o \ - $(MESABUILDDIR)unshared/texenvprogram.o \ - $(MESABUILDDIR)unshared/texformat.o \ - $(MESABUILDDIR)unshared/teximage.o \ - $(MESABUILDDIR)unshared/texobj.o \ - $(MESABUILDDIR)unshared/texrender.o \ - $(MESABUILDDIR)unshared/texstate.o \ - $(MESABUILDDIR)unshared/texstore.o \ - $(MESABUILDDIR)unshared/varray.o \ - $(MESABUILDDIR)unshared/vtxfmt.o -#else -COREMESABASEUOBJS = $(COREMESABASEOBJS) -#endif - -#ifdef NeedAllMesaSrc - DISPATCHDOBJS = $(MESABUILDDIR)debugger/dispatch.o - GLAPIDOBJS = $(MESABUILDDIR)debugger/glapi.o - GLTHREADDOBJS = $(MESABUILDDIR)debugger/glthread.o -#endif - -COREMESABASEDOBJS = \ - $(DISPATCHDOBJS) \ - $(GLAPIDOBJS) \ - $(GLTHREADDOBJS) \ - $(MESABUILDDIR)debugger/api_arrayelt.o \ - $(MESABUILDDIR)debugger/api_loopback.o \ - $(MESABUILDDIR)debugger/api_noop.o \ - $(MESABUILDDIR)debugger/api_validate.o \ - $(MESABUILDDIR)debugger/accum.o \ - $(MESABUILDDIR)debugger/attrib.o \ - $(MESABUILDDIR)debugger/blend.o \ - $(MESABUILDDIR)debugger/bufferobj.o \ - $(MESABUILDDIR)debugger/buffers.o \ - $(MESABUILDDIR)debugger/clip.o \ - $(MESABUILDDIR)debugger/colortab.o \ - $(MESABUILDDIR)debugger/context.o \ - $(MESABUILDDIR)debugger/convolve.o \ - $(MESABUILDDIR)debugger/debug.o \ - $(MESABUILDDIR)debugger/depth.o \ - $(MESABUILDDIR)debugger/dlist.o \ - $(MESABUILDDIR)debugger/drawpix.o \ - $(MESABUILDDIR)debugger/enable.o \ - $(MESABUILDDIR)debugger/enums.o \ - $(MESABUILDDIR)debugger/eval.o \ - $(MESABUILDDIR)debugger/execmem.o \ - $(MESABUILDDIR)debugger/extensions.o \ - $(MESABUILDDIR)debugger/fbobject.o \ - $(MESABUILDDIR)debugger/feedback.o \ - $(MESABUILDDIR)debugger/fog.o \ - $(MESABUILDDIR)debugger/framebuffer.o \ - $(MESABUILDDIR)debugger/get.o \ - $(MESABUILDDIR)debugger/getstring.o \ - $(MESABUILDDIR)debugger/hash.o \ - $(MESABUILDDIR)debugger/hint.o \ - $(MESABUILDDIR)debugger/histogram.o \ - $(MESABUILDDIR)debugger/image.o \ - $(MESABUILDDIR)debugger/imports.o \ - $(MESABUILDDIR)debugger/light.o \ - $(MESABUILDDIR)debugger/lines.o \ - $(MESABUILDDIR)debugger/matrix.o \ - $(MESABUILDDIR)debugger/mm.o \ - $(MESABUILDDIR)debugger/occlude.o \ - $(MESABUILDDIR)debugger/pixel.o \ - $(MESABUILDDIR)debugger/points.o \ - $(MESABUILDDIR)debugger/polygon.o \ - $(MESABUILDDIR)debugger/rastpos.o \ - $(MESABUILDDIR)debugger/renderbuffer.o \ - $(MESABUILDDIR)debugger/state.o \ - $(MESABUILDDIR)debugger/stencil.o \ - $(MESABUILDDIR)debugger/texcompress.o \ - $(MESABUILDDIR)debugger/texcompress_fxt1.o \ - $(MESABUILDDIR)debugger/texcompress_s3tc.o \ - $(MESABUILDDIR)debugger/texenvprogram.o \ - $(MESABUILDDIR)debugger/texformat.o \ - $(MESABUILDDIR)debugger/teximage.o \ - $(MESABUILDDIR)debugger/texobj.o \ - $(MESABUILDDIR)debugger/texrender.o \ - $(MESABUILDDIR)debugger/texstate.o \ - $(MESABUILDDIR)debugger/texstore.o \ - $(MESABUILDDIR)debugger/varray.o \ - $(MESABUILDDIR)debugger/vtxfmt.o - -#ifdef NeedAllMesaSrc - DISPATCHPOBJS = $(MESABUILDDIR)profiled/dispatch.o - GLAPIPOBJS = $(MESABUILDDIR)profiled/glapi.o - GLTHREADPOBJS = $(MESABUILDDIR)profiled/glthread.o -#endif - -COREMESABASEPOBJS = \ - $(DISPATCHPOBJS) \ - $(GLAPIPOBJS) \ - $(GLTHREADPOBJS) \ - $(MESABUILDDIR)profiled/api_arrayelt.o \ - $(MESABUILDDIR)profiled/api_loopback.o \ - $(MESABUILDDIR)profiled/api_noop.o \ - $(MESABUILDDIR)profiled/api_validate.o \ - $(MESABUILDDIR)profiled/accum.o \ - $(MESABUILDDIR)profiled/attrib.o \ - $(MESABUILDDIR)profiled/blend.o \ - $(MESABUILDDIR)profiled/bufferobj.o \ - $(MESABUILDDIR)profiled/buffers.o \ - $(MESABUILDDIR)profiled/clip.o \ - $(MESABUILDDIR)profiled/colortab.o \ - $(MESABUILDDIR)profiled/context.o \ - $(MESABUILDDIR)profiled/convolve.o \ - $(MESABUILDDIR)profiled/debug.o \ - $(MESABUILDDIR)profiled/depth.o \ - $(MESABUILDDIR)profiled/dlist.o \ - $(MESABUILDDIR)profiled/drawpix.o \ - $(MESABUILDDIR)profiled/enable.o \ - $(MESABUILDDIR)profiled/enums.o \ - $(MESABUILDDIR)profiled/eval.o \ - $(MESABUILDDIR)profiled/execmem.o \ - $(MESABUILDDIR)profiled/extensions.o \ - $(MESABUILDDIR)profiled/fbobject.o \ - $(MESABUILDDIR)profiled/feedback.o \ - $(MESABUILDDIR)profiled/fog.o \ - $(MESABUILDDIR)profiled/framebuffer.o \ - $(MESABUILDDIR)profiled/get.o \ - $(MESABUILDDIR)profiled/getstring.o \ - $(MESABUILDDIR)profiled/hash.o \ - $(MESABUILDDIR)profiled/hint.o \ - $(MESABUILDDIR)profiled/histogram.o \ - $(MESABUILDDIR)profiled/image.o \ - $(MESABUILDDIR)profiled/imports.o \ - $(MESABUILDDIR)profiled/light.o \ - $(MESABUILDDIR)profiled/lines.o \ - $(MESABUILDDIR)profiled/matrix.o \ - $(MESABUILDDIR)profiled/mm.o \ - $(MESABUILDDIR)profiled/occlude.o \ - $(MESABUILDDIR)profiled/pixel.o \ - $(MESABUILDDIR)profiled/points.o \ - $(MESABUILDDIR)profiled/polygon.o \ - $(MESABUILDDIR)profiled/rastpos.o \ - $(MESABUILDDIR)profiled/renderbuffer.o \ - $(MESABUILDDIR)profiled/state.o \ - $(MESABUILDDIR)profiled/stencil.o \ - $(MESABUILDDIR)profiled/texcompress.o \ - $(MESABUILDDIR)profiled/texcompress_fxt1.o \ - $(MESABUILDDIR)profiled/texcompress_s3tc.o \ - $(MESABUILDDIR)profiled/texenvprogram.o \ - $(MESABUILDDIR)profiled/texformat.o \ - $(MESABUILDDIR)profiled/teximage.o \ - $(MESABUILDDIR)profiled/texobj.o \ - $(MESABUILDDIR)profiled/texrender.o \ - $(MESABUILDDIR)profiled/texstate.o \ - $(MESABUILDDIR)profiled/texstore.o \ - $(MESABUILDDIR)profiled/varray.o \ - $(MESABUILDDIR)profiled/vtxfmt.o diff --git a/nx-X11/lib/GL/mesa/math/Imakefile b/nx-X11/lib/GL/mesa/math/Imakefile deleted file mode 100644 index ab00ae76f..000000000 --- a/nx-X11/lib/GL/mesa/math/Imakefile +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - - -#define MesaMathBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(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> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/math/Imakefile.inc b/nx-X11/lib/GL/mesa/math/Imakefile.inc deleted file mode 100644 index cd1dcc427..000000000 --- a/nx-X11/lib/GL/mesa/math/Imakefile.inc +++ /dev/null @@ -1,82 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaMathBuildDir -#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/ -#endif - -MESAMATHBUILDDIR = MesaMathBuildDir - - MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ - $(MESAMATHBUILDDIR)m_debug_norm.c \ - $(MESAMATHBUILDDIR)m_debug_xform.c \ - $(MESAMATHBUILDDIR)m_eval.c \ - $(MESAMATHBUILDDIR)m_matrix.c \ - $(MESAMATHBUILDDIR)m_translate.c \ - $(MESAMATHBUILDDIR)m_vector.c \ - $(MESAMATHBUILDDIR)m_xform.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_matrix.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_norm_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_translate.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_trans_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_vector.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/mesa/math) -#endif - - MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \ - $(MESAMATHBUILDDIR)m_debug_norm.o \ - $(MESAMATHBUILDDIR)m_debug_xform.o \ - $(MESAMATHBUILDDIR)m_eval.o \ - $(MESAMATHBUILDDIR)m_matrix.o \ - $(MESAMATHBUILDDIR)m_translate.o \ - $(MESAMATHBUILDDIR)m_vector.o \ - $(MESAMATHBUILDDIR)m_xform.o - -#if defined(DoSharedLib) && 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_eval.o \ - $(MESAMATHBUILDDIR)unshared/m_matrix.o \ - $(MESAMATHBUILDDIR)unshared/m_translate.o \ - $(MESAMATHBUILDDIR)unshared/m_vector.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_eval.o \ - $(MESAMATHBUILDDIR)debugger/m_matrix.o \ - $(MESAMATHBUILDDIR)debugger/m_translate.o \ - $(MESAMATHBUILDDIR)debugger/m_vector.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_eval.o \ - $(MESAMATHBUILDDIR)profiled/m_matrix.o \ - $(MESAMATHBUILDDIR)profiled/m_translate.o \ - $(MESAMATHBUILDDIR)profiled/m_vector.o \ - $(MESAMATHBUILDDIR)profiled/m_xform.o - diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile b/nx-X11/lib/GL/mesa/shader/Imakefile deleted file mode 100644 index d46834740..000000000 --- a/nx-X11/lib/GL/mesa/shader/Imakefile +++ /dev/null @@ -1,107 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaShaderBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SHADER_SRCS) - OBJS = $(MESA_SHADER_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = grammar slang - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/Imakefile.inc deleted file mode 100644 index 7d0032e56..000000000 --- a/nx-X11/lib/GL/mesa/shader/Imakefile.inc +++ /dev/null @@ -1,106 +0,0 @@ -XCOMM $XFree86:$ - -#ifndef MesaShaderBuildDir -#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/ -#endif - -MESASHADERBUILDDIR = MesaShaderBuildDir - - MESA_SHADER_SRCS = $(MESASHADERBUILDDIR)arbprogparse.c \ - $(MESASHADERBUILDDIR)arbprogram.c \ - $(MESASHADERBUILDDIR)arbfragparse.c \ - $(MESASHADERBUILDDIR)arbvertparse.c \ - $(MESASHADERBUILDDIR)atifragshader.c \ - $(MESASHADERBUILDDIR)nvprogram.c \ - $(MESASHADERBUILDDIR)nvfragparse.c \ - $(MESASHADERBUILDDIR)nvvertexec.c \ - $(MESASHADERBUILDDIR)nvvertparse.c \ - $(MESASHADERBUILDDIR)program.c \ - $(MESASHADERBUILDDIR)shaderobjects.c \ - $(MESASHADERBUILDDIR)shaderobjects_3dlabs.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbprogram_syn.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(atifragshader.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(atifragshader.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects.h, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects_3dlabs.c, $(MESASRCDIR)/src/mesa/shader) -LinkSourceFile(shaderobjects_3dlabs.h, $(MESASRCDIR)/src/mesa/shader) -#endif - - MESA_SHADER_OBJS = $(MESASHADERBUILDDIR)arbprogparse.o \ - $(MESASHADERBUILDDIR)arbprogram.o \ - $(MESASHADERBUILDDIR)arbfragparse.o \ - $(MESASHADERBUILDDIR)arbvertparse.o \ - $(MESASHADERBUILDDIR)atifragshader.o \ - $(MESASHADERBUILDDIR)nvprogram.o \ - $(MESASHADERBUILDDIR)nvfragparse.o \ - $(MESASHADERBUILDDIR)nvvertexec.o \ - $(MESASHADERBUILDDIR)nvvertparse.o \ - $(MESASHADERBUILDDIR)program.o \ - $(MESASHADERBUILDDIR)shaderobjects.o \ - $(MESASHADERBUILDDIR)shaderobjects_3dlabs.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_SHADER_UOBJS = $(MESASHADERBUILDDIR)unshared/arbprogparse.o \ - $(MESASHADERBUILDDIR)unshared/arbprogram.o \ - $(MESASHADERBUILDDIR)unshared/arbfragparse.o \ - $(MESASHADERBUILDDIR)unshared/arbvertparse.o \ - $(MESASHADERBUILDDIR)unshared/atifragshader.o \ - $(MESASHADERBUILDDIR)unshared/nvprogram.o \ - $(MESASHADERBUILDDIR)unshared/nvfragparse.o \ - $(MESASHADERBUILDDIR)unshared/nvvertexec.o \ - $(MESASHADERBUILDDIR)unshared/nvvertparse.o \ - $(MESASHADERBUILDDIR)unshared/program.o \ - $(MESASHADERBUILDDIR)unshared/shaderobjects.o \ - $(MESASHADERBUILDDIR)unshared/shaderobjects_3dlabs.o -#else - MESA_SHADER_UOBJS = $(MESA_SHADER_OBJS) -#endif - - MESA_SHADER_DOBJS = $(MESASHADERBUILDDIR)debugger/arbprogparse.o \ - $(MESASHADERBUILDDIR)debugger/arbprogram.o \ - $(MESASHADERBUILDDIR)debugger/arbfragparse.o \ - $(MESASHADERBUILDDIR)debugger/arbvertparse.o \ - $(MESASHADERBUILDDIR)debugger/atifragshader.o \ - $(MESASHADERBUILDDIR)debugger/nvprogram.o \ - $(MESASHADERBUILDDIR)debugger/nvfragparse.o \ - $(MESASHADERBUILDDIR)debugger/nvvertexec.o \ - $(MESASHADERBUILDDIR)debugger/nvvertparse.o \ - $(MESASHADERBUILDDIR)debugger/program.o \ - $(MESASHADERBUILDDIR)debugger/shaderobjects.o \ - $(MESASHADERBUILDDIR)debugger/shaderobjects_3dlabs.o - - MESA_SHADER_POBJS = $(MESASHADERBUILDDIR)profiled/arbprogparse.o \ - $(MESASHADERBUILDDIR)profiled/arbprogram.o \ - $(MESASHADERBUILDDIR)profiled/arbfragparse.o \ - $(MESASHADERBUILDDIR)profiled/arbvertparse.o \ - $(MESASHADERBUILDDIR)profiled/atifragshader.o \ - $(MESASHADERBUILDDIR)profiled/nvprogram.o \ - $(MESASHADERBUILDDIR)profiled/nvfragparse.o \ - $(MESASHADERBUILDDIR)profiled/nvvertexec.o \ - $(MESASHADERBUILDDIR)profiled/nvvertparse.o \ - $(MESASHADERBUILDDIR)profiled/program.o \ - $(MESASHADERBUILDDIR)profiled/shaderobjects.o \ - $(MESASHADERBUILDDIR)profiled/shaderobjects_3dlabs.o diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile deleted file mode 100644 index bbdec9764..000000000 --- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaGrammarBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_GRAMMAR_SRCS) - OBJS = $(MESA_GRAMMAR_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc deleted file mode 100644 index b2e885f89..000000000 --- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc +++ /dev/null @@ -1,29 +0,0 @@ -XCOMM $XFree86$ - -#ifndef MesaGrammarBuildDir -#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/ -#endif - -MESAGRAMMARBUILDDIR=MesaGrammarBuildDir - - MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader/grammar) -LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader/grammar) -#endif - - MESA_GRAMMAR_OBJS = $(MESAGRAMMARBUILDDIR)grammar_mesa.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_GRAMMAR_UOBJS = $(MESAGRAMMARBUILDDIR)unshared/grammar_mesa.o -#else - MESA_GRAMMAR_UOBJS = $(MESA_GRAMMAR_OBJS) -#endif - - MESA_GRAMMAR_DOBJS = $(MESAGRAMMARBUILDDIR)debugger/grammar_mesa.o - - MESA_GRAMMAR_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/Imakefile deleted file mode 100644 index 096a8ea63..000000000 --- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile +++ /dev/null @@ -1,108 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaSlangBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa/shader/slang/library \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SLANG_SRCS) - OBJS = $(MESA_SLANG_OBJS) - - -#include <Library.tmpl> - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = library - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc deleted file mode 100644 index d824ca797..000000000 --- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc +++ /dev/null @@ -1,90 +0,0 @@ -XCOMM $XFree86$ - -#ifndef MesaSlangBuildDir -#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/ -#endif - -MESASLANGBUILDDIR=MesaSlangBuildDir - - MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ - $(MESASLANGBUILDDIR)slang_assemble.c \ - $(MESASLANGBUILDDIR)slang_assemble_conditional.c \ - $(MESASLANGBUILDDIR)slang_assemble_constructor.c \ - $(MESASLANGBUILDDIR)slang_assemble_typeinfo.c \ - $(MESASLANGBUILDDIR)slang_compile.c \ - $(MESASLANGBUILDDIR)slang_execute.c \ - $(MESASLANGBUILDDIR)slang_preprocess.c \ - $(MESASLANGBUILDDIR)slang_storage.c \ - $(MESASLANGBUILDDIR)slang_utility.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(slang_assemble_assignment.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_assignment.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_conditional.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_conditional.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_constructor.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_constructor.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_typeinfo.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_assemble_typeinfo.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_compile.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_compile.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_execute.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_execute.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_preprocess.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_preprocess.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_storage.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_storage.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_utility.c, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(slang_utility.h, $(MESASRCDIR)/src/mesa/shader/slang) -LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang) -#endif - - MESA_SLANG_OBJS = $(MESASLANGBUILDDIR)slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)slang_assemble.o \ - $(MESASLANGBUILDDIR)slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)slang_compile.o \ - $(MESASLANGBUILDDIR)slang_execute.o \ - $(MESASLANGBUILDDIR)slang_preprocess.o \ - $(MESASLANGBUILDDIR)slang_storage.o \ - $(MESASLANGBUILDDIR)slang_utility.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_SLANG_UOBJS = $(MESASLANGBUILDDIR)unshared/slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)unshared/slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)unshared/slang_compile.o \ - $(MESASLANGBUILDDIR)unshared/slang_execute.o \ - $(MESASLANGBUILDDIR)unshared/slang_preprocess.o \ - $(MESASLANGBUILDDIR)unshared/slang_storage.o \ - $(MESASLANGBUILDDIR)unshared/slang_utility.o -#else - MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS) -#endif - - MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debuggerslang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)debuggerslang_assemble.o \ - $(MESASLANGBUILDDIR)debuggerslang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)debuggerslang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)debuggerslang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)debuggerslang_compile.o \ - $(MESASLANGBUILDDIR)debuggerslang_execute.o \ - $(MESASLANGBUILDDIR)debuggerslang_preprocess.o \ - $(MESASLANGBUILDDIR)debuggerslang_storage.o \ - $(MESASLANGBUILDDIR)debuggerslang_utility.o - - MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble_conditional.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble_constructor.o \ - $(MESASLANGBUILDDIR)profiled/slang_assemble_typeinfo.o \ - $(MESASLANGBUILDDIR)profiled/slang_compile.o \ - $(MESASLANGBUILDDIR)profiled/slang_execute.o \ - $(MESASLANGBUILDDIR)profiled/slang_preprocess.o \ - $(MESASLANGBUILDDIR)profiled/slang_storage.o \ - $(MESASLANGBUILDDIR)profiled/slang_utility.o diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile deleted file mode 100644 index de32171ae..000000000 --- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile +++ /dev/null @@ -1,97 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaShaderBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa/shader/slang/library \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SLANG_SRCS) - OBJS = $(MESA_SLANG_OBJS) - - -#include <Library.tmpl> - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc deleted file mode 100644 index 3489b7a28..000000000 --- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc +++ /dev/null @@ -1,14 +0,0 @@ -XCOMM $XFree86:$ - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_core_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_core_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_fragment_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_fragment_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_shader_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_version_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_vertex_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -LinkSourceFile(slang_vertex_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) -#endif diff --git a/nx-X11/lib/GL/mesa/sparc/Imakefile b/nx-X11/lib/GL/mesa/sparc/Imakefile deleted file mode 100644 index 8cd9c9f8b..000000000 --- a/nx-X11/lib/GL/mesa/sparc/Imakefile +++ /dev/null @@ -1,68 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $ -XCOMM $XdotOrg: xc/lib/GL/mesa/sparc/Imakefile,v 1.3 2004/11/13 04:39:16 gisburn Exp $ - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaSPARCBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/SPARC \ - -I../../../include \ - -I$(MESASRCDIR)/include \ - -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/sparc \ - -I$(MESASRCDIR)/src/mesa/glapi - - SRCS = $(MESA_ASM_SRCS) - OBJS = $(MESA_ASM_OBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -ObjectFromAsmSource(xform, NullParameter) -ObjectFromAsmSource(clip, NullParameter) -ObjectFromAsmSource(norm, NullParameter) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/sparc/Imakefile.inc b/nx-X11/lib/GL/mesa/sparc/Imakefile.inc deleted file mode 100644 index 6bd006749..000000000 --- a/nx-X11/lib/GL/mesa/sparc/Imakefile.inc +++ /dev/null @@ -1,58 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaSPARCBuildDir -#define MesaSPARCBuildDir $(GLXLIBSRC)/mesa/sparc/ -#endif - -MESASPARCBUILDDIR = MesaSPARCBuildDir - -MESA_SPARC_SRCS = $(MESASPARCBUILDDIR)sparc.c \ - $(MESASPARCBUILDDIR)xform.S \ - $(MESASPARCBUILDDIR)clip.S - -#ifdef NeedToLinkMesaSrc -/* If $(MESASRCDIR)/src/mesa/sparc isn't in the INCLUDES, it should be. */ -LinkSourceFile(sparc.c, $(MESASRCDIR)/src/mesa/sparc) -LinkSourceFile(xform.S, $(MESASRCDIR)/src/mesa/sparc) -LinkSourceFile(clip.S, $(MESASRCDIR)/src/mesa/sparc) -LinkSourceFile(norm.S, $(MESASRCDIR)/src/mesa/sparc) -#endif - -MESA_SPARC_OBJS = $(MESASPARCBUILDDIR)sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SPARC_UOBJS = $(MESASPARCBUILDDIR)unshared/sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o -#else -MESA_SPARC_UOBJS = $(MESA_SPARC_OBJS) -#endif - -MESA_SPARC_DOBJS = $(MESASPARCBUILDDIR)debugger/sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o - -MESA_SPARC_POBJS = $(MESAX86BUILDDIR)profiled/sparc.o \ - $(MESAX86BUILDDIR)xform.o \ - $(MESAX86BUILDDIR)clip.o \ - $(MESAX86BUILDDIR)norm.o - -MESA_SPARC_DEFS = -DUSE_SPARC_ASM - -MESA_ASM_SRCS = $(MESA_SPARC_SRCS) - -MESA_ASM_OBJS = $(MESA_SPARC_OBJS) - -MESA_ASM_UOBJS = $(MESA_SPARC_UOBJS) - -MESA_ASM_DOBJS = $(MESA_SPARC_DOBJS) - -MESA_ASM_POBJS = $(MESA_SPARC_POBJS) - -MESA_ASM_DEFINES = $(MESA_SPARC_DEFS) - diff --git a/nx-X11/lib/GL/mesa/swrast/Imakefile b/nx-X11/lib/GL/mesa/swrast/Imakefile deleted file mode 100644 index 105615b82..000000000 --- a/nx-X11/lib/GL/mesa/swrast/Imakefile +++ /dev/null @@ -1,100 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaSwrastBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/$(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> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/swrast/Imakefile.inc b/nx-X11/lib/GL/mesa/swrast/Imakefile.inc deleted file mode 100644 index 683b8f0a7..000000000 --- a/nx-X11/lib/GL/mesa/swrast/Imakefile.inc +++ /dev/null @@ -1,218 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaSwrastBuildDir -#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/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_atifragshader.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_imaging.c \ - $(MESASWRASTBUILDDIR)s_lines.c \ - $(MESASWRASTBUILDDIR)s_logic.c \ - $(MESASWRASTBUILDDIR)s_masking.c \ - $(MESASWRASTBUILDDIR)s_nvfragprog.c \ - $(MESASWRASTBUILDDIR)s_pixeltex.c \ - $(MESASWRASTBUILDDIR)s_points.c \ - $(MESASWRASTBUILDDIR)s_readpix.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/mesa/swrast) -LinkSourceFile(s_aaline.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aalinetemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aatriangle.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aatriangle.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_aatritemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_accum.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_accum.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_alpha.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_alpha.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_atifragshader.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_atifragshader.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_bitmap.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_blend.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_blend.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_buffers.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_context.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_context.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_copypix.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_depth.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_depth.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_drawpix.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_feedback.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_fog.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_lines.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_linetemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_logic.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_masking.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_masking.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_nvfragprog.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_nvfragprog.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_pixeltex.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_pixeltex.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_points.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_points.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_pointtemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_readpix.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_span.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_span.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_spantemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_stencil.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_stencil.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_texstore.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_texture.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_texture.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_triangle.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_triangle.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_trispan.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_tritemp.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_zoom.c, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(s_zoom.h, $(MESASRCDIR)/src/mesa/swrast) -LinkSourceFile(swrast.h, $(MESASRCDIR)/src/mesa/swrast) -#endif - - MESA_SWRAST_OBJS = $(MESASWRASTBUILDDIR)s_aaline.o \ - $(MESASWRASTBUILDDIR)s_aatriangle.o \ - $(MESASWRASTBUILDDIR)s_accum.o \ - $(MESASWRASTBUILDDIR)s_alpha.o \ - $(MESASWRASTBUILDDIR)s_atifragshader.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_imaging.o \ - $(MESASWRASTBUILDDIR)s_lines.o \ - $(MESASWRASTBUILDDIR)s_logic.o \ - $(MESASWRASTBUILDDIR)s_masking.o \ - $(MESASWRASTBUILDDIR)s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)s_pixeltex.o \ - $(MESASWRASTBUILDDIR)s_points.o \ - $(MESASWRASTBUILDDIR)s_readpix.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 defined(DoSharedLib) && 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_atifragshader.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_imaging.o \ - $(MESASWRASTBUILDDIR)unshared/s_lines.o \ - $(MESASWRASTBUILDDIR)unshared/s_logic.o \ - $(MESASWRASTBUILDDIR)unshared/s_masking.o \ - $(MESASWRASTBUILDDIR)unshared/s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)unshared/s_pixeltex.o \ - $(MESASWRASTBUILDDIR)unshared/s_points.o \ - $(MESASWRASTBUILDDIR)unshared/s_readpix.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_atifragshader.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_imaging.o \ - $(MESASWRASTBUILDDIR)debugger/s_lines.o \ - $(MESASWRASTBUILDDIR)debugger/s_logic.o \ - $(MESASWRASTBUILDDIR)debugger/s_masking.o \ - $(MESASWRASTBUILDDIR)debugger/s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)debugger/s_pixeltex.o \ - $(MESASWRASTBUILDDIR)debugger/s_points.o \ - $(MESASWRASTBUILDDIR)debugger/s_readpix.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_atifragshader.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_imaging.o \ - $(MESASWRASTBUILDDIR)profiled/s_lines.o \ - $(MESASWRASTBUILDDIR)profiled/s_logic.o \ - $(MESASWRASTBUILDDIR)profiled/s_masking.o \ - $(MESASWRASTBUILDDIR)profiled/s_nvfragprog.o \ - $(MESASWRASTBUILDDIR)profiled/s_pixeltex.o \ - $(MESASWRASTBUILDDIR)profiled/s_points.o \ - $(MESASWRASTBUILDDIR)profiled/s_readpix.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/nx-X11/lib/GL/mesa/swrast_setup/Imakefile b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile deleted file mode 100644 index 58766149d..000000000 --- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile +++ /dev/null @@ -1,99 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - - -#define MesaSwrastSetupBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast_setup \ - -I$(MESASRCDIR)/src/mesa/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> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc deleted file mode 100644 index 8d32aedb3..000000000 --- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc +++ /dev/null @@ -1,36 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaSwrastSetupBuildDir -#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/ -#endif - -MESASWRSETUPDIR = MesaSwrastSetupBuildDir - - MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ - $(MESASWRSETUPDIR)ss_triangle.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_context.h, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_triangle.h, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(ss_tritmp.h, $(MESASRCDIR)/src/mesa/swrast_setup) -LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup) -#endif - - MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \ - $(MESASWRSETUPDIR)ss_triangle.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \ - $(MESASWRSETUPDIR)unshared/ss_triangle.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 - -MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \ - $(MESASWRSETUPDIR)profiled/ss_triangle.o - diff --git a/nx-X11/lib/GL/mesa/tnl/Imakefile b/nx-X11/lib/GL/mesa/tnl/Imakefile deleted file mode 100644 index 99ec7525c..000000000 --- a/nx-X11/lib/GL/mesa/tnl/Imakefile +++ /dev/null @@ -1,101 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaTnlBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast_setup \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/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> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/tnl/Imakefile.inc b/nx-X11/lib/GL/mesa/tnl/Imakefile.inc deleted file mode 100644 index a294a6fbf..000000000 --- a/nx-X11/lib/GL/mesa/tnl/Imakefile.inc +++ /dev/null @@ -1,225 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaTnlBuildDir -#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/ -#endif - -MESATNLBUILDDIR = MesaTnlBuildDir - - MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ - $(MESATNLBUILDDIR)t_array_import.c \ - $(MESATNLBUILDDIR)t_context.c \ - $(MESATNLBUILDDIR)t_pipeline.c \ - $(MESATNLBUILDDIR)t_save_api.c \ - $(MESATNLBUILDDIR)t_save_loopback.c \ - $(MESATNLBUILDDIR)t_save_playback.c \ - $(MESATNLBUILDDIR)t_vb_arbprogram.c \ - $(MESATNLBUILDDIR)t_vb_arbprogram_sse.c \ - $(MESATNLBUILDDIR)t_vb_fog.c \ - $(MESATNLBUILDDIR)t_vb_cull.c \ - $(MESATNLBUILDDIR)t_vb_light.c \ - $(MESATNLBUILDDIR)t_vb_normals.c \ - $(MESATNLBUILDDIR)t_vb_points.c \ - $(MESATNLBUILDDIR)t_vb_program.c \ - $(MESATNLBUILDDIR)t_vb_render.c \ - $(MESATNLBUILDDIR)t_vb_texgen.c \ - $(MESATNLBUILDDIR)t_vb_texmat.c \ - $(MESATNLBUILDDIR)t_vb_vertex.c \ - $(MESATNLBUILDDIR)t_vertex.c \ - $(MESATNLBUILDDIR)t_vertex_generic.c \ - $(MESATNLBUILDDIR)t_vertex_sse.c \ - $(MESATNLBUILDDIR)t_vp_build.c \ - $(MESATNLBUILDDIR)t_vtx_api.c \ - $(MESATNLBUILDDIR)t_vtx_eval.c \ - $(MESATNLBUILDDIR)t_vtx_exec.c \ - $(MESATNLBUILDDIR)t_vtx_generic.c - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_SRCS += MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \ - $(MESATNLBUILDDIR)t_vtx_x86_gcc.S -#endif - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_array_api.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_array_import.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_context.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_context.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(tnl.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_pipeline.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_api.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_api.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_loopback.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_save_playback.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_arbprogram.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_arbprogram.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_arbprogram_sse.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_cliptmp.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_cull.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_lighttmp.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_program.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex_generic.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vertex_sse.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vp_build.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vp_build.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_api.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_api.h, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_eval.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_generic.c, $(MESASRCDIR)/src/mesa/tnl) -#if defined(i386Architecture) && MesaUseX86Asm -LinkSourceFile(t_vtx_x86.c, $(MESASRCDIR)/src/mesa/tnl) -LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl) -#endif -#endif - - MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \ - $(MESATNLBUILDDIR)t_array_import.o \ - $(MESATNLBUILDDIR)t_context.o \ - $(MESATNLBUILDDIR)t_pipeline.o \ - $(MESATNLBUILDDIR)t_save_api.o \ - $(MESATNLBUILDDIR)t_save_loopback.o \ - $(MESATNLBUILDDIR)t_save_playback.o \ - $(MESATNLBUILDDIR)t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)t_vb_fog.o \ - $(MESATNLBUILDDIR)t_vb_cull.o \ - $(MESATNLBUILDDIR)t_vb_light.o \ - $(MESATNLBUILDDIR)t_vb_normals.o \ - $(MESATNLBUILDDIR)t_vb_points.o \ - $(MESATNLBUILDDIR)t_vb_program.o \ - $(MESATNLBUILDDIR)t_vb_render.o \ - $(MESATNLBUILDDIR)t_vb_texgen.o \ - $(MESATNLBUILDDIR)t_vb_texmat.o \ - $(MESATNLBUILDDIR)t_vb_vertex.o \ - $(MESATNLBUILDDIR)t_vertex.o \ - $(MESATNLBUILDDIR)t_vertex_generic.o \ - $(MESATNLBUILDDIR)t_vertex_sse.o \ - $(MESATNLBUILDDIR)t_vp_build.o \ - $(MESATNLBUILDDIR)t_vtx_api.o \ - $(MESATNLBUILDDIR)t_vtx_eval.o \ - $(MESATNLBUILDDIR)t_vtx_exec.o \ - $(MESATNLBUILDDIR)t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_OBJS += $(MESATNLBUILDDIR)t_vtx_x86.o \ - $(MESATNLBUILDDIR)t_vtx_x86_gcc.o -#endif - -#if defined(DoSharedLib) && DoSharedLib - MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \ - $(MESATNLBUILDDIR)unshared/t_array_import.o \ - $(MESATNLBUILDDIR)unshared/t_context.o \ - $(MESATNLBUILDDIR)unshared/t_pipeline.o \ - $(MESATNLBUILDDIR)unshared/t_save_api.o \ - $(MESATNLBUILDDIR)unshared/t_save_loopback.o \ - $(MESATNLBUILDDIR)unshared/t_save_playback.o \ - $(MESATNLBUILDDIR)unshared/t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)unshared/t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)unshared/t_vb_fog.o \ - $(MESATNLBUILDDIR)unshared/t_vb_cull.o \ - $(MESATNLBUILDDIR)unshared/t_vb_light.o \ - $(MESATNLBUILDDIR)unshared/t_vb_normals.o \ - $(MESATNLBUILDDIR)unshared/t_vb_points.o \ - $(MESATNLBUILDDIR)unshared/t_vb_program.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 \ - $(MESATNLBUILDDIR)unshared/t_vertex.o \ - $(MESATNLBUILDDIR)unshared/t_vertex_generic.o \ - $(MESATNLBUILDDIR)unshared/t_vertex_sse.o \ - $(MESATNLBUILDDIR)unshared/t_vp_build.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_api.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_eval.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_exec.o \ - $(MESATNLBUILDDIR)unshared/t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_UOBJS += $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \ - $(MESATNLBUILDDIR)t_vtx_x86_gcc.o -#endif - -#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_pipeline.o \ - $(MESATNLBUILDDIR)debugger/t_save_api.o \ - $(MESATNLBUILDDIR)debugger/t_save_loopback.o \ - $(MESATNLBUILDDIR)debugger/t_save_playback.o \ - $(MESATNLBUILDDIR)debugger/t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)debugger/t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)debugger/t_vb_fog.o \ - $(MESATNLBUILDDIR)debugger/t_vb_cull.o \ - $(MESATNLBUILDDIR)debugger/t_vb_light.o \ - $(MESATNLBUILDDIR)debugger/t_vb_normals.o \ - $(MESATNLBUILDDIR)debugger/t_vb_points.o \ - $(MESATNLBUILDDIR)debugger/t_vb_program.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 \ - $(MESATNLBUILDDIR)debugger/t_vertex.o \ - $(MESATNLBUILDDIR)debugger/t_vertex_generic.o \ - $(MESATNLBUILDDIR)debugger/t_vertex_sse.o \ - $(MESATNLBUILDDIR)debugger/t_vp_build.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_api.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_eval.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_exec.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_DOBJS += $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \ - $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o -#endif - - MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \ - $(MESATNLBUILDDIR)profiled/t_array_import.o \ - $(MESATNLBUILDDIR)profiled/t_context.o \ - $(MESATNLBUILDDIR)profiled/t_pipeline.o \ - $(MESATNLBUILDDIR)profiled/t_save_api.o \ - $(MESATNLBUILDDIR)profiled/t_save_loopback.o \ - $(MESATNLBUILDDIR)profiled/t_save_playback.o \ - $(MESATNLBUILDDIR)profiled/t_vb_arbprogram.o \ - $(MESATNLBUILDDIR)profiled/t_vb_arbprogram_sse.o \ - $(MESATNLBUILDDIR)profiled/t_vb_fog.o \ - $(MESATNLBUILDDIR)profiled/t_vb_cull.o \ - $(MESATNLBUILDDIR)profiled/t_vb_light.o \ - $(MESATNLBUILDDIR)profiled/t_vb_normals.o \ - $(MESATNLBUILDDIR)profiled/t_vb_points.o \ - $(MESATNLBUILDDIR)profiled/t_vb_program.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 \ - $(MESATNLBUILDDIR)profiled/t_vertex.o \ - $(MESATNLBUILDDIR)profiled/t_vertex_generic.o \ - $(MESATNLBUILDDIR)profiled/t_vertex_sse.o \ - $(MESATNLBUILDDIR)profiled/t_vp_build.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_api.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_eval.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_exec.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_generic.o - -#if defined(i386Architecture) && MesaUseX86Asm - MESA_TNL_POBJS += $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \ - $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o -#endif - diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile deleted file mode 100644 index 93b8c8877..000000000 --- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile +++ /dev/null @@ -1,63 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile,v 1.6 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * 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 GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaTnlDdBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/tnl_dd \ - -I$(MESASRCDIR)/include \ - -I../../../include - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - -#include <Library.tmpl> - -LibraryObjectRule() - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc deleted file mode 100644 index 8d5d3da2d..000000000 --- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc +++ /dev/null @@ -1,40 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaTnlDdBuildDir -#define MesaTnlDdBuildDir $(GLXLIBSRC)/mesa/tnl_dd/ -#endif - -MESATNLDDBUILDDIR = MesaTnlDdBuildDir - - MESA_TNL_DD_SRCS = $(MESATNLDDBUILDDIR)t_dd.c \ - $(MESATNLDDBUILDDIR)t_dd_vb.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(t_dd.c, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_vb.c, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_dmatmp2.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_dmatmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_triemit.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_tritmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_unfilled.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_vbtmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_vertex.h, $(MESASRCDIR)/src/mesa/tnl_dd) -#endif - - MESA_TNL_DD_OBJS = $(MESATNLDDBUILDDIR)t_dd.o \ - $(MESATNLDDBUILDDIR)t_dd_vb.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_TNL_DD_UOBJS = $(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_dd.o \ - $(MESATNLDDBUILDDIR)debugger/t_dd_vb.o - -MESA_TNL_DD_POBJS = $(MESATNLDDBUILDDIR)profiled/t_dd.o \ - $(MESATNLDDBUILDDIR)profiled/t_dd_vb.o - diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile b/nx-X11/lib/GL/mesa/x86/Imakefile deleted file mode 100644 index 543c05143..000000000 --- a/nx-X11/lib/GL/mesa/x86/Imakefile +++ /dev/null @@ -1,108 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.23 2002/07/14 17:08:16 alanh Exp $ - -/* - * 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 GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaX86BuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER $(MESA_ASM_DEFINES) - INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/include \ - -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/x86 \ - -I$(MESASRCDIR)/src/mesa/glapi - - SRCS = $(MESA_ASM_SRCS) gen_matypes.c - OBJS = $(MESA_ASM_OBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -ObjectFromAsmSource(common_x86_asm, NullParameter) -ObjectFromAsmSource(read_rgba_span_x86, NullParameter) -ObjectFromAsmSource(x86_cliptest, NullParameter) -ObjectFromAsmSource(x86_xform2, NullParameter) -ObjectFromAsmSource(x86_xform3, NullParameter) -ObjectFromAsmSource(x86_xform4, NullParameter) - -#if MesaUseMMX -ObjectFromAsmSource(mmx_blend, NullParameter) -#endif - -#if MesaUse3DNow -ObjectFromAsmSource(3dnow_normal, NullParameter) -ObjectFromAsmSource(3dnow_xform1, NullParameter) -ObjectFromAsmSource(3dnow_xform2, NullParameter) -ObjectFromAsmSource(3dnow_xform3, NullParameter) -ObjectFromAsmSource(3dnow_xform4, NullParameter) -#endif - -#if MesaUseSSE -ObjectFromAsmSource(sse_normal, NullParameter) -ObjectFromAsmSource(sse_xform1, NullParameter) -ObjectFromAsmSource(sse_xform2, NullParameter) -ObjectFromAsmSource(sse_xform3, NullParameter) -ObjectFromAsmSource(sse_xform4, NullParameter) -#endif - -LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/mesa/x86) - -#if CrossCompiling -HOST_CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) \ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) -#else -HOST_CFLAGS=$(CFLAGS) -#endif - -MATYPES = ./gen_matypes - -matypes.h: gen_matypes.c - RemoveFiles($@ HostProgramTargetName(gen_matypes)) - -HostLinkRule(HostProgramTargetName(gen_matypes),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),gen_matypes.c,$(LDLIBS)) - RunProgram(MATYPES,> matypes_h) - $(MV) matypes_h $@ - RemoveFiles(HostProgramTargetName(gen_matypes)) - -includes:: matypes.h - -depend:: matypes.h - -clean:: - RemoveFiles(matypes.h HostProgramTargetName(gen_matypes)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile.inc b/nx-X11/lib/GL/mesa/x86/Imakefile.inc deleted file mode 100644 index b21c6f659..000000000 --- a/nx-X11/lib/GL/mesa/x86/Imakefile.inc +++ /dev/null @@ -1,217 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.5 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaX86BuildDir -#define MesaX86BuildDir $(GLXLIBSRC)/mesa/x86/ -#endif - -MESAX86BUILDDIR = MesaX86BuildDir - -MESA_X86_SRCS = $(MESAX86BUILDDIR)common_x86.c \ - $(MESAX86BUILDDIR)common_x86_asm.S \ - $(MESAX86BUILDDIR)glapi_x86.S \ - $(MESAX86BUILDDIR)read_rgba_span_x86.S \ - $(MESAX86BUILDDIR)x86.c \ - $(MESAX86BUILDDIR)x86_cliptest.S \ - $(MESAX86BUILDDIR)x86_xform2.S \ - $(MESAX86BUILDDIR)x86_xform3.S \ - $(MESAX86BUILDDIR)x86_xform4.S \ - $(MESAX86BUILDDIR)x86sse.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(common_x86.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(common_x86_asm.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(read_rgba_span_x86.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(read_rgba_span_x86.h, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_cliptest.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_xform2.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_xform3.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_xform4.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86sse.c, $(MESASRCDIR)/src/mesa/x86/rtasm) -LinkSourceFile(x86sse.h, $(MESASRCDIR)/src/mesa/x86/rtasm) -#endif - -MESA_X86_OBJS = $(MESAX86BUILDDIR)common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_X86_UOBJS = $(MESAX86BUILDDIR)unshared/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)unshared/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o -#else -MESA_X86_UOBJS = $(MESA_X86_OBJS) -#endif - -MESA_X86_DOBJS = $(MESAX86BUILDDIR)debugger/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)debugger/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o - -MESA_X86_POBJS = $(MESAX86BUILDDIR)profiled/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)profiled/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o - -MESA_X86_DEFS = -DUSE_X86_ASM - - -#if MesaUseMMX -MESA_MMX_SRCS = $(MESAX86BUILDDIR)mmx_blend.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(mmx_blend.S, $(MESASRCDIR)/src/mesa/x86) -#endif - -MESA_MMX_OBJS = $(MESAX86BUILDDIR)mmx_blend.o - -MESA_MMX_UOBJS = $(MESA_MMX_OBJS) -MESA_MMX_DOBJS = $(MESA_MMX_OBJS) -MESA_MMX_POBJS = $(MESA_MMX_OBJS) - -MESA_MMX_DEFS = -DUSE_MMX_ASM -#endif - -#if MesaUse3DNow -MESA_3DNOW_SRCS = $(MESAX86BUILDDIR)3dnow.c \ - $(MESAX86BUILDDIR)3dnow_normal.S \ - $(MESAX86BUILDDIR)3dnow_xform1.S \ - $(MESAX86BUILDDIR)3dnow_xform2.S \ - $(MESAX86BUILDDIR)3dnow_xform3.S \ - $(MESAX86BUILDDIR)3dnow_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(3dnow.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_normal.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform1.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform2.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform3.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform4.S, $(MESASRCDIR)/src/mesa/x86) -#endif -MESA_3DNOW_OBJS = $(MESAX86BUILDDIR)3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_3DNOW_UOBJS = $(MESAX86BUILDDIR)unshared/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o -#else -MESA_3DNOW_UOBJS = $(MESA_3DNOW_OBJS) -#endif - -MESA_3DNOW_DOBJS = $(MESAX86BUILDDIR)debugger/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -MESA_3DNOW_POBJS = $(MESAX86BUILDDIR)profiled/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -MESA_3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif - -#if MesaUseSSE -MESA_SSE_SRCS = $(MESAX86BUILDDIR)sse.c \ - $(MESAX86BUILDDIR)sse_normal.S \ - $(MESAX86BUILDDIR)sse_xform1.S \ - $(MESAX86BUILDDIR)sse_xform2.S \ - $(MESAX86BUILDDIR)sse_xform3.S \ - $(MESAX86BUILDDIR)sse_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(sse.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_normal.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform1.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform2.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform3.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform4.S, $(MESASRCDIR)/src/mesa/x86) -#endif - -MESA_SSE_OBJS = $(MESAX86BUILDDIR)sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SSE_UOBJS = $(MESAX86BUILDDIR)unshared/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o -#else -MESA_SSE_UOBJS = $(MESA_SSE_OBJS) -#endif - -MESA_SSE_DOBJS = $(MESAX86BUILDDIR)debugger/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -MESA_SSE_POBJS = $(MESAX86BUILDDIR)profiled/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -MESA_SSE_DEFS = -DUSE_SSE_ASM -#endif - -MESA_ASM_SRCS = $(MESA_X86_SRCS) $(MESA_MMX_SRCS) $(MESA_3DNOW_SRCS) \ - $(MESA_SSE_SRCS) - -MESA_ASM_OBJS = $(MESA_X86_OBJS) $(MESA_MMX_OBJS) $(MESA_3DNOW_OBJS) \ - $(MESA_SSE_OBJS) - -MESA_ASM_UOBJS = $(MESA_X86_UOBJS) $(MESA_MMX_UOBJS) $(MESA_3DNOW_UOBJS) \ - $(MESA_SSE_UOBJS) - -MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \ - $(MESA_SSE_DOBJS) - -MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \ - $(MESA_SSE_POBJS) - -MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS) - |