X11-r300-Imakefile.patch

   1 --- xc/lib/GL/mesa/drivers/dri/r300/Imakefile.mesa-     2005-11-15 01:09:43.000000000 +0100
   2 +++ xc/lib/GL/mesa/drivers/dri/r300/Imakefile   2005-11-15 01:09:43.000000000 +0100
   3 @@ -0,0 +1,76 @@
   4 +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r300/Imakefile,v 1.9 3002/02/23 00:45:50 dawes Exp $
   5 +
   6 +#include <Threads.tmpl>
   7 +
   8 +#if GlxUseBuiltInDRIDriver
   9 +#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
  10 +#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
  11 +#define DoExtraLib SharedLibGlx
  12 +#define DoDebugLib DebugLibGlx
  13 +#define DoProfileLib ProfileLibGlx
  14 +#else
  15 +#define DoNormalLib SharedLibGlxWithoutPIC
  16 +#define DoSharedLib !SharedLibGlxWithoutPIC
  17 +#define DoExtrasLib NO
  18 +#define DoDebugLib NO
  19 +#define DoProfileLib NO
  20 +#endif
  21 +
  22 +#define MesaDrvCommonBuildDir ../common/
  23 +#include "../common/Imakefile.inc"
  24 +#include "../../../array_cache/Imakefile.inc"
  25 +#include "../../../main/Imakefile.inc"
  26 +#include "../../../math/Imakefile.inc"
  27 +#include "../../../shader/Imakefile.inc"
  28 +#include "../../../shader/grammar/Imakefile.inc"
  29 +#include "../../../shader/slang/Imakefile.inc"
  30 +#include "../../../shader/slang/library/Imakefile.inc"
  31 +#include "../../../swrast/Imakefile.inc"
  32 +#include "../../../swrast_setup/Imakefile.inc"
  33 +#include "../../../tnl/Imakefile.inc"
  34 +#include "../../../tnl_dd/Imakefile.inc"
  35 +#include "../../../Imakefile.inc"
  36 +#if defined(i386Architecture) && MesaUseX86Asm
  37 +#include "../../../x86/Imakefile.inc"
  38 +#endif
  39 +#ifdef SparcArchitecture
  40 +#include "../../../sparc/Imakefile.inc"
  41 +#endif
  42 +#define NeedToLinkMesaSrc
  43 +#include "Imakefile.inc"
  44 +
  45 +      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
  46 +     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
  47 +
  48 +      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
  49 +               $(GLXLIBSRC)/dri/drm/xf86drmHash.o \
  50 +               $(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
  51 +               $(GLXLIBSRC)/dri/drm/xf86drmSL.o
  52 +
  53 +         SRCS = $(R300SRCS)
  54 +         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
  55 +               $(MESA_ASM_OBJS) $(COMMONOBJS) $(R300OBJS)
  56 +
  57 +REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
  58 +
  59 +#include <Library.tmpl>
  60 +
  61 +LibraryObjectRule()
  62 +
  63 +SubdirLibraryRule($(R300OBJS))
  64 +NormalLintTarget($(SRCS))
  65 +
  66 +#if !GlxUseBuiltInDRIDriver
  67 +LIBNAME = r300_dri.so
  68 +SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
  69 +InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
  70 +
  71 +#ifdef GlxSoProf
  72 +SOPROF_LIBNAME = _r300_dri_p
  73 +NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
  74 +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
  75 +#endif
  76 +#endif
  77 +
  78 +DependTarget()
  79 +
  80 --- xc/lib/GL/mesa/drivers/dri/r300/Imakefile.inc.mesa- 2005-11-15 01:09:43.000000000 +0100
  81 +++ xc/lib/GL/mesa/drivers/dri/r300/Imakefile.inc       2005-11-15 01:42:48.000000000 +0100
  82 @@ -0,0 +1,188 @@
  83 +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r300/Imakefile.inc,v 1.2 3001/05/02 15:06:04 dawes Exp $
  84 +
  85 +#ifndef MesaDrvSrcDir
  86 +#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
  87 +#endif
  88 +
  89 +MESADRVSRCDIR = MesaDrvSrcDir
  90 +
  91 +#ifndef MesaDrvR300BuildDir
  92 +#define MesaDrvR300BuildDir /**/
  93 +#endif
  94 +MESADRVR300BUILDDIR = MesaDrvR300BuildDir
  95 +
  96 +#if Malloc0ReturnsNull
  97 +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
  98 +#endif
  99 +
 100 +#if BuildXF86DRI
 101 +  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
 102 + DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
 103 +               -I$(XINCLUDESRC) \
 104 +               -I$(GLXLIBSRC)/glx \
 105 +               -I$(GLXLIBSRC)/include \
 106 +               -I$(SERVERSRC)/GL/dri \
 107 +               -I$(XF86COMSRC) \
 108 +               -I$(XF86OSSRC) \
 109 +               -I$(DRMSRCDIR)/shared-core \
 110 +               -I$(XF86DRIVERSRC)/ati \
 111 +               -I$(GLXLIBSRC)/dri/drm
 112 +#endif
 113 +
 114 +MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 115 +               -I$(MESASRCDIR)/src/mesa/main \
 116 +               -I$(MESASRCDIR)/src/mesa/glapi \
 117 +               -I$(MESASRCDIR)/src/mesa/shader \
 118 +               -I$(MESASRCDIR)/include \
 119 +               -I$(MESADRVSRCDIR)/common \
 120 +               -I$(MESADRVSRCDIR)/r300 \
 121 +               -I$(MESADRVSRCDIR)/radeon \
 122 +                -I$(MESADRVSRCDIR)/radeon/server
 123 +   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
 124 +
 125 +   R300SRCS =  $(MESADRVR300BUILDDIR)r300_cmdbuf.c \
 126 +               $(MESADRVR300BUILDDIR)r300_context.c \
 127 +               $(MESADRVR300BUILDDIR)r300_fragprog.c \
 128 +               /* broken? $(MESADRVR300BUILDDIR)r300_fragprog_swz.c */ \
 129 +               $(MESADRVR300BUILDDIR)r300_ioctl.c \
 130 +               $(MESADRVR300BUILDDIR)r300_maos.c \
 131 +               $(MESADRVR300BUILDDIR)r300_render.c \
 132 +               $(MESADRVR300BUILDDIR)r300_shader.c \
 133 +               $(MESADRVR300BUILDDIR)r300_state.c \
 134 +               $(MESADRVR300BUILDDIR)r300_tex.c \
 135 +               $(MESADRVR300BUILDDIR)r300_texmem.c \
 136 +               $(MESADRVR300BUILDDIR)r300_texprog.c \
 137 +               $(MESADRVR300BUILDDIR)r300_texstate.c \
 138 +               $(MESADRVR300BUILDDIR)r300_vertexprog.c \
 139 +               $(MESADRVR300BUILDDIR)radeon_context.c \
 140 +               $(MESADRVR300BUILDDIR)radeon_ioctl.c \
 141 +               $(MESADRVR300BUILDDIR)radeon_lock.c \
 142 +               $(MESADRVR300BUILDDIR)radeon_span.c \
 143 +               $(MESADRVR300BUILDDIR)radeon_screen.c \
 144 +               $(MESADRVR300BUILDDIR)radeon_state.c
 145 +
 146 +   R300OBJS =  $(MESADRVR300BUILDDIR)r300_cmdbuf.o \
 147 +               $(MESADRVR300BUILDDIR)r300_context.o \
 148 +               $(MESADRVR300BUILDDIR)r300_fragprog.o \
 149 +               /* broken? $(MESADRVR300BUILDDIR)r300_fragprog_swz.o */ \
 150 +               $(MESADRVR300BUILDDIR)r300_ioctl.o \
 151 +               $(MESADRVR300BUILDDIR)r300_maos.o \
 152 +               $(MESADRVR300BUILDDIR)r300_render.o \
 153 +               $(MESADRVR300BUILDDIR)r300_shader.o \
 154 +               $(MESADRVR300BUILDDIR)r300_state.o \
 155 +               $(MESADRVR300BUILDDIR)r300_tex.o \
 156 +               $(MESADRVR300BUILDDIR)r300_texmem.o \
 157 +               $(MESADRVR300BUILDDIR)r300_texprog.o \
 158 +               $(MESADRVR300BUILDDIR)r300_texstate.o \
 159 +               $(MESADRVR300BUILDDIR)r300_vertexprog.o \
 160 +               $(MESADRVR300BUILDDIR)radeon_context.o \
 161 +               $(MESADRVR300BUILDDIR)radeon_ioctl.o \
 162 +               $(MESADRVR300BUILDDIR)radeon_lock.o \
 163 +               $(MESADRVR300BUILDDIR)radeon_span.o \
 164 +               $(MESADRVR300BUILDDIR)radeon_screen.o \
 165 +               $(MESADRVR300BUILDDIR)radeon_state.o
 166 +
 167 +   R300UOBJS = $(MESADRVR300BUILDDIR)unshared/r300_cmdbuf.o \
 168 +               $(MESADRVR300BUILDDIR)unshared/r300_context.o \
 169 +               $(MESADRVR300BUILDDIR)unshared/r300_fragprog.o \
 170 +               /* broken? $(MESADRVR300BUILDDIR)unshared/r300_fragprog_swz.o */ \
 171 +               $(MESADRVR300BUILDDIR)unshared/r300_ioctl.o \
 172 +               $(MESADRVR300BUILDDIR)unshared/r300_maos.o \
 173 +               $(MESADRVR300BUILDDIR)unshared/r300_render.o \
 174 +               $(MESADRVR300BUILDDIR)unshared/r300_shader.o \
 175 +               $(MESADRVR300BUILDDIR)unshared/r300_state.o \
 176 +               $(MESADRVR300BUILDDIR)unshared/r300_tex.o \
 177 +               $(MESADRVR300BUILDDIR)unshared/r300_texmem.o \
 178 +               $(MESADRVR300BUILDDIR)unshared/r300_texprog.o \
 179 +               $(MESADRVR300BUILDDIR)unshared/r300_texstate.o \
 180 +               $(MESADRVR300BUILDDIR)unshared/r300_vertexprog.o \
 181 +               $(MESADRVR300BUILDDIR)unshared/radeon_context.o \
 182 +               $(MESADRVR300BUILDDIR)unshared/radeon_ioctl.o \
 183 +               $(MESADRVR300BUILDDIR)unshared/radeon_lock.o \
 184 +               $(MESADRVR300BUILDDIR)unshared/radeon_span.o \
 185 +               $(MESADRVR300BUILDDIR)unshared/radeon_screen.o \
 186 +               $(MESADRVR300BUILDDIR)unshared/radeon_state.o
 187 +
 188 +   R300DOBJS = $(MESADRVR300BUILDDIR)debugger/r300_cmdbuf.o \
 189 +               $(MESADRVR300BUILDDIR)debugger/r300_context.o \
 190 +               $(MESADRVR300BUILDDIR)debugger/r300_fragprog.o \
 191 +               /* broken? $(MESADRVR300BUILDDIR)debugger/r300_fragprog_swz.o */ \
 192 +               $(MESADRVR300BUILDDIR)debugger/r300_ioctl.o \
 193 +               $(MESADRVR300BUILDDIR)debugger/r300_maos.o \
 194 +               $(MESADRVR300BUILDDIR)debugger/r300_render.o \
 195 +               $(MESADRVR300BUILDDIR)debugger/r300_shader.o \
 196 +               $(MESADRVR300BUILDDIR)debugger/r300_state.o \
 197 +               $(MESADRVR300BUILDDIR)debugger/r300_tex.o \
 198 +               $(MESADRVR300BUILDDIR)debugger/r300_texmem.o \
 199 +               $(MESADRVR300BUILDDIR)debugger/r300_texprog.o \
 200 +               $(MESADRVR300BUILDDIR)debugger/r300_texstate.o \
 201 +               $(MESADRVR300BUILDDIR)debugger/r300_vertexprog.o \
 202 +               $(MESADRVR300BUILDDIR)debugger/radeon_context.o \
 203 +               $(MESADRVR300BUILDDIR)debugger/radeon_ioctl.o \
 204 +               $(MESADRVR300BUILDDIR)debugger/radeon_lock.o \
 205 +               $(MESADRVR300BUILDDIR)debugger/radeon_span.o \
 206 +               $(MESADRVR300BUILDDIR)debugger/radeon_screen.o \
 207 +               $(MESADRVR300BUILDDIR)debugger/radeon_state.o
 208 +
 209 +   R300POBJS = $(MESADRVR300BUILDDIR)profiled/r300_cmdbuf.o \
 210 +               $(MESADRVR300BUILDDIR)profiled/r300_context.o \
 211 +               $(MESADRVR300BUILDDIR)profiled/r300_fragprog.o \
 212 +               /* broken? $(MESADRVR300BUILDDIR)profiled/r300_fragprog_swz.o */ \
 213 +               $(MESADRVR300BUILDDIR)profiled/r300_ioctl.o \
 214 +               $(MESADRVR300BUILDDIR)profiled/r300_maos.o \
 215 +               $(MESADRVR300BUILDDIR)profiled/r300_render.o \
 216 +               $(MESADRVR300BUILDDIR)profiled/r300_shader.o \
 217 +               $(MESADRVR300BUILDDIR)profiled/r300_state.o \
 218 +               $(MESADRVR300BUILDDIR)profiled/r300_tex.o \
 219 +               $(MESADRVR300BUILDDIR)profiled/r300_texmem.o \
 220 +               $(MESADRVR300BUILDDIR)profiled/r300_texprog.o \
 221 +               $(MESADRVR300BUILDDIR)profiled/r300_texstate.o \
 222 +               $(MESADRVR300BUILDDIR)profiled/r300_vertexprog.o \
 223 +               $(MESADRVR300BUILDDIR)profiled/radeon_context.o \
 224 +               $(MESADRVR300BUILDDIR)profiled/radeon_ioctl.o \
 225 +               $(MESADRVR300BUILDDIR)profiled/radeon_lock.o \
 226 +               $(MESADRVR300BUILDDIR)profiled/radeon_span.o \
 227 +               $(MESADRVR300BUILDDIR)profiled/radeon_screen.o \
 228 +               $(MESADRVR300BUILDDIR)profiled/radeon_state.o
 229 +
 230 +#ifdef NeedToLinkMesaSrc
 231 +LinkSourceFile(r300_context.c, $(MESADRVSRCDIR)/r300)
 232 +LinkSourceFile(r300_context.h, $(MESADRVSRCDIR)/r300)
 233 +LinkSourceFile(r300_cmdbuf.c, $(MESADRVSRCDIR)/r300)
 234 +LinkSourceFile(r300_cmdbuf.h, $(MESADRVSRCDIR)/r300)
 235 +LinkSourceFile(r300_emit.h, $(MESADRVSRCDIR)/r300)
 236 +LinkSourceFile(r300_fixed_pipelines.h, $(MESADRVSRCDIR)/r300)
 237 +LinkSourceFile(r300_ioctl.c, $(MESADRVSRCDIR)/r300)
 238 +LinkSourceFile(r300_ioctl.h, $(MESADRVSRCDIR)/r300)
 239 +LinkSourceFile(r300_maos.c, $(MESADRVSRCDIR)/r300)
 240 +LinkSourceFile(r300_maos.h, $(MESADRVSRCDIR)/r300)
 241 +LinkSourceFile(r300_program.h, $(MESADRVSRCDIR)/r300)
 242 +LinkSourceFile(r300_render.c, $(MESADRVSRCDIR)/r300)
 243 +LinkSourceFile(r300_reg.h, $(MESADRVSRCDIR)/r300)
 244 +LinkSourceFile(r300_fragprog.c, $(MESADRVSRCDIR)/r300)
 245 +LinkSourceFile(r300_fragprog.h, $(MESADRVSRCDIR)/r300)
 246 +LinkSourceFile(r300_fragprog_swz.c, $(MESADRVSRCDIR)/r300)
 247 +LinkSourceFile(r300_shader.c, $(MESADRVSRCDIR)/r300)
 248 +LinkSourceFile(r300_state.c, $(MESADRVSRCDIR)/r300)
 249 +LinkSourceFile(r300_state.h, $(MESADRVSRCDIR)/r300)
 250 +LinkSourceFile(r300_tex.c, $(MESADRVSRCDIR)/r300)
 251 +LinkSourceFile(r300_tex.h, $(MESADRVSRCDIR)/r300)
 252 +LinkSourceFile(r300_texmem.c, $(MESADRVSRCDIR)/r300)
 253 +LinkSourceFile(r300_texprog.c, $(MESADRVSRCDIR)/r300)
 254 +LinkSourceFile(r300_texstate.c, $(MESADRVSRCDIR)/r300)
 255 +LinkSourceFile(r300_vertexprog.c, $(MESADRVSRCDIR)/r300)
 256 +LinkSourceFile(radeon_context.c, $(MESADRVSRCDIR)/r300)
 257 +LinkSourceFile(radeon_context.h, $(MESADRVSRCDIR)/r300)
 258 +LinkSourceFile(radeon_ioctl.c, $(MESADRVSRCDIR)/r300)
 259 +LinkSourceFile(radeon_ioctl.h, $(MESADRVSRCDIR)/r300)
 260 +LinkSourceFile(radeon_lock.c, $(MESADRVSRCDIR)/r300)
 261 +LinkSourceFile(radeon_lock.h, $(MESADRVSRCDIR)/r300)
 262 +LinkSourceFile(radeon_screen.c, $(MESADRVSRCDIR)/r300)
 263 +LinkSourceFile(radeon_screen.h, $(MESADRVSRCDIR)/r300)
 264 +LinkSourceFile(radeon_span.c, $(MESADRVSRCDIR)/r300)
 265 +LinkSourceFile(radeon_span.h, $(MESADRVSRCDIR)/r300)
 266 +LinkSourceFile(radeon_state.c, $(MESADRVSRCDIR)/r300)
 267 +LinkSourceFile(radeon_state.h, $(MESADRVSRCDIR)/r300)
 268 +LinkSourceFile(pixel_shader.h, $(MESADRVSRCDIR)/r300)
 269 +LinkSourceFile(vertex_shader.h, $(MESADRVSRCDIR)/r300)
 270 +#endif