diff options
| author | reduz <juan@okamstudio.com> | 2015-12-26 10:27:04 -0300 |
|---|---|---|
| committer | reduz <juan@okamstudio.com> | 2015-12-26 10:27:04 -0300 |
| commit | 9d9520f227d58c2499e906d72002cf631e40f4c8 (patch) | |
| tree | d2f238c5048c4aeb199e28b39117559ccd42318c /drivers/png/SCsub | |
| parent | 13964f59c1359473980916ea1f930fef1c28331a (diff) | |
| parent | dfd7bdb00528eb9a45e21a5c99d0e76bd642e74c (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/png/SCsub')
| -rw-r--r-- | drivers/png/SCsub | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 9ee066cbb2..5532e28ade 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -23,15 +23,18 @@ png_sources = [ ] 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"): - png_sources.append(env_neon.Object("#drivers/png/filter_neon.S")) - + 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 |