diff options
author | Jesse Natalie <jenatali@microsoft.com> | 2021-03-18 09:12:46 -0700 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-03-19 19:33:59 +0000 |
commit | 012bc2fc776345630edc85ad10db8e9e75cf5ed0 (patch) | |
tree | 589e9789e116e89ea5b61e25f6fab93711ccd292 /Android.common.mk | |
parent | 28bf06f350eef8489ad771e1458579b75150b5fa (diff) |
meson, util: Make zlib optional again
This adds a HAVE_COMPRESSION macro, which is undefined if neither zlib
nor zstd are present, and is used to no-op compress.h/c. This also has
a side effect of fixing SCons, since it won't define this macro.
Fixes: d7ecbd5bf837 ("util: create some standalone compression helpers")
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9689>
Diffstat (limited to 'Android.common.mk')
-rw-r--r-- | Android.common.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index 9141ef951d6..7ef6a90a179 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -73,6 +73,7 @@ LOCAL_CFLAGS += \ -DHAVE_LINUX_FUTEX_H \ -DHAVE_ENDIAN_H \ -DHAVE_ZLIB \ + -DHAVE_COMPRESSION \ -DMAJOR_IN_SYSMACROS \ -DVK_USE_PLATFORM_ANDROID_KHR \ -fvisibility=hidden \ |