Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add build option for MP1/MP2 audio format support.

Browse Source 
Enabling this adds 3.5k to the template size (Win/64bits).

Co-authored-by: Riteo <riteo@posteo.net>
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
This commit is contained in:
Ithamar R. Adema 2023-02-05 10:58:35 +01:00 committed by Ithamar R. Adema
parent 0ca8542329
commit 36ff0591f2
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@ -375,6 +375,8 @@ for name, path in modules_detected.items():
else: else:
enabled = False enabled = False
opts.Add(BoolVariable("module_" + name + "_enabled", "Enable module '%s'" % (name,), enabled))
# Add module-specific options. # Add module-specific options.
try: try:
for opt in config.get_opts(selected_platform): for opt in config.get_opts(selected_platform):
@ -384,7 +386,6 @@ for name, path in modules_detected.items():
sys.path.remove(path) sys.path.remove(path)
sys.modules.pop("config") sys.modules.pop("config")
opts.Add(BoolVariable("module_" + name + "_enabled", "Enable module '%s'" % (name,), enabled))
methods.write_modules(modules_detected) methods.write_modules(modules_detected)

3
modules/minimp3/SCsub
View File

@ -13,5 +13,8 @@ if not env.msvc:
else: else:
env_minimp3.Prepend(CPPPATH=[thirdparty_dir]) env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
if not env["minimp3_extra_formats"]:
env_minimp3.Append(CPPDEFINES=["MINIMP3_ONLY_MP3"])
# Godot source files # Godot source files
env_minimp3.add_source_files(env.modules_sources, "*.cpp") env_minimp3.add_source_files(env.modules_sources, "*.cpp")

1
modules/minimp3/audio_stream_mp3.cpp
View File

@ -28,7 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/ /**************************************************************************/
#define MINIMP3_ONLY_MP3
#define MINIMP3_FLOAT_OUTPUT #define MINIMP3_FLOAT_OUTPUT
#define MINIMP3_IMPLEMENTATION #define MINIMP3_IMPLEMENTATION
#define MINIMP3_NO_STDIO #define MINIMP3_NO_STDIO

8
modules/minimp3/config.py
View File

@ -2,6 +2,14 @@ def can_build(env, platform):
return True return True
def get_opts(platform):
from SCons.Variables import BoolVariable
return [
BoolVariable("minimp3_extra_formats", "Build minimp3 with MP1/MP2 decoding support", False),
]
def configure(env): def configure(env):
pass pass

4
modules/minimp3/resource_importer_mp3.cpp
View File

@ -47,6 +47,10 @@ String ResourceImporterMP3::get_visible_name() const {
} }
void ResourceImporterMP3::get_recognized_extensions(List<String> *p_extensions) const { void ResourceImporterMP3::get_recognized_extensions(List<String> *p_extensions) const {
#ifndef MINIMP3_ONLY_MP3
p_extensions->push_back("mp1");
p_extensions->push_back("mp2");
#endif
p_extensions->push_back("mp3"); p_extensions->push_back("mp3");
} }