YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-02-03 02:34:17 +00:00
Code Issues 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
Show Stats 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.check_cc( lib='rt' )
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='android')
conf.check_cc(lib='log') conf.check_cc(lib='log')
conf.check_cc(lib='EGL') conf.check_cc(lib='EGL')
else: else:
@ -74,8 +75,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':
libs += ['LOG', 'EGL'] libs += ['LOG', 'EGL', 'ANDROID']
source += bld.path.ant_glob(['platform/android/*.c*']) source += bld.path.ant_glob(['platform/android/*.cpp', 'platform/android/*.c'])
# add client files # add client files
if not bld.env.DEDICATED: if not bld.env.DEDICATED:

6
wscript
View File

@ -108,7 +108,9 @@ def configure(conf):
conf.env.BIT32_MANDATORY = not conf.options.ALLOW64 conf.env.BIT32_MANDATORY = not conf.options.ALLOW64
conf.env.BIT32_ALLOW64 = conf.options.ALLOW64 conf.env.BIT32_ALLOW64 = conf.options.ALLOW64
conf.load('force_32bit sdl2') conf.load('force_32bit')
if conf.env.DEST_OS2 != 'android':
conf.load('sdl2')
if conf.env.DEST_SIZEOF_VOID_P == 4: if conf.env.DEST_SIZEOF_VOID_P == 4:
Logs.info('NOTE: will build engine for 32-bit target') Logs.info('NOTE: will build engine for 32-bit target')
@ -129,7 +131,7 @@ def configure(conf):
'common': { 'common': {
'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS'], 'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS'],
'clang': ['-g', '-gdwarf-2'], 'clang': ['-g', '-gdwarf-2'],
'gcc': ['-g', '-Werror=implicit-function-declaration', '-fdiagnostics-color=always'] 'gcc': ['-g', '-Werror=implicit-function-declaration', '-fdiagnostics-color=always', '-Werror=return-type']
}, },
'fast': { 'fast': {
'msvc': ['/O2', '/Oy'], #todo: check /GL /LTCG 'msvc': ['/O2', '/Oy'], #todo: check /GL /LTCG