Merge pull request #3124 from mrezai/libpng-ios
Fix ios libpng link error
This commit is contained in:
commit
380fe0bd52
|
@ -23,17 +23,18 @@ png_sources = [
|
||||||
]
|
]
|
||||||
|
|
||||||
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();
|
env_neon = env.Clone();
|
||||||
if "S_compiler" in env:
|
if "S_compiler" in env:
|
||||||
env_neon['CC'] = env['S_compiler']
|
env_neon['CC'] = env['S_compiler']
|
||||||
env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
|
#env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
|
||||||
import os
|
import os
|
||||||
# Currently .ASM filter_neon.S does not compile on NT.
|
# Currently .ASM filter_neon.S does not compile on NT.
|
||||||
if (os.name!="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/arm_init.c"))
|
||||||
png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S"))
|
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
|
env.drivers_sources+=png_sources
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue