YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

wscript: check Android's log library globally

Browse Source
This commit is contained in:
Alibek Omarov 2022-11-17 01:23:33 +03:00
parent 30d9b6d844
commit 46979419ae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/wscript
View File

@ -48,9 +48,6 @@ def configure(conf):
conf.options.NO_ASYNC_RESOLVE = True conf.options.NO_ASYNC_RESOLVE = True
if not conf.check_cc( fragment='int main(){ int i = socket();}', lib = 'wattcpwl', mandatory=False ): if not conf.check_cc( fragment='int main(){ int i = socket();}', lib = 'wattcpwl', mandatory=False ):
conf.define('XASH_NO_NETWORK',1) 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: elif conf.options.FBDEV_SW:
# unused, XASH_LINUX without XASH_SDL gives fbdev & alsa support # unused, XASH_LINUX without XASH_SDL gives fbdev & alsa support
# conf.define('XASH_FBDEV', 1) # conf.define('XASH_FBDEV', 1)

3
wscript
View File

@ -275,6 +275,9 @@ def configure(conf):
if not conf.env.LIB_M: # HACK: already added in xcompile! if not conf.env.LIB_M: # HACK: already added in xcompile!
conf.check_cc(lib='m') conf.check_cc(lib='m')
if conf.env.DEST_OS == 'android':
conf.check_cc(lib='log')
else: else:
# Common Win32 libraries # Common Win32 libraries
# Don't check them more than once, to save time # Don't check them more than once, to save time