diff options
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 4 |
2 files changed, 4 insertions, 5 deletions
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']) |