diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-18 12:41:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-18 12:41:21 +0100 |
| commit | 7f6b62cef0127b4cf7994d917e18e7005c524bfb (patch) | |
| tree | 583b33fe120ceca3bf27502eb6c8692dda16ac13 /modules/vorbis/SCsub | |
| parent | a2d3ba33728230eacdf4a5b0e48c89a5c4b24eb1 (diff) | |
| download | redot-engine-7f6b62cef0127b4cf7994d917e18e7005c524bfb.tar.gz | |
opus/vorbis: Remove dead code not used since 3.0
Since the new audio system in 3.0 we switched the OGG support to
stb_vorbis, and the Opus stream support was disabled as incompatible
(see #7496).
We still build the libraries as they are needed by the theora and webm
modules, but we don't need any Godot code apart from `register_types`.
Fixes #7496.
Diffstat (limited to 'modules/vorbis/SCsub')
| -rw-r--r-- | modules/vorbis/SCsub | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/vorbis/SCsub b/modules/vorbis/SCsub index 3824fdd789..bde4359595 100644 --- a/modules/vorbis/SCsub +++ b/modules/vorbis/SCsub @@ -3,6 +3,9 @@ Import('env') Import('env_modules') +# Only kept to build the thirdparty library used by the theora and webm +# modules. We now use stb_vorbis for AudioStreamOGGVorbis. + env_vorbis = env_modules.Clone() stub = True @@ -50,9 +53,5 @@ if env['builtin_libvorbis']: env_thirdparty.disable_warnings() env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) -if not stub: - # Module files - env_vorbis.add_source_files(env.modules_sources, "*.cpp") -else: - # Module files - env_vorbis.add_source_files(env.modules_sources, "stub/register_types.cpp") +# Module files +env_vorbis.add_source_files(env.modules_sources, "register_types.cpp") |