diff options
Diffstat (limited to 'nx-X11/programs/Xserver')
43 files changed, 1478 insertions, 473 deletions
diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile index 47134e0a1..c681d23e0 100644 --- a/nx-X11/programs/Xserver/GL/Imakefile +++ b/nx-X11/programs/Xserver/GL/Imakefile @@ -5,24 +5,9 @@ XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich #define IHaveSubdirs -#if GlxUseSGISI - CORE_SUBDIR = /* opengl */ -#elif defined(DarwinArchitecture) && DarwinQuartzSupport - CORE_SUBDIR = apple mesa -#elif defined(cygwinArchitecture) && GlxUseWindows - CORE_SUBDIR = windows mesa -#elif defined(Win32Architecture) && GlxUseWindows - CORE_SUBDIR = windows -#else CORE_SUBDIR = mesa -#endif - -#if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \ - || (defined(XorgServer) && XorgServer)) -DRI_SUBDIR = dri -#endif -SUBDIRS = glx $(DRI_SUBDIR) $(CORE_SUBDIR) +SUBDIRS = glx $(CORE_SUBDIR) #if DoLoadableServer MSRCS = glxmodule.c @@ -39,7 +24,7 @@ OBJS = glx/?*.o $(MOBJS) DONES = glx/DONE -INCLUDES = -Iinclude -Idri -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ +INCLUDES = -Iinclude -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC) DEPEND_DEFINES = $(EXT_DEFINES) DependDefines DEFINES = $(GLX_DEFINES) diff --git a/nx-X11/programs/Xserver/GL/glx/module/Imakefile b/nx-X11/programs/Xserver/GL/glx/module/Imakefile deleted file mode 100644 index d063bc28d..000000000 --- a/nx-X11/programs/Xserver/GL/glx/module/Imakefile +++ /dev/null @@ -1,4 +0,0 @@ -#define IHaveModules -#define LinkDirectory .. - -#include "../Imakefile" diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 154a5c1a0..e3e91cdb5 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18:12:36 dawes Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -24,17 +19,17 @@ SUBDIRS = module #define MesaSlangBuildDir ../shader/slang/ #define MesaXBuildDir ../X/ -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../lib/GL/mesa/main/Imakefile.inc" -#include "../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../lib/GL/mesa/Imakefile.inc" +#include "../array_cache/Imakefile.inc" +#include "../swrast/Imakefile.inc" +#include "../swrast_setup/Imakefile.inc" +#include "../tnl/Imakefile.inc" +#include "../main/Imakefile.inc" +#include "../math/Imakefile.inc" +#include "../shader/Imakefile.inc" +#include "../shader/grammar/Imakefile.inc" +#include "../shader/slang/Imakefile.inc" +#include "../X/Imakefile.inc" +#include "../Imakefile.inc" #ifdef IHaveModules MSRCS = GLcoremodule.c @@ -51,7 +46,7 @@ SUBDIRS = module ../shader/slang/DONE INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/include \ -I$(MESASRCDIR)/src/mesa \ -I$(SERVERSRC)/include @@ -74,4 +69,3 @@ InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile deleted file mode 100644 index 18dcdf0a1..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile +++ /dev/null @@ -1,53 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.2 2002/02/25 18:00:38 dawes Exp $ - -#define IHaveModules -#include <Server.tmpl> - -#define NeedAllMesaSrc -#define MesaInXServer -#define MesaBuildDir ../../main/module/ -#define MesaACBuildDir ../../array_cache/module/ -#define MesaMathBuildDir ../../math/module/ -#define MesaSwrastBuildDir ../../swrast/module/ -#define MesaSwrastSetupBuildDir ../../swrast_setup/module/ -#define MesaTnlBuildDir ../../tnl/module/ -#define MesaXBuildDir ../../X/module/ - -#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/Imakefile.inc" - -#if DoLoadableServer - MSRCS = GLcoremodule.c - MOBJS = GLcoremodule.o -#endif - - XOBJS = ../../X/module/?*.o - - OBJS = $(COREMESAOBJS) $(MOBJS) - - DONES = ../../module/DONE ../../X/module/DONE \ - ../../array_cache/module/DONE ../../math/module/DONE \ - ../../swrast/module/DONE \ - ../../swrast_setup/module/DONE ../../tnl/module/DONE - - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include - - DEFINES = $(GLX_DEFINES) - -ModuleObjectRule() - -DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS)) -InstallLibraryModule(GLcore,$(MODULEDIR),extensions) - -InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) - -LinkSourceFile(GLcoremodule.c,..) - diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile index ea7d18aa2..41acce9f4 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile @@ -1,17 +1,11 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:56:00 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) - MODSUBDIR = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR) -#endif #include <Server.tmpl> @@ -19,11 +13,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:5 #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../lib/GL/mesa/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/Imakefile.inc" -#endif +#include "Imakefile.inc" INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ @@ -44,4 +34,3 @@ DependSubdirs($(SUBDIRS)) #endif DependTarget() - diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc new file mode 100644 index 000000000..99e9c71c2 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc @@ -0,0 +1,53 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ + +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/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile index f0e722f00..ee728b556 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -15,11 +10,7 @@ SUBDIRS = module #define NeedToLinkMesaSrc #define MesaXBuildDir /**/ #define MesaInXServer -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#endif +#include "Imakefile.inc" LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) @@ -30,13 +21,6 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) COMMON_SRCS = driverfuncs.c COMMON_OBJS = driverfuncs.o -#ifndef XFree86Version - -/* This appears to be the quickest way to build a non-XFree86 server */ -GLXSRV_DEFINES = -DXFree86Server - -#endif - GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o @@ -67,7 +51,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc new file mode 100644 index 000000000..8e589c69a --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc @@ -0,0 +1,100 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ + +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/programs/Xserver/GL/mesa/X/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile deleted file mode 100644 index eee4c7556..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/module/Imakefile,v 1.1 2002/05/31 18:12:38 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile index 8126c3f30..188972b3b 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/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 #include <Server.tmpl> @@ -14,11 +9,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaACBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_AC_SRCS) OBJS = $(MESA_AC_OBJS) @@ -44,7 +35,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc new file mode 100644 index 000000000..3964bdc48 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc @@ -0,0 +1,30 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ + +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/programs/Xserver/GL/mesa/array_cache/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile deleted file mode 100644 index 86c585012..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/module/Imakefile,v 1.1 2002/05/31 18:12:39 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile index 6287b92de..2dd59ea8f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile @@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/08/19 07:3 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 */ @@ -20,11 +15,7 @@ SUBDIRS = module #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 +#include "Imakefile.inc" SRCS = $(COREMESABASESRCS) OBJS = $(COREMESABASEOBJS) @@ -49,7 +40,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc new file mode 100644 index 000000000..8927152aa --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc @@ -0,0 +1,483 @@ +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 + +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/programs/Xserver/GL/mesa/main/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile deleted file mode 100644 index e21afd5e5..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile index 49720974c..df30ab909 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile @@ -1,12 +1,7 @@ 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 #include <Server.tmpl> @@ -14,11 +9,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaMathBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/math/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/math/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_MATH_SRCS) OBJS = $(MESA_MATH_OBJS) @@ -43,7 +34,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc new file mode 100644 index 000000000..7356a4617 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc @@ -0,0 +1,78 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ + +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/programs/Xserver/GL/mesa/math/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile deleted file mode 100644 index e21afd5e5..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile index 7b14ab7b9..b52d193d3 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile @@ -1,27 +1,16 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = grammar slang -#endif #include <Server.tmpl> #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaShaderBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/shader/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/shader/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SHADER_SRCS) OBJS = $(MESA_SHADER_OBJS) @@ -48,7 +37,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc new file mode 100644 index 000000000..383bdc008 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc @@ -0,0 +1,102 @@ +XCOMM $XFree86:$ + +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/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile index c16b3ddad..56cfb4bc9 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile @@ -1,10 +1,5 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -12,11 +7,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaGrammarBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#else -#include "../../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_GRAMMAR_SRCS) OBJS = $(MESA_GRAMMAR_OBJS) @@ -42,7 +33,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc new file mode 100644 index 000000000..e1196201d --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc @@ -0,0 +1,25 @@ +XCOMM $XFree86$ + +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/programs/Xserver/GL/mesa/shader/slang/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile index 0bee2b774..572000f26 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile @@ -1,27 +1,16 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = library -#endif #include <Server.tmpl> #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSlangBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#else -#include "../../../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SLANG_SRCS) OBJS = $(MESA_SLANG_OBJS) @@ -47,7 +36,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc new file mode 100644 index 000000000..4358b8975 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc @@ -0,0 +1,86 @@ +XCOMM $XFree86$ + +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/programs/Xserver/GL/mesa/shader/slang/library/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile index e332121c9..d6de08e1b 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile @@ -1,10 +1,5 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -12,11 +7,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaLibraryBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc" -#else -#include "../../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc" -#endif +#include "Imakefile.inc" INCLUDES = -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/src/mesa/shader \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc new file mode 100644 index 000000000..3489b7a28 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc @@ -0,0 +1,14 @@ +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/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile index 817fead69..c4c55a86f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/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 */ @@ -19,11 +14,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSwrastBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SWRAST_SRCS) @@ -51,7 +42,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() @@ -60,4 +50,3 @@ DependTarget() MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc new file mode 100644 index 000000000..c57416d85 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc @@ -0,0 +1,214 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $ + +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/programs/Xserver/GL/mesa/swrast/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile deleted file mode 100644 index 7d9974ed0..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile index b530457e9..52be70141 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/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 #include <Server.tmpl> @@ -14,11 +9,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSwrastSetupBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SWR_SETUP_SRCS) OBJS = $(MESA_SWR_SETUP_OBJS) @@ -43,7 +34,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() @@ -52,4 +42,3 @@ DependTarget() MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc new file mode 100644 index 000000000..4fb10763a --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc @@ -0,0 +1,32 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $ + +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/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile deleted file mode 100644 index 5221debc0..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/module/Imakefile,v 1.1 2002/05/31 18:12:41 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile index c52696e4f..3f1c4bbc5 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile @@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.2 2004/08/19 07:34 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 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 */ @@ -21,11 +16,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaTnlBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_TNL_SRCS) @@ -54,7 +45,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc new file mode 100644 index 000000000..3a124c195 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc @@ -0,0 +1,221 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $ + +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/programs/Xserver/GL/mesa/tnl/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile deleted file mode 100644 index 5d2a4489d..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/module/Imakefile,v 1.1 2002/05/31 18:12:42 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/opengl/Imakefile b/nx-X11/programs/Xserver/GL/opengl/Imakefile deleted file mode 100644 index 420405d9c..000000000 --- a/nx-X11/programs/Xserver/GL/opengl/Imakefile +++ /dev/null @@ -1,140 +0,0 @@ -XCOMM $XFree86$ - -XCOMM The contents of this file are subject to the GLX Public License Version 1.0 -XCOMM (the "License"). You may not use this file except in compliance with the -XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., -XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -XCOMM or at http://www.sgi.com/software/opensource/glx/license.html. -XCOMM -XCOMM Software distributed under the License is distributed on an "AS IS" -XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY -XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR -XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific -XCOMM language governing rights and limitations under the License. -XCOMM -XCOMM The Original Software is GLX version 1.2 source code, released February, -XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc. -XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc. -XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -#include <Library.tmpl> - -OBJS = \ - ddxci.o \ - ddxcx.o \ - ddxrgb.o \ - ddxscreens.o \ - dl_block.o \ - dl_heap.o \ - dl_init.o \ - dl_list.o \ - dl_mopt.o \ - dl_opt.o \ - dl_pplst.o \ - dl_splc.o \ - dl_splst.o \ - dl_table.o \ - g_api.o \ - g_disp.o \ - g_lcmpex.o \ - g_lcomp.o \ - g_lexec.o \ - g_ltab.o \ - g_noptab.o \ - g_splcmp.o \ - px_api.o \ - px_mod.o \ - px_pack.o \ - px_paths.o \ - px_read.o \ - px_rend.o \ - px_upack.o \ - s_accum.o \ - s_atest.o \ - s_attrib.o \ - s_bitmap.o \ - s_blend.o \ - s_btdraw.o \ - s_buffer.o \ - s_capi.o \ - s_ci.o \ - s_clear.o \ - s_clip.o \ - s_contxt.o \ - s_cpydsp.o \ - s_ctable.o \ - s_depth.o \ - s_dlist.o \ - s_eval.o \ - s_export.o \ - s_feed.o \ - s_finish.o \ - s_fog.o \ - s_get.o \ - s_global.o \ - s_image.o \ - s_lcache.o \ - s_lcomp.o \ - s_light.o \ - s_lnclip.o \ - s_lndraw.o \ - s_lnfast.o \ - s_lnfin.o \ - s_lnspan.o \ - s_math.o \ - s_memmgr.o \ - s_names.o \ - s_napi.o \ - s_pgaa.o \ - s_pgclip.o \ - s_pgdraw.o \ - s_pgfin.o \ - s_pgmode.o \ - s_pgspan.o \ - s_pick.o \ - s_prim.o \ - s_ptaa.o \ - s_ptdraw.o \ - s_ptfin.o \ - s_rapi.o \ - s_rect.o \ - s_rgb.o \ - s_rpos.o \ - s_select.o \ - s_size.o \ - s_span.o \ - s_sten.o \ - s_store.o \ - s_tapi.o \ - s_tex.o \ - s_texel.o \ - s_texmgr.o \ - s_trap.o \ - s_vapi.o \ - s_varray.o \ - s_vertex.o \ - s_xform.o \ - s_zfuncs.o \ - vc_cache.o \ - vc_line.o \ - vc_point.o \ - vc_poly.o - -INCLUDES = \ - -I. \ - -I.. \ - -Iinclude \ - -I$(TOP)/server/include \ - -I$(TOP)/programs/Xserver/include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL \ - -I$(INCLUDESRC) - -DEFINES = \ - -D_LANGUAGE_C \ - -Dunix - -NormalLibraryTarget(GL, $(OBJS)) -NormalLibraryObjectRule() - -DependTarget() diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 9f730cb97..43d49d085 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -34,7 +34,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey #define dependLib(x) #endif -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* Do not strip server binaries */ INSTPGMFLAGS = #endif @@ -71,39 +71,15 @@ INSTPGMFLAGS = #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs #if BuildGlxExt -# if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \ - || (defined(XorgServer) && XorgServer)) - DRILIB = GL/dri/ModuleLibraryTargetName(dri) -# else - DRILIB = -# endif -# if GlxUseSGISI +# if DoLoadableServer GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/sgi-si/ModuleLibraryTargetName(GLcore) \ - $(DRILIB) + GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) # else -# if defined(GlxUseWindows) && GlxUseWindows - XWin_GL.exe.GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \ - GL/windows/ModuleLibraryTargetName(GLcore) -# endif /* GlxUseWindows */ -# if defined(Win32Architecture) && defined(GlxUseWindows) && GlxUseWindows - GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \ - GL/windows/ModuleLibraryTargetName(GLcore) -# elif DoLoadableServer GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) -# else - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \ - $(DRILIB) -# endif # endif GLXDIR = GL -# if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows - GLXEXT = $(if $($@.GLXLIB),$($@.GLXLIB), $(GLXLIB)) -# else GLXEXT = $(GLXLIB) -# endif #endif #if BuildXInputExt @@ -113,7 +89,7 @@ INSTPGMFLAGS = #if BuildXKB XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS)) XKBDIR = xkb -#if (defined(XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o #endif #endif @@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) XWINPARSERDIR = XWINPARSERLIB = #endif -#if defined(GlxUseWindows) && GlxUseWindows -XWINOPENGLLIB = -lopengl32 -#else XWINOPENGLLIB = -#endif NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin) NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ @@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC # endif #endif #if defined(Win32Architecture) -# if defined(GlxUseWindows) && GlxUseWindows -XWINGL32 = -lopengl32 -# endif -XWINW32 = -lgdi32 -lwsock32 $(XWINGL32) $(PTHREADLIB) +XWINW32 = -lgdi32 -lwsock32 $(PTHREADLIB) #else XWINW32 = -lgdi32 #endif @@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI #ifdef mingwArchitecture NXWINSERVERNAME=NXming -NXWINGLSERVERNAME=NXmingGL #else NXWINSERVERNAME=NXWin -NXWINGLSERVERNAME=NXWin_GL #endif ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)) -#if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows -ServerTarget($(NXWINGLSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ - $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)\ - $(XWINOPENGLLIB)) -#endif #ifndef ServerToInstall # define ServerToInstall $(NXWINSERVERNAME) diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index f44edb172..eb4588e37 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -55,15 +55,13 @@ SUBDIRS = extmod #endif #if BuildXF86VidModeExt && \ - ((defined(XF86Server) && XF86Server) || \ - (defined(XorgServer) && XorgServer)) + (defined(XorgServer) && XorgServer) VIDMODESRCS = xf86vmode.c VIDMODEOBJS = xf86vmode.o #endif #if BuildXF86MiscExt && \ - ((defined(XF86Server) && XF86Server) || \ - (defined(XorgServer) && XorgServer)) + (defined(XorgServer) && XorgServer) XF86MISCSRCS = xf86misc.c XF86MISCOBJS = xf86misc.o #endif @@ -157,7 +155,7 @@ NX_DEFINES = -DNXAGENT_SERVER #endif -#if (defined(XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* XXX Check if this can be eliminated */ XF86INCLUDES = -I$(XF86COMSRC) #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 198632312..f92393893 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -23,7 +23,7 @@ NoMachine's \fBnxclient\fR or the community projects \fBqtnx\fR and \fBremmina\f .SH OPTIONS .TP -.B \--help +.B \-help Lists all others options that are not listed here. .SH FURTHER READINGS diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 index b9e8ddab5..a78855584 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 @@ -23,7 +23,7 @@ Python X2Go API). .SH OPTIONS .TP -.B \--help +.B \-help Lists all others options that are not listed here. .SH FURTHER READINGS diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 210067635..d68ef940c 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 HEADERS = os.h misc.h -#if defined(XorgVersion) || defined(XFree86Version) \ +#if defined(XorgVersion) \ || defined(BSDOSArchitecture) #if DoLoadableServer LinkSourceFile(xf86Module.h,$(XF86COMSRC)) diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 24caa0299..e62fb0005 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -62,7 +62,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ micmap.o mioverlay.o -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o * used by Xnest, Xvfb diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index a718545b1..2ac6fe32d 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -29,7 +29,7 @@ XKB_DDXDEFS = XkbServerDefines NX_DEFINES = -DNXAGENT_SERVER #endif -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) +#if (defined(XorgServer) && XorgServer) XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o #endif @@ -62,7 +62,7 @@ NormalLibraryTarget(xkb,$(OBJS)) LintLibraryTarget(xkb,$(SRCS)) NormalLintTarget($(SRCS)) -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) +#if (defined(XorgServer) && XorgServer) ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS) |