diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:46:25 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:46:25 +0200 |
| commit | 844a4094f098684dd1da5bc11e73479fb61373a3 (patch) | |
| tree | 5441f02930e1658777a262f3d3647d64f99cde22 /nx-X11/programs/Xserver/GL/mesa/main | |
| parent | f4092abdf94af6a99aff944d6264bc1284e8bdd4 (diff) | |
| download | nx-libs-844a4094f098684dd1da5bc11e73479fb61373a3.tar.gz nx-libs-844a4094f098684dd1da5bc11e73479fb61373a3.tar.bz2 nx-libs-844a4094f098684dd1da5bc11e73479fb61373a3.zip | |
Imported nx-X11-3.1.0-3.tar.gznx-X11/3.1.0-3
Summary: Imported nx-X11-3.1.0-3.tar.gz
Keywords:
Imported nx-X11-3.1.0-3.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/GL/mesa/main')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/main/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/main/Imakefile.NX.original | 61 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/main/Imakefile.X.original | 61 |
3 files changed, 123 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile index 463812236..6287b92de 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile @@ -39,7 +39,7 @@ SUBDIRS = module -I$(LIBSRC)/GL/include \ -I$(XF86SRC) -I$(INCLUDESRC) - DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ + DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ #ifdef IHaveModules ModuleObjectRule() diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.NX.original b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.NX.original new file mode 100644 index 000000000..6287b92de --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.NX.original @@ -0,0 +1,61 @@ +XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/08/19 07:34:43 kem Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ + +#if DoLoadableServer +#if !BuildModuleInSubdir +#define IHaveModules +#elif !defined(IHaveModules) +#define IHaveSubdirs +SUBDIRS = module +#endif +#endif + +/* Large PIC tables needed for Solaris/SPARC builds */ +#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags +#endif + +#include <Server.tmpl> + +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaBuildDir /**/ +#if !defined(IHaveModules) || !BuildModuleInSubdir +#include "../../../../../lib/GL/mesa/main/Imakefile.inc" +#else +#include "../../../../../../lib/GL/mesa/main/Imakefile.inc" +#endif + + SRCS = $(COREMESABASESRCS) + OBJS = $(COREMESABASEOBJS) + + INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/shader \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ + -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include \ + -I$(XF86SRC) -I$(INCLUDESRC) + + DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ + +#ifdef IHaveModules +ModuleObjectRule() +#else +NormalLibraryObjectRule() +#endif + +SubdirLibraryRule($(OBJS)) + +LintLibraryTarget(dri,$(SRCS)) +NormalLintTarget($(SRCS)) + +DependTarget() + +#ifdef IHaveSubdirs +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) +#endif + diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.X.original b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.X.original new file mode 100644 index 000000000..463812236 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.X.original @@ -0,0 +1,61 @@ +XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/08/19 07:34:43 kem Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ + +#if DoLoadableServer +#if !BuildModuleInSubdir +#define IHaveModules +#elif !defined(IHaveModules) +#define IHaveSubdirs +SUBDIRS = module +#endif +#endif + +/* Large PIC tables needed for Solaris/SPARC builds */ +#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags +#endif + +#include <Server.tmpl> + +#define NeedAllMesaSrc +#define NeedToLinkMesaSrc +#define MesaBuildDir /**/ +#if !defined(IHaveModules) || !BuildModuleInSubdir +#include "../../../../../lib/GL/mesa/main/Imakefile.inc" +#else +#include "../../../../../../lib/GL/mesa/main/Imakefile.inc" +#endif + + SRCS = $(COREMESABASESRCS) + OBJS = $(COREMESABASEOBJS) + + INCLUDES = -I$(MESASRCDIR)/src/mesa \ + -I$(MESASRCDIR)/src/mesa/main \ + -I$(MESASRCDIR)/src/mesa/shader \ + -I$(MESASRCDIR)/src/mesa/glapi \ + -I$(MESASRCDIR)/include \ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ + -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include \ + -I$(XF86SRC) -I$(INCLUDESRC) + + DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ + +#ifdef IHaveModules +ModuleObjectRule() +#else +NormalLibraryObjectRule() +#endif + +SubdirLibraryRule($(OBJS)) + +LintLibraryTarget(dri,$(SRCS)) +NormalLintTarget($(SRCS)) + +DependTarget() + +#ifdef IHaveSubdirs +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) +#endif + |