Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

png: Split library to thirdparty dir and allow unbundling

Browse source 
Uses the new structure agreed upon in #6157, but the thirdparty/ folder
does not behave following a logic similar to that of modules/ yet.

The png driver can't be moved to a module as discussed in #6157, as it's
required by core together with a few other ImageLoader implementations
(see drivers/register_driver_types.cpp:register_core_driver_types())

Dropped the possibility to disable PNG support, it's a core component
of Godot.
This commit is contained in:
Rémi Verschelde 2016-10-09 23:36:17 +02:00
parent 17f06202b7
commit 5fef84a135
35 changed files with 203 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

73
drivers/png/SCsub
View file

@ -1,42 +1,49 @@
Import('env')
Import('env_drivers')
# Thirdparty source files
png_sources = [
"png/png.c",
"png/pngerror.c",
"png/pngget.c",
"png/pngmem.c",
"png/pngpread.c",
"png/pngread.c",
"png/pngrio.c",
"png/pngrtran.c",
"png/pngrutil.c",
"png/pngset.c",
"png/pngtrans.c",
"png/pngwio.c",
"png/pngwrite.c",
"png/pngwtran.c",
"png/pngwutil.c",
"png/resource_saver_png.cpp",
"png/image_loader_png.cpp"
]
if (env["libpng"] == "builtin"):
thirdparty_dir = "#thirdparty/libpng/"
thirdparty_png_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",
]
# 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_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"])
env_neon = env_drivers.Clone();
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/arm/arm_init.c"))
png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S"))
else:
env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"])
# 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_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"])
env_neon = env_drivers.Clone();
if "S_compiler" in env:
env_neon['CC'] = env['S_compiler']
#env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"])
thirdparty_png_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c"))
thirdparty_png_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S"))
else:
env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"])
env.drivers_sources+=png_sources
#env_drivers.add_source_files(env.drivers_sources, thirdparty_png_sources)
env.drivers_sources += thirdparty_png_sources # Concatenation necessary for neon objects it seems?
env_drivers.Append(CPPPATH = [thirdparty_dir])
#env.add_source_files(env.drivers_sources, png_sources)
# Godot's own source files
env_drivers.add_source_files(env.drivers_sources, "*.cpp")
Export('env_drivers')
Export('env')