From 7d3e8c0a57431123cd9123cd7cd7464157014e8b Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 12 May 2019 03:03:34 +0300 Subject: [PATCH] wscript: error on return-type, some android related changes --- engine/wscript | 5 +++-- wscript | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/engine/wscript b/engine/wscript index d2b9bd4d..e8f9e0a1 100644 --- a/engine/wscript +++ b/engine/wscript @@ -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: diff --git a/wscript b/wscript index 2fef7fef..163e47a2 100644 --- a/wscript +++ b/wscript @@ -108,7 +108,9 @@ def configure(conf): conf.env.BIT32_MANDATORY = not 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: Logs.info('NOTE: will build engine for 32-bit target') @@ -129,7 +131,7 @@ def configure(conf): 'common': { 'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS'], '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': { 'msvc': ['/O2', '/Oy'], #todo: check /GL /LTCG