diff options
| author | punto- <ariel@godotengine.org> | 2015-12-23 11:20:29 -0300 |
|---|---|---|
| committer | punto- <ariel@godotengine.org> | 2015-12-23 11:20:29 -0300 |
| commit | 380fe0bd529990f06df9dd831055fec979246b9c (patch) | |
| tree | b93764644f9dbeb77aec046ab03c411e336c33ed | |
| parent | 6cfede11e3e1e4e4c9d970024010a304af1c2e4c (diff) | |
| parent | 92cc8fcc742a9b6e55baeac5627321b59cc5af64 (diff) | |
Merge pull request #3124 from mrezai/libpng-ios
Fix ios libpng link error
| -rw-r--r-- | drivers/png/SCsub | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 5682a5667e..5532e28ade 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -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 |