summaryrefslogtreecommitdiff
path: root/drivers/png
diff options
context:
space:
mode:
authorAnton Yabchinskiy <arn@bestmx.ru>2015-11-02 20:25:01 +0300
committerAnton Yabchinskiy <arn@bestmx.ru>2015-11-02 20:25:01 +0300
commit3b9868d2e44740c03861c64020a8b5d4d6da031d (patch)
tree8ff5f9671122f946487848ce286d336c9b650c2c /drivers/png
parentdc8df8a91a995796f0f330bf6bb6b209f6dfce08 (diff)
parentb2f9acb8c96aed0505cbac21661e21e4acef710f (diff)
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'drivers/png')
-rw-r--r--drivers/png/SCsub5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub
index c3919567bc..7b937d4dfb 100644
--- a/drivers/png/SCsub
+++ b/drivers/png/SCsub
@@ -27,7 +27,10 @@ if ("neon_enabled" in env and env["neon_enabled"]):
if "S_compiler" in env:
env_neon['CC'] = env['S_compiler']
env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
- png_sources.append(env_neon.Object("#drivers/png/filter_neon.S"))
+ 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"))
env.drivers_sources+=png_sources