asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
virtualx-engine/drivers/png/SCsub

47 lines
1.5 KiB
Text
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Import('env')
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
env_png = env.Clone()
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
# Thirdparty source files
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
if (env["libpng"] == "builtin"):
thirdparty_dir = "#thirdparty/libpng/"
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
thirdparty_sources = [
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
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",
]
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
# 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":
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=2"])
env_neon = env_png.Clone();
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
if "S_compiler" in env:
env_neon['CC'] = env['S_compiler']
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
#env_neon.Append(CPPFLAGS = ["-DPNG_ARM_NEON"])
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
thirdparty_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c"))
thirdparty_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S"))
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
else:
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=0"])
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
#env_png.add_source_files(env.drivers_sources, thirdparty_sources)
modules: Clone env in each module This allows to pass include paths and flags only to a given thirdparty library, thus preventing conflicts between their files (e.g. between opus and openssl which both provide modes.h. This also has the nice effect of making the compilation command smaller for each module as it no longer related to all other modules, only the final linking brings them together. This however requires adding manually the ogg include path in opus and vorbis when building against the builtin ogg, since it is no longer in the global env. Also simplified template 'thirdparty_<module>_sources' to 'thirdparty_sources'. "Core" modules like cscript, gdscript, gridmap, ik and virtual_script still use the main env_modules, but it could be changed if need be. (cherry picked from commit da09c6131bcdace7e8e62c3dabc62890e9564c97) Obviously removed the parts about enet and visual_script.
2016-10-13 18:54:00 +02:00
env.drivers_sources += thirdparty_sources # Concatenation necessary for neon objects it seems?
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
env_png.Append(CPPPATH = [thirdparty_dir])
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
drivers: Refactor SCsub and drop redundant env_drivers clone The reordering of the SConscript includes allows to ensure that stuff like the builtin zlib headers will be available for libpng. Also moved glew back into global env, otherwise windows seems not to find it... Kind of shooting in the dark with this multi-env setup. (cherry picked from commit 248bc9159c0b515e3e276db644744161283881ef)
2016-10-15 12:39:28 +02:00
# Godot source files
env_png.add_source_files(env.drivers_sources, "*.cpp")
png: Split library to thirdparty dir and allow unbundling 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. (cherry picked from commit 5fef84a1358310304cb1114924525ec4df794b49)
2016-10-09 23:36:17 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Export('env')
Reference in a new issue Copy permalink