From c7b701dfd2fc4fe85f5b0f4e94a4faabda8dd375 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Mon, 13 Jan 2020 15:58:49 +0100 Subject: Image: Include S3TC compression via Squish in non-tools build We already build Squish in templates build for S3TC decompression, so we can as well expose the compression feature. Fixes #25640. --- platform/haiku/detect.py | 2 +- platform/server/detect.py | 2 +- platform/x11/detect.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'platform') diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py index 2a3e165069..dd72294816 100644 --- a/platform/haiku/detect.py +++ b/platform/haiku/detect.py @@ -95,7 +95,7 @@ def configure(env): if not env['builtin_enet']: env.ParseConfig('pkg-config libenet --cflags --libs') - if not env['builtin_squish'] and env['tools']: + if not env['builtin_squish']: env.ParseConfig('pkg-config libsquish --cflags --libs') if not env['builtin_zstd']: diff --git a/platform/server/detect.py b/platform/server/detect.py index b6028c20e3..d82df77957 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -162,7 +162,7 @@ def configure(env): if not env['builtin_enet']: env.ParseConfig('pkg-config libenet --cflags --libs') - if not env['builtin_squish'] and env['tools']: + if not env['builtin_squish']: env.ParseConfig('pkg-config libsquish --cflags --libs') if not env['builtin_zstd']: diff --git a/platform/x11/detect.py b/platform/x11/detect.py index b8ff97279d..a961072bd6 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -232,7 +232,7 @@ def configure(env): if not env['builtin_enet']: env.ParseConfig('pkg-config libenet --cflags --libs') - if not env['builtin_squish'] and env['tools']: + if not env['builtin_squish']: env.ParseConfig('pkg-config libsquish --cflags --libs') if not env['builtin_zstd']: -- cgit v1.2.3