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

67 lines
1.5 KiB
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
#!/usr/bin/env python
Import('env')
Import('env_modules')
env_speex = env_modules.Clone()
# Thirdparty source files
scons: Reorder options for clarity Also prefix all thirdparty-related toggles with `builtin`. (cherry picked from commit cc95d4448c6005c3007c8460f09b8be1595eb3c0)
2016-11-03 00:23:55 +01:00
if (env['builtin_speex'] != 'no'):
style: Start applying PEP8 to Python files, indentation issues Done with `autopep8 --select=E1`, fixes: - E101 - Reindent all lines. - E112 - Fix under-indented comments. - E113 - Fix over-indented comments. - E115 - Fix under-indented comments. - E116 - Fix over-indented comments. - E121 - Fix a badly indented line. - E122 - Fix a badly indented line. - E123 - Fix a badly indented line. - E124 - Fix a badly indented line. - E125 - Fix indentation undistinguish from the next logical line. - E126 - Fix a badly indented line. - E127 - Fix a badly indented line. - E128 - Fix a badly indented line. - E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
thirdparty_dir = "#thirdparty/speex/"
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
style: Start applying PEP8 to Python files, indentation issues Done with `autopep8 --select=E1`, fixes: - E101 - Reindent all lines. - E112 - Fix under-indented comments. - E113 - Fix over-indented comments. - E115 - Fix under-indented comments. - E116 - Fix over-indented comments. - E121 - Fix a badly indented line. - E122 - Fix a badly indented line. - E123 - Fix a badly indented line. - E124 - Fix a badly indented line. - E125 - Fix indentation undistinguish from the next logical line. - E126 - Fix a badly indented line. - E127 - Fix a badly indented line. - E128 - Fix a badly indented line. - E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
thirdparty_sources = [
"bits.c",
"buffer.c",
"cb_search.c",
"exc_10_16_table.c",
"exc_10_32_table.c",
"exc_20_32_table.c",
"exc_5_256_table.c",
"exc_5_64_table.c",
"exc_8_128_table.c",
"fftwrap.c",
"filterbank.c",
"filters.c",
"gain_table.c",
"gain_table_lbr.c",
"hexc_10_32_table.c",
"hexc_table.c",
"high_lsp_tables.c",
"jitter.c",
"kiss_fft.c",
"kiss_fftr.c",
"lpc.c",
"lsp.c",
"lsp_tables_nb.c",
"ltp.c",
"mdf.c",
"modes.c",
"modes_wb.c",
"nb_celp.c",
"preprocess.c",
"quant_lsp.c",
"resample.c",
"sb_celp.c",
"scal.c",
"smallft.c",
"speex.c",
"speex_callbacks.c",
"speex_header.c",
"stereo.c",
"vbr.c",
"vq.c",
"window.c",
]
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
style: Start applying PEP8 to Python files, indentation issues Done with `autopep8 --select=E1`, fixes: - E101 - Reindent all lines. - E112 - Fix under-indented comments. - E113 - Fix over-indented comments. - E115 - Fix under-indented comments. - E116 - Fix over-indented comments. - E121 - Fix a badly indented line. - E122 - Fix a badly indented line. - E123 - Fix a badly indented line. - E124 - Fix a badly indented line. - E125 - Fix indentation undistinguish from the next logical line. - E126 - Fix a badly indented line. - E127 - Fix a badly indented line. - E128 - Fix a badly indented line. - E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01: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
style: Start applying PEP8 to Python files, indentation issues Done with `autopep8 --select=E1`, fixes: - E101 - Reindent all lines. - E112 - Fix under-indented comments. - E113 - Fix over-indented comments. - E115 - Fix under-indented comments. - E116 - Fix over-indented comments. - E121 - Fix a badly indented line. - E122 - Fix a badly indented line. - E123 - Fix a badly indented line. - E124 - Fix a badly indented line. - E125 - Fix indentation undistinguish from the next logical line. - E126 - Fix a badly indented line. - E127 - Fix a badly indented line. - E128 - Fix a badly indented line. - E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
env_speex.add_source_files(env.modules_sources, thirdparty_sources)
style: Fix PEP8 whitespace issues in Python files Done with `autopep8 --select=E2,W2`, fixes: - E201 - Remove extraneous whitespace. - E202 - Remove extraneous whitespace. - E203 - Remove extraneous whitespace. - E211 - Remove extraneous whitespace. - E221 - Fix extraneous whitespace around keywords. - E222 - Fix extraneous whitespace around keywords. - E223 - Fix extraneous whitespace around keywords. - E224 - Remove extraneous whitespace around operator. - E225 - Fix missing whitespace around operator. - E226 - Fix missing whitespace around operator. - E227 - Fix missing whitespace around operator. - E228 - Fix missing whitespace around operator. - E231 - Add missing whitespace. - E231 - Fix various deprecated code (via lib2to3). - E241 - Fix extraneous whitespace around keywords. - E242 - Remove extraneous whitespace around operator. - E251 - Remove whitespace around parameter '=' sign. - E261 - Fix spacing after comment hash. - E262 - Fix spacing after comment hash. - E265 - Format block comments. - E271 - Fix extraneous whitespace around keywords. - E272 - Fix extraneous whitespace around keywords. - E273 - Fix extraneous whitespace around keywords. - E274 - Fix extraneous whitespace around keywords. - W291 - Remove trailing whitespace. - W293 - Remove trailing whitespace.
2016-11-02 22:28:28 +01:00
env_speex.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
style: Start applying PEP8 to Python files, indentation issues Done with `autopep8 --select=E1`, fixes: - E101 - Reindent all lines. - E112 - Fix under-indented comments. - E113 - Fix over-indented comments. - E115 - Fix under-indented comments. - E116 - Fix over-indented comments. - E121 - Fix a badly indented line. - E122 - Fix a badly indented line. - E123 - Fix a badly indented line. - E124 - Fix a badly indented line. - E125 - Fix indentation undistinguish from the next logical line. - E126 - Fix a badly indented line. - E127 - Fix a badly indented line. - E128 - Fix a badly indented line. - E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
# also requires libogg
scons: Reorder options for clarity Also prefix all thirdparty-related toggles with `builtin`. (cherry picked from commit cc95d4448c6005c3007c8460f09b8be1595eb3c0)
2016-11-03 00:23:55 +01:00
if (env['builtin_libogg'] != 'no'):
style: Fix PEP8 whitespace issues in Python files Done with `autopep8 --select=E2,W2`, fixes: - E201 - Remove extraneous whitespace. - E202 - Remove extraneous whitespace. - E203 - Remove extraneous whitespace. - E211 - Remove extraneous whitespace. - E221 - Fix extraneous whitespace around keywords. - E222 - Fix extraneous whitespace around keywords. - E223 - Fix extraneous whitespace around keywords. - E224 - Remove extraneous whitespace around operator. - E225 - Fix missing whitespace around operator. - E226 - Fix missing whitespace around operator. - E227 - Fix missing whitespace around operator. - E228 - Fix missing whitespace around operator. - E231 - Add missing whitespace. - E231 - Fix various deprecated code (via lib2to3). - E241 - Fix extraneous whitespace around keywords. - E242 - Remove extraneous whitespace around operator. - E251 - Remove whitespace around parameter '=' sign. - E261 - Fix spacing after comment hash. - E262 - Fix spacing after comment hash. - E265 - Format block comments. - E271 - Fix extraneous whitespace around keywords. - E272 - Fix extraneous whitespace around keywords. - E273 - Fix extraneous whitespace around keywords. - E274 - Fix extraneous whitespace around keywords. - W291 - Remove trailing whitespace. - W293 - Remove trailing whitespace.
2016-11-02 22:28:28 +01:00
env_speex.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
# Module files
env_speex.add_source_files(env.modules_sources, "*.cpp")
Reference in a new issue Copy permalink