From 46979419ae30dd7482d29c7eff76c9019175770e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 17 Nov 2022 01:23:33 +0300 Subject: [PATCH] wscript: check Android's log library globally --- engine/wscript | 3 --- wscript | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/wscript b/engine/wscript index eb64e7b4..0b7ef631 100644 --- a/engine/wscript +++ b/engine/wscript @@ -48,9 +48,6 @@ def configure(conf): conf.options.NO_ASYNC_RESOLVE = True if not conf.check_cc( fragment='int main(){ int i = socket();}', lib = 'wattcpwl', mandatory=False ): conf.define('XASH_NO_NETWORK',1) - elif conf.env.DEST_OS == 'android': # Android doesn't need SDL2 - for i in ['log']: - conf.check_cc(lib = i) elif conf.options.FBDEV_SW: # unused, XASH_LINUX without XASH_SDL gives fbdev & alsa support # conf.define('XASH_FBDEV', 1) diff --git a/wscript b/wscript index 01b86482..268afffe 100644 --- a/wscript +++ b/wscript @@ -275,6 +275,9 @@ def configure(conf): if not conf.env.LIB_M: # HACK: already added in xcompile! conf.check_cc(lib='m') + + if conf.env.DEST_OS == 'android': + conf.check_cc(lib='log') else: # Common Win32 libraries # Don't check them more than once, to save time