godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 db89a47e28)
This commit is contained in:
volzhs 2016-03-07 21:20:32 +09:00 committed by Rémi Verschelde
parent 83887ae16d
commit 7ad50eaea8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/png/SCsub
View File

@ -22,17 +22,16 @@ png_sources = [
"png/image_loader_png.cpp" "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.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 png_sources.append(env_neon.Object("#drivers/png/arm/arm_init.c"))
# Currently .ASM filter_neon.S does not compile on NT. png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S"))
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"))
else: else:
env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"]) env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"])