Merge pull request #3124 from mrezai/libpng-ios

Fix ios libpng link error
This commit is contained in:
punto- 2015-12-23 11:20:29 -03:00
commit 380fe0bd52

View file

@ -22,18 +22,19 @@ png_sources = [
"png/image_loader_png.cpp"
]
if ("neon_enabled" in env and env["neon_enabled"]):
if ("neon_enabled" in env and env["neon_enabled"]):
env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"])
env_neon = env.Clone();
if "S_compiler" in env:
env_neon['CC'] = env['S_compiler']
env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
#env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
import os
# Currently .ASM filter_neon.S does not compile on NT.
if (os.name!="nt"):
env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"])
png_sources.append(env_neon.Object("#drivers/png/arm/arm_init.c"))
png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S"))
else:
env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"])
env.drivers_sources+=png_sources