diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 15:36:18 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 18:10:19 +0200 |
| commit | e57042e8a93e4f3d65cc91633f5af0daedf69a2a (patch) | |
| tree | 8b01d3e28a2496ac30381329341a4f3263cbe0be /drivers | |
| parent | 248bc9159c0b515e3e276db644744161283881ef (diff) | |
png: Try to fix neon issue on iphone armv7
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/png/SCsub | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub index d1dab15ed4..1e3f54a9ca 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -6,22 +6,26 @@ env_png = env.Clone() if (env["libpng"] == "builtin"): thirdparty_dir = "#thirdparty/libpng/" thirdparty_sources = [ - thirdparty_dir + "png.c", - thirdparty_dir + "pngerror.c", - thirdparty_dir + "pngget.c", - thirdparty_dir + "pngmem.c", - thirdparty_dir + "pngpread.c", - thirdparty_dir + "pngread.c", - thirdparty_dir + "pngrio.c", - thirdparty_dir + "pngrtran.c", - thirdparty_dir + "pngrutil.c", - thirdparty_dir + "pngset.c", - thirdparty_dir + "pngtrans.c", - thirdparty_dir + "pngwio.c", - thirdparty_dir + "pngwrite.c", - thirdparty_dir + "pngwtran.c", - thirdparty_dir + "pngwutil.c", + "png.c", + "pngerror.c", + "pngget.c", + "pngmem.c", + "pngpread.c", + "pngread.c", + "pngrio.c", + "pngrtran.c", + "pngrutil.c", + "pngset.c", + "pngtrans.c", + "pngwio.c", + "pngwrite.c", + "pngwtran.c", + "pngwutil.c", ] + thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] + + env_png.add_source_files(env.drivers_sources, thirdparty_sources) + env_png.Append(CPPPATH = [thirdparty_dir]) # Currently .ASM filter_neon.S does not compile on NT. import os @@ -30,16 +34,14 @@ if (env["libpng"] == "builtin"): env_neon = env_png.Clone(); if "S_compiler" in env: env_neon['CC'] = env['S_compiler'] - #env_neon.Append(CPPFLAGS = ["-DPNG_ARM_NEON"]) - thirdparty_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c")) - thirdparty_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S")) + neon_sources = [] + neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c")) + neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon_intrinsics.c")) + neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S")) + env.drivers_sources += neon_sources else: env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=0"]) - #env_png.add_source_files(env.drivers_sources, thirdparty_sources) - env.drivers_sources += thirdparty_sources # Concatenation necessary for neon objects it seems? - env_png.Append(CPPPATH = [thirdparty_dir]) - # Godot source files env_png.add_source_files(env.drivers_sources, "*.cpp") |