diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-08-08 11:14:28 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-08 11:14:28 -0300 |
| commit | 0a139aaef9971416715375c813a51a1a451245e1 (patch) | |
| tree | 0dbbf2ece60ce1336b1e4e9fa706d453bdc4420b /drivers/png | |
| parent | b3dff195e031c4ecce4e7d055e184f41420493c1 (diff) | |
| parent | 9983ceecf25a4110793aeeae0378b2b50316f34d (diff) | |
Merge pull request #2302 from antonyjones67/AndroidTemplateCompileWindows
Fixes compile bug for Android template on Windows.
Diffstat (limited to 'drivers/png')
| -rw-r--r-- | drivers/png/SCsub | 5 |
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 |