From f4092abdf94af6a99aff944d6264bc1284e8bdd4 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 10 Oct 2011 17:43:39 +0200 Subject: Imported nx-X11-3.1.0-1.tar.gz Summary: Imported nx-X11-3.1.0-1.tar.gz Keywords: Imported nx-X11-3.1.0-1.tar.gz into Git repository --- nx-X11/lib/GL/mesa/drivers/x11/Imakefile | 70 ++++++++++++++++++ nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc | 104 +++++++++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 nx-X11/lib/GL/mesa/drivers/x11/Imakefile create mode 100644 nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc (limited to 'nx-X11/lib/GL/mesa/drivers/x11') diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile new file mode 100644 index 000000000..ab9a91970 --- /dev/null +++ b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile @@ -0,0 +1,70 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $ + +#include + +/* + * 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 + +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 new file mode 100644 index 000000000..d62800e7d --- /dev/null +++ b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc @@ -0,0 +1,104 @@ +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 + -- cgit v1.2.3