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: link -llog on Android

Browse Source
This commit is contained in:
Alibek Omarov 2018-12-20 10:15:08 +03:00
parent c3c0954613
commit b1a06baf83
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/wscript
View File

@ -21,7 +21,9 @@ def configure(conf):
conf.check_cc( lib='rt' ) conf.check_cc( lib='rt' )
conf.env.append_unique('DEFINES', 'SINGLE_BINARY') conf.env.append_unique('DEFINES', 'SINGLE_BINARY')
conf.env.append_unique('DEFINES', 'XASH_DEDICATED') conf.env.append_unique('DEFINES', 'XASH_DEDICATED')
elif conf.env.DEST_OS2 != 'android': # Android doesn't need SDL2 elif conf.env.DEST_OS2 == 'android': # Android doesn't need SDL2
conf.check_cc(lib='log')
else:
conf.load('sdl2') conf.load('sdl2')
if not conf.env.HAVE_SDL2: if not conf.env.HAVE_SDL2:
conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated') conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated')
@ -61,7 +63,8 @@ def build(bld):
source += bld.path.ant_glob(['platform/sdl/*.c']) source += bld.path.ant_glob(['platform/sdl/*.c'])
if bld.env.DEST_OS2 == 'android': if bld.env.DEST_OS2 == 'android':
source += bld.path.ant_glob(['platform/android/*.c']) libs.append('LOG')
source += bld.path.ant_glob(['platform/android/*.c*'])
# add client files # add client files
if not bld.env.DEDICATED: if not bld.env.DEDICATED: