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

fix drivers build on ios

This commit is contained in:
Ariel Manzur 2016-05-21 21:07:34 -03:00
parent 12bd9ee6f2
commit 4c4d79e3c9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/png/SCsub
View File

@ -1,4 +1,5 @@
Import('env') Import('env')
Import('env_drivers')
png_sources = [ png_sources = [
@ -25,7 +26,7 @@ png_sources = [
# Currently .ASM filter_neon.S does not compile on NT. # Currently .ASM filter_neon.S does not compile on NT.
import os import os
if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt": if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt":
env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"]) env_drivers.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']
@ -33,7 +34,7 @@ if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt":
png_sources.append(env_neon.Object("#drivers/png/arm/arm_init.c")) 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/filter_neon.S"))
else: else:
env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"]) env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"])
env.drivers_sources+=png_sources env.drivers_sources+=png_sources