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

Fix android export templates build

Browse source 
This commit fixes errors occurring during Android export template
builds.
This required modification in third-party library (libpng) to compile
with NEON. Most likely a similar patch will be applied by them and we
could then replace the modified version.
This commit is contained in:
Ruslan Mustakov 2017-07-20 01:27:42 +07:00
parent 45b498c4e0
commit fbb27a0c43
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
platform/android/detect.py
View file

@ -87,20 +87,6 @@ def configure(env):
env['SPAWN'] = mySpawn env['SPAWN'] = mySpawn
## Build type
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"):
env.Append(LINKFLAGS=['-O0'])
env.Append(CPPFLAGS=['-O0', '-D_DEBUG', '-UNDEBUG', '-DDEBUG_ENABLED',
'-DDEBUG_MEMORY_ENABLED', '-g', '-fno-limit-debug-info'])
## Architecture ## Architecture
if env['android_arch'] not in ['armv7', 'armv6', 'x86']: if env['android_arch'] not in ['armv7', 'armv6', 'x86']:
@ -133,6 +119,20 @@ def configure(env):
else: else:
env.extra_suffix = ".armv7" + env.extra_suffix env.extra_suffix = ".armv7" + env.extra_suffix
## Build type
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"):
env.Append(LINKFLAGS=['-O0'])
env.Append(CPPFLAGS=['-O0', '-D_DEBUG', '-UNDEBUG', '-DDEBUG_ENABLED',
'-DDEBUG_MEMORY_ENABLED', '-g', '-fno-limit-debug-info'])
## Compiler configuration ## Compiler configuration
env['SHLIBSUFFIX'] = '.so' env['SHLIBSUFFIX'] = '.so'

2
thirdparty/libpng/pngpriv.h vendored
View file

@ -464,7 +464,7 @@
static_cast<type>(static_cast<void*>(value)) static_cast<type>(static_cast<void*>(value))
# define png_aligncastconst(type, value) \ # define png_aligncastconst(type, value) \
static_cast<type>(static_cast<const void*>(value)) static_cast<type>(static_cast<const void*>(value))
#else #elif !defined(__ASSEMBLER__)
# define png_voidcast(type, value) (value) # define png_voidcast(type, value) (value)
# ifdef _WIN64 # ifdef _WIN64
# ifdef __GNUC__ # ifdef __GNUC__