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

48 lines
975 B
Text
Raw Normal View History

ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
2016-10-12 20:37:38 +02:00
Import('env')
Import('env_modules')
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_vorbis = env_modules.Clone()
ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
2016-10-12 20:37:38 +02:00
# Thirdparty source files
if (env["libvorbis"] != "system"): # builtin
thirdparty_dir = "#thirdparty/libvorbis/"
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 = [
ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
2016-10-12 20:37:38 +02:00
#"analysis.c",
#"barkmel.c",
"bitrate.c",
"block.c",
"codebook.c",
"envelope.c",
"floor0.c",
"floor1.c",
"info.c",
"lookup.c",
"lpc.c",
"lsp.c",
"mapping0.c",
"mdct.c",
"psy.c",
#"psytune.c",
"registry.c",
"res0.c",
"sharedbook.c",
"smallft.c",
"synthesis.c",
#"tone.c",
#"vorbisenc.c",
"vorbisfile.c",
"window.c",
]
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 = [thirdparty_dir + file for file in thirdparty_sources]
ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
2016-10-12 20:37:38 +02:00
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_vorbis.add_source_files(env.modules_sources, thirdparty_sources)
env_vorbis.Append(CPPPATH = [thirdparty_dir])
ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
2016-10-12 20:37:38 +02:00
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
# also requires libogg
if (env["libogg"] != "system"): # builtin
env_vorbis.Append(CPPPATH = ["#thirdparty/libogg"])
ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs Took the opportunity to undo the Godot changed made to the opus source. The opus module should eventually be built in its own environment to avoid polluting others with too many include dirs and defines. TODO: Fix the platform/ stuff for opus. (cherry picked from commit d9a291f6411f2e571c181da0ac89f550ba73f681) speex module was only added while cherry-picking, as speex is removed in the master branch but we don't want to break compatibility in 2.1.x. Unbundling wasn't done as the module uses the internal speex_free, so it would require some more work.
2016-10-12 20:37:38 +02:00
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
# Godot source files
env_vorbis.add_source_files(env.modules_sources, "*.cpp")
Reference in a new issue Copy permalink