RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-08 13:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

wscript: error on return-type, some android related changes

Browse Source
This commit is contained in:
Alibek Omarov
2019-05-12 03:03:34 +03:00
parent 55c3040db1
commit 7d3e8c0a57
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/wscript
View File

@@ -26,6 +26,7 @@ def configure(conf):
conf.check_cc( lib='rt' )
conf.env.append_unique('DEFINES', 'XASH_DEDICATED')
elif conf.env.DEST_OS2 == 'android': # Android doesn't need SDL2
conf.check_cc(lib='android')
conf.check_cc(lib='log')
conf.check_cc(lib='EGL')
else:
@@ -74,8 +75,8 @@ def build(bld):
source += bld.path.ant_glob(['platform/sdl/*.c'])
if bld.env.DEST_OS2 == 'android':
libs += ['LOG', 'EGL']
source += bld.path.ant_glob(['platform/android/*.c*'])
libs += ['LOG', 'EGL', 'ANDROID']
source += bld.path.ant_glob(['platform/android/*.cpp', 'platform/android/*.c'])
# add client files
if not bld.env.DEDICATED: