diff options
| author | volzhs <volzhs@gmail.com> | 2016-03-07 21:20:32 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2016-03-07 21:20:32 +0900 |
| commit | db89a47e282bd30bc73f43802d5987319060b3c5 (patch) | |
| tree | 8c2c6cc1b4f18aa7c2cd67ec8d01d8a1e48a184c /drivers | |
| parent | 17e92a896e0ced75e868517687cf900239afa010 (diff) | |
This will disable png arm neon optimizing for android template if compile on windows, but make compiling successful.
And arm neon opt is enabled if not on windows.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/png/SCsub | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 5532e28ade..df521de3eb 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -22,17 +22,16 @@ png_sources = [ "png/image_loader_png.cpp" ] -if ("neon_enabled" in env and env["neon_enabled"]): +# Currently .ASM filter_neon.S does not compile on NT. +import os +if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt": 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"]) - import os - # Currently .ASM filter_neon.S does not compile on NT. - if (os.name!="nt"): - 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/arm_init.c")) + png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S")) else: env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"]) |