diff options
| author | Jason Ekstrand <[email protected]> | 2014-07-24 11:17:53 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2014-08-04 11:07:15 -0700 |
| commit | 992e1ea8e4290cf14d59f89415bfd13e0920aad7 (patch) | |
| tree | 1e3ce418960e77e5926e8e76d0f4bd9244e38caa /src/gallium/targets | |
| parent | efa0aa8ffc63e8fdd23335e67ca76eb358cfd1ac (diff) | |
gallium: Move sRGB <-> RGB handling to libmesautil
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/graw-gdi/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/graw-null/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/targets/graw-xlib/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/targets/graw-gdi/SConscript b/src/gallium/targets/graw-gdi/SConscript index 352efe95d09..dc7b7f197a9 100644 --- a/src/gallium/targets/graw-gdi/SConscript +++ b/src/gallium/targets/graw-gdi/SConscript @@ -10,6 +10,7 @@ env.Append(CPPPATH = [ ]) env.Prepend(LIBS = [ + mesautils, gallium, 'gdi32', 'user32', diff --git a/src/gallium/targets/graw-null/SConscript b/src/gallium/targets/graw-null/SConscript index ebac1728f04..20c8b7df19c 100644 --- a/src/gallium/targets/graw-null/SConscript +++ b/src/gallium/targets/graw-null/SConscript @@ -16,7 +16,7 @@ sources = [ graw_util, ] -env.Prepend(LIBS = [gallium]) +env.Prepend(LIBS = [mesautil, gallium]) # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions graw = env.SharedLibrary( diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript index 76e4d4fd64e..886811b4b3b 100644 --- a/src/gallium/targets/graw-xlib/SConscript +++ b/src/gallium/targets/graw-xlib/SConscript @@ -7,6 +7,7 @@ env = env.Clone() env.Prepend(LIBS = [ ws_xlib, + mesautil, gallium, ]) diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index a4e0407f5aa..ee930781480 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -38,6 +38,7 @@ pipe_LTLIBRARIES = PIPE_LIBS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(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 \ @@ -96,7 +97,6 @@ nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp pipe_r300_la_LIBADD = \ $(PIPE_LIBS) \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ $(top_builddir)/src/gallium/drivers/r300/libr300.la \ $(LIBDRM_LIBS) \ |