diff options
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/graw-gdi/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/graw-xlib/SConscript | 6 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 4 |
7 files changed, 12 insertions, 17 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index aaeb950707b..f9e4ada9338 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -11,7 +11,6 @@ AM_CFLAGS = \ AM_CPPFLAGS = \ $(DEFINES) \ -DDRI_TARGET \ - -DGALLIUM_GALAHAD \ -DGALLIUM_NOOP \ -DGALLIUM_RBUG \ -DGALLIUM_TRACE @@ -46,7 +45,6 @@ gallium_dri_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index a7322476452..a51ed564344 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -18,8 +18,8 @@ if env['build'] == 'release': env.Append(CPPDEFINES = ['GALLIUM_RBUG']) env.Prepend(LIBS = [rbug]) else: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD']) - env.Prepend(LIBS = [trace, rbug, galahad]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG']) + env.Prepend(LIBS = [trace, rbug]) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript index f8db6e6c85d..67d437374fb 100644 --- a/src/gallium/targets/graw-gdi/SConscript +++ b/src/gallium/targets/graw-gdi/SConscript @@ -23,8 +23,8 @@ sources = [ ] if True: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, galahad, softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, softpipe]) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript index 886811b4b3b..bf9cf72c6e1 100644 --- a/src/gallium/targets/graw-xlib/SConscript +++ b/src/gallium/targets/graw-xlib/SConscript @@ -20,7 +20,7 @@ env.Append(CPPPATH = [ '#src/gallium/winsys', ]) -env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD']) +env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE']) sources = [ 'graw_xlib.c', @@ -28,8 +28,8 @@ sources = [ ] if True: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, galahad, softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, softpipe]) if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index de56e28d16a..33b0d1345de 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -37,8 +37,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/winsys \ -DGALLIUM_SOFTPIPE \ -DGALLIUM_RBUG \ - -DGALLIUM_TRACE \ - -DGALLIUM_GALAHAD + -DGALLIUM_TRACE + AM_CFLAGS = $(X11_INCLUDES) lib_LTLIBRARIES = lib@[email protected] @@ -62,7 +62,6 @@ lib@GL_LIB@_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ $(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 69751887985..df5a220ac25 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -39,8 +39,8 @@ sources = [ ] if True: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, galahad, softpipe]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE']) + env.Prepend(LIBS = [trace, rbug, softpipe]) if env['llvm']: env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE']) diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index fe40f5b181e..967cdb76542 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -30,8 +30,7 @@ AM_CPPFLAGS = \ $(LIBDRM_CFLAGS) \ $(VISIBILITY_CFLAGS) \ -DGALLIUM_RBUG \ - -DGALLIUM_TRACE \ - -DGALLIUM_GALAHAD + -DGALLIUM_TRACE pipedir = $(libdir)/gallium-pipe pipe_LTLIBRARIES = @@ -56,7 +55,6 @@ PIPE_LIBS += \ $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ $(GALLIUM_COMMON_LIB_DEPS) AM_LDFLAGS = \ |