diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Makefile.am | 4 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/util/SConscript | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 03b619efeb7..7512138a892 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -38,8 +38,8 @@ libmesautil_la_SOURCES = \ $(MESA_UTIL_FILES) \ $(MESA_UTIL_GENERATED_FILES) -if HAVE_SHA1 -libmesautil_la_SOURCES += $(MESA_UTIL_SHA1_FILES) +if ENABLE_SHADER_CACHE +libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES) endif libmesautil_la_LIBADD = $(SHA1_LIBS) diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 4e54c74600c..52ae5cc7a91 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -1,4 +1,4 @@ -MESA_UTIL_SHA1_FILES := \ +MESA_UTIL_SHADER_CACHE_FILES := \ sha1.c \ sha1.h diff --git a/src/util/SConscript b/src/util/SConscript index 34b9a2deaab..28fedd80cdd 100644 --- a/src/util/SConscript +++ b/src/util/SConscript @@ -29,6 +29,11 @@ mesautil_sources = ( source_lists['MESA_UTIL_GENERATED_FILES'] ) +# XXX We don't yet have scons support for detecting any of the various +# HAVE_SHA1_* definitions, so for now simply disable the shader cache. +if False: + mesautil_sources += source_lists['MESA_UTIL_SHADER_CACHE_FILES'] + mesautil = env.ConvenienceLibrary( target = 'mesautil', source = mesautil_sources, |