diff options
| author | volzhs | 2016-03-07 21:20:32 +0900 |
|---|---|---|
| committer | Rémi Verschelde | 2016-04-02 21:58:09 +0200 |
| commit | 7ad50eaea82eee85f74941b6d5a45ebb10b31b6e (patch) | |
| tree | 2a700b32e6bf51b5dae7a3962c66e39e3839e8bb | |
| parent | 83887ae16dbe5eb887e48c108232fc98a50a36a7 (diff) | |
| download | godot-7ad50eaea82eee85f74941b6d5a45ebb10b31b6e.tar.gz godot-7ad50eaea82eee85f74941b6d5a45ebb10b31b6e.tar.zst godot-7ad50eaea82eee85f74941b6d5a45ebb10b31b6e.zip | |
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.
(cherry picked from commit db89a47e282bd30bc73f43802d5987319060b3c5)
| -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 5532e28ad..df521de3e 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"]) |