summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/libgl-xlib
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2018-04-07 14:01:12 -0400
committerMarek Olšák <[email protected]>2018-04-13 14:08:14 -0400
commit6ff0c6f4ebcb87ea6c6fe5a4ba90b548f666067d (patch)
tree30926986da28bb0b67b857d8f2cf7eeaa77f8773 /src/gallium/targets/libgl-xlib
parent918b798668c5465d85ca542423e4cf525dc79b31 (diff)
gallium: move ddebug, noop, rbug, trace to auxiliary to improve build times
which also simplifies the build scripts.
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
-rw-r--r--src/gallium/targets/libgl-xlib/Makefile.am6
-rw-r--r--src/gallium/targets/libgl-xlib/SConscript4
-rw-r--r--src/gallium/targets/libgl-xlib/meson.build4
3 files changed, 4 insertions, 10 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 1c622946a90..56d548e7c15 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -35,9 +35,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/winsys \
- -DGALLIUM_SOFTPIPE \
- -DGALLIUM_RBUG \
- -DGALLIUM_TRACE
+ -DGALLIUM_SOFTPIPE
AM_CFLAGS = $(X11_INCLUDES)
@@ -61,8 +59,6 @@ lib@GL_LIB@_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
$(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/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 b94ef350b16..fb7a0ce50e3 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -42,8 +42,8 @@ sources = [
]
if True:
- env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_SOFTPIPE'])
- env.Prepend(LIBS = [trace, rbug, softpipe])
+ env.Append(CPPDEFINES = ['GALLIUM_SOFTPIPE'])
+ env.Prepend(LIBS = [softpipe])
if env['llvm']:
env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 6884c826203..3d197ba7193 100644
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -24,8 +24,6 @@
gallium_xlib_c_args = [
'-DGALLIUM_SOFTPIPE',
- '-DGALLIUM_RBUG',
- '-DGALLIUME_TRACE',
]
gallium_xlib_ld_args = []
gallium_xlib_link_with = []
@@ -50,7 +48,7 @@ libgl = shared_library(
link_args : [ld_args_bsymbolic, ld_args_gc_sections, gallium_xlib_ld_args],
link_depends : gallium_xlib_link_depends,
link_with : [
- libxlib, libws_xlib, libtrace, librbug, libglapi_static,
+ libxlib, libws_xlib, libglapi_static,
libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with,
],
dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr],