asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6958 from RandomShaper/android-clang-tidy

Browse source 
Improve Android build (Clang + tidyness)
This commit is contained in:
Rémi Verschelde 2016-11-02 20:29:45 +01:00 committed by GitHub
commit 218c258f2a
2 changed files with 109 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/regex/regex.cpp
View file

@ -97,6 +97,9 @@ struct RegExNode {
memdelete(next); memdelete(next);
} }
// For avoiding RTTI
virtual bool is_look_behind() { return false; }
virtual int test(RegExSearch& s, int pos) const { virtual int test(RegExSearch& s, int pos) const {
return next ? next->test(s, pos) : -1; return next ? next->test(s, pos) : -1;
@ -750,6 +753,8 @@ struct RegExNodeLookBehind : public RegExNodeGroup {
reset_pos = true; reset_pos = true;
} }
virtual bool is_look_behind() { return true; }
virtual int test(RegExSearch& s, int pos) const { virtual int test(RegExSearch& s, int pos) const {
if (pos < length) if (pos < length)
@ -1089,7 +1094,7 @@ Error RegEx::compile(const String& p_pattern) {
REGEX_COMPILE_FAIL("backreference not found"); REGEX_COMPILE_FAIL("backreference not found");
for (int i = 0; i < stack.size(); ++i) for (int i = 0; i < stack.size(); ++i)
if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) if (stack[i]->is_look_behind())
REGEX_COMPILE_FAIL("backreferences inside lookbehind not supported"); REGEX_COMPILE_FAIL("backreferences inside lookbehind not supported");
for (int i = 0; i < group_names.size(); ++i) { for (int i = 0; i < group_names.size(); ++i) {
@ -1112,7 +1117,7 @@ Error RegEx::compile(const String& p_pattern) {
c = d; c = d;
for (int i = 0; i < stack.size(); ++i) for (int i = 0; i < stack.size(); ++i)
if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) if (stack[i]->is_look_behind())
REGEX_COMPILE_FAIL("backreferences inside lookbehind not supported"); REGEX_COMPILE_FAIL("backreferences inside lookbehind not supported");
int ref = -1; int ref = -1;
@ -1238,7 +1243,7 @@ Error RegEx::compile(const String& p_pattern) {
break; break;
case '|': case '|':
for (int i = 0; i < stack.size(); ++i) for (int i = 0; i < stack.size(); ++i)
if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) if (stack[i]->is_look_behind())
REGEX_COMPILE_FAIL("alternations inside lookbehind not supported"); REGEX_COMPILE_FAIL("alternations inside lookbehind not supported");
stack[0]->add_childset(); stack[0]->add_childset();
break; break;
@ -1312,7 +1317,7 @@ Error RegEx::compile(const String& p_pattern) {
if (min_val != max_val) if (min_val != max_val)
for (int i = 0; i < stack.size(); ++i) for (int i = 0; i < stack.size(); ++i)
if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) if (stack[i]->is_look_behind())
REGEX_COMPILE_FAIL("variable length quantifiers inside lookbehind not supported"); REGEX_COMPILE_FAIL("variable length quantifiers inside lookbehind not supported");
RegExNodeQuantifier* quant = memnew(RegExNodeQuantifier(min_val, max_val)); RegExNodeQuantifier* quant = memnew(RegExNodeQuantifier(min_val, max_val));

187
platform/android/detect.py
View file

@ -24,9 +24,8 @@ def can_build():
def get_opts(): def get_opts():
return [ return [
('ANDROID_NDK_ROOT', 'the path to Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)), ('ANDROID_NDK_ROOT', 'the path to Android NDK',
('NDK_TARGET', 'toolchain to use for the NDK', os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")), os.environ.get("ANDROID_NDK_ROOT", 0)),
('NDK_TARGET_X86', 'toolchain to use for the NDK x86', os.environ.get("NDK_TARGET_X86", "x86-4.9")),
('ndk_platform', 'compile for platform: (android-<api> , example: android-14)', "android-14"), ('ndk_platform', 'compile for platform: (android-<api> , example: android-14)', "android-14"),
('android_arch', 'select compiler architecture: (armv7/armv6/x86)', "armv7"), ('android_arch', 'select compiler architecture: (armv7/armv6/x86)', "armv7"),
('android_neon', 'enable neon (armv7 only)', "yes"), ('android_neon', 'enable neon (armv7 only)', "yes"),
@ -100,7 +99,6 @@ def configure(env):
env['android_arch'] = 'armv7' env['android_arch'] = 'armv7'
if env['android_arch'] == 'x86': if env['android_arch'] == 'x86':
env['NDK_TARGET'] = env['NDK_TARGET_X86']
env["x86_libtheora_opt_gcc"] = True env["x86_libtheora_opt_gcc"] = True
if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32':
@ -116,96 +114,129 @@ def configure(env):
if env['android_arch'] == 'x86': if env['android_arch'] == 'x86':
env.extra_suffix = ".x86" + env.extra_suffix env.extra_suffix = ".x86" + env.extra_suffix
target_subpath = "x86-4.9"
abi_subpath = "i686-linux-android"
arch_subpath = "x86"
elif env['android_arch'] == 'armv6': elif env['android_arch'] == 'armv6':
env.extra_suffix = ".armv6" + env.extra_suffix env.extra_suffix = ".armv6" + env.extra_suffix
target_subpath = "arm-linux-androideabi-4.9"
abi_subpath = "arm-linux-androideabi"
arch_subpath = "armeabi"
elif env["android_arch"] == "armv7": elif env["android_arch"] == "armv7":
target_subpath = "arm-linux-androideabi-4.9"
abi_subpath = "arm-linux-androideabi"
arch_subpath = "armeabi-v7a"
if env['android_neon'] == 'yes': if env['android_neon'] == 'yes':
env.extra_suffix = ".armv7.neon" + env.extra_suffix env.extra_suffix = ".armv7.neon" + env.extra_suffix
else: else:
env.extra_suffix = ".armv7" + env.extra_suffix env.extra_suffix = ".armv7" + env.extra_suffix
gcc_path = env["ANDROID_NDK_ROOT"] + "/toolchains/" + env["NDK_TARGET"] + "/prebuilt/"
if (sys.platform.startswith("linux")): if (sys.platform.startswith("linux")):
if (platform.machine().endswith('64')): if (platform.machine().endswith('64')):
gcc_path = gcc_path + "/linux-x86_64/bin" host_subpath = "linux-x86_64"
else: else:
gcc_path = gcc_path + "/linux-x86/bin" host_subpath = "linux-x86"
elif (sys.platform.startswith("darwin")): elif (sys.platform.startswith("darwin")):
gcc_path = gcc_path + "/darwin-x86_64/bin" host_subpath = "darwin-x86_64"
env['SHLINKFLAGS'][1] = '-shared'
env['SHLIBSUFFIX'] = '.so'
elif (sys.platform.startswith('win')): elif (sys.platform.startswith('win')):
if (platform.machine().endswith('64')): if (platform.machine().endswith('64')):
gcc_path = gcc_path + "/windows-x86_64/bin" host_subpath = "windows-x86_64"
else: else:
gcc_path = gcc_path + "/windows-x86/bin" host_subpath = "windows-x86"
env['ENV']['PATH'] = gcc_path + ":" + env['ENV']['PATH'] compiler_path = env["ANDROID_NDK_ROOT"] + \
if env['android_arch'] == 'x86': "/toolchains/llvm/prebuilt/" + host_subpath + "/bin"
env['CC'] = gcc_path + '/i686-linux-android-gcc' gcc_toolchain_path = env["ANDROID_NDK_ROOT"] + \
env['CXX'] = gcc_path + '/i686-linux-android-g++' "/toolchains/" + target_subpath + "/prebuilt/" + host_subpath
env['AR'] = gcc_path + "/i686-linux-android-ar" tools_path = gcc_toolchain_path + "/" + abi_subpath + "/bin"
env['RANLIB'] = gcc_path + "/i686-linux-android-ranlib"
env['AS'] = gcc_path + "/i686-linux-android-as" # For Clang to find NDK tools in preference of those system-wide
else: env.PrependENVPath('PATH', tools_path)
env['CC'] = gcc_path + '/arm-linux-androideabi-gcc'
env['CXX'] = gcc_path + '/arm-linux-androideabi-g++' env['CC'] = compiler_path + '/clang'
env['AR'] = gcc_path + "/arm-linux-androideabi-ar" env['CXX'] = compiler_path + '/clang++'
env['RANLIB'] = gcc_path + "/arm-linux-androideabi-ranlib" env['AR'] = tools_path + "/ar"
env['AS'] = gcc_path + "/arm-linux-androideabi-as" env['RANLIB'] = tools_path + "/ranlib"
env['AS'] = tools_path + "/as"
if env['android_arch'] == 'x86': if env['android_arch'] == 'x86':
env['ARCH'] = 'arch-x86' env['ARCH'] = 'arch-x86'
else: else:
env['ARCH'] = 'arch-arm' env['ARCH'] = 'arch-arm'
import string sysroot = env["ANDROID_NDK_ROOT"] + \
# include path "/platforms/" + ndk_platform + "/" + env['ARCH']
gcc_include = env["ANDROID_NDK_ROOT"] + "/platforms/" + ndk_platform + "/" + env['ARCH'] + "/usr/include" common_opts = ['-fno-integrated-as', '-gcc-toolchain', gcc_toolchain_path]
ld_sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + ndk_platform + "/" + env['ARCH']
# glue_include=env["ANDROID_NDK_ROOT"]+"/sources/android/native_app_glue" env.Append(CPPFLAGS=["-isystem", sysroot + "/usr/include"])
ld_path = env["ANDROID_NDK_ROOT"] + "/platforms/" + ndk_platform + "/" + env['ARCH'] + "/usr/lib" env.Append(CPPFLAGS=string.split(
env.Append(CPPPATH=[gcc_include]) '-Wno-invalid-command-line-argument -Wno-unused-command-line-argument'))
# env['CCFLAGS'] = string.split('-DNO_THREADS -MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -Wno-psabi -march=armv5te -mtune=xscale -msoft-float -fno-exceptions -mthumb -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED ') env.Append(CPPFLAGS=string.split(
'-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -fvisibility=hidden -fno-strict-aliasing -Wa,--noexecstack'))
env.Append(CPPFLAGS=string.split('-DANDROID -DNO_STATVFS -DGLES2_ENABLED'))
env['neon_enabled'] = False env['neon_enabled'] = False
if env['android_arch'] == 'x86': if env['android_arch'] == 'x86':
env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__ -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED')) can_vectorize = True
target_opts = ['-target', 'i686-none-linux-android']
elif env["android_arch"] == "armv6": elif env["android_arch"] == "armv6":
env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__ -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED')) can_vectorize = False
target_opts = ['-target', 'armv6-none-linux-androideabi']
env.Append(CPPFLAGS=string.split(
'-D__ARM_ARCH_6__ -march=armv6 -mfpu=vfp -mfloat-abi=softfp'))
elif env["android_arch"] == "armv7": elif env["android_arch"] == "armv7":
env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__ -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED')) can_vectorize = True
target_opts = ['-target', 'armv7-none-linux-androideabi']
env.Append(CPPFLAGS=string.split(
'-D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -march=armv7-a -mfloat-abi=softfp'))
if env['android_neon'] == 'yes': if env['android_neon'] == 'yes':
env['neon_enabled'] = True env['neon_enabled'] = True
env.Append(CCFLAGS=['-mfpu=neon', '-D__ARM_NEON__']) env.Append(CPPFLAGS=['-mfpu=neon', '-D__ARM_NEON__'])
else: else:
env.Append(CCFLAGS=['-mfpu=vfpv3-d16']) env.Append(CPPFLAGS=['-mfpu=vfpv3-d16'])
env.Append(CPPFLAGS=target_opts)
env.Append(CPPFLAGS=common_opts)
env.Append(LDPATH=[ld_path])
env.Append(LIBS=['OpenSLES']) env.Append(LIBS=['OpenSLES'])
# env.Append(LIBS=['c','m','stdc++','log','EGL','GLESv1_CM','GLESv2','OpenSLES','supc++','android'])
env.Append(LIBS=['EGL', 'OpenSLES', 'android']) env.Append(LIBS=['EGL', 'OpenSLES', 'android'])
env.Append(LIBS=['c', 'm', 'stdc++', 'log', 'GLESv1_CM', 'GLESv2', 'z']) env.Append(LIBS=['log', 'GLESv1_CM', 'GLESv2', 'z'])
env["LINKFLAGS"] = string.split(" -g --sysroot=" + ld_sysroot + " -Wl,--no-undefined -Wl,-z,noexecstack ") if (sys.platform.startswith("darwin")):
env.Append(LINKFLAGS=["-Wl,-soname,libgodot_android.so"]) env['SHLIBSUFFIX'] = '.so'
if (env["target"] == "release"): env['LINKFLAGS'] = ['-shared', '--sysroot=' +
sysroot, '-Wl,--warn-shared-textrel',
'-Wl,--threads']
env.Append(LINKFLAGS=string.split(
'-Wl,--fix-cortex-a8'))
env.Append(LINKFLAGS=string.split(
'-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now'))
env.Append(LINKFLAGS=string.split(
'-Wl,-soname,libgodot_android.so -Wl,--gc-sections'))
env.Append(LINKFLAGS=target_opts)
env.Append(LINKFLAGS=common_opts)
env.Append(CCFLAGS=['-O2', '-ffast-math', '-fomit-frame-pointer']) env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + '/toolchains/arm-linux-androideabi-4.9/prebuilt/' +
host_subpath + '/lib/gcc/' + abi_subpath + '/4.9.x'])
elif (env["target"] == "release_debug"): env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] +
'/toolchains/arm-linux-androideabi-4.9/prebuilt/' + host_subpath + '/' + abi_subpath + '/lib'])
env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
if (env["target"].startswith("release")):
env.Append(LINKFLAGS=['-O2'])
env.Append(CPPFLAGS=['-O2', '-DNDEBUG', '-ffast-math',
'-funsafe-math-optimizations', '-fomit-frame-pointer'])
if (can_vectorize):
env.Append(CPPFLAGS=['-ftree-vectorize'])
if (env["target"] == "release_debug"):
env.Append(CPPFLAGS=['-DDEBUG_ENABLED'])
elif (env["target"] == "debug"): elif (env["target"] == "debug"):
env.Append(LINKFLAGS=['-O0'])
env.Append(CPPFLAGS=['-O0', '-D_DEBUG', '-UNDEBUG', '-DDEBUG_ENABLED',
'-DDEBUG_MEMORY_ALLOC', '-g', '-fno-limit-debug-info'])
env.Append(CCFLAGS=['-D_DEBUG', '-g1', '-Wall', '-O0', '-DDEBUG_ENABLED']) env.Append(CPPFLAGS=['-DANDROID_ENABLED',
env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC']) '-DUNIX_ENABLED', '-DNO_FCNTL', '-DMPC_FIXED_POINT'])
env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL', '-DMPC_FIXED_POINT'])
# env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
# TODO: Move that to opus module's config # TODO: Move that to opus module's config
if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"): if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
@ -214,40 +245,22 @@ def configure(env):
env.opus_fixed_point = "yes" env.opus_fixed_point = "yes"
if (env['android_stl'] == 'yes'): if (env['android_stl'] == 'yes'):
# env.Append(CCFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/system/include"]) env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] +
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/include"]) "/sources/cxx-stl/gnu-libstdc++/4.9/include"])
if env['android_arch'] == 'x86': env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] +
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"]) "/sources/cxx-stl/gnu-libstdc++/4.9/libs/" + arch_subpath + "/include"])
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"]) env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] +
elif env['android_arch'] == 'armv6': "/sources/cxx-stl/gnu-libstdc++/4.9/libs/" + arch_subpath])
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"]) env.Append(LIBS=["gnustl_static"])
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
elif env["android_arch"] == "armv7":
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include"])
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
env.Append(LIBS=["gnustl_static", "supc++"])
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cpufeatures"])
# env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/stlport/stlport"])
# env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"])
# env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libstdc++.a"])
else: else:
env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions', '-DNO_SAFE_CAST'])
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/include"])
env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cpufeatures"])
if env['android_arch'] == 'x86':
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
elif env["android_arch"] == "armv6":
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
elif env["android_arch"] == "armv7":
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
env.Append(LIBS=['gnustl_static'])
env.Append(CCFLAGS=["-fno-exceptions", '-DNO_SAFE_CAST'])
import methods import methods
env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) env.Append(BUILDERS={'GLSL120': env.Builder(
env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) env.Append(BUILDERS={'GLSL': env.Builder(
action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
env.Append(BUILDERS={'GLSL120GLES': env.Builder(
action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
env.use_windows_spawn_fix() env.use_windows_spawn_fix()