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

Revert "minimp3: Add a .cpp file to simplify building the single-header implementation"

Browse source 
This reverts commit 6fc0912137.
This commit is contained in:
Rémi Verschelde 2023-06-19 13:34:56 +02:00
parent cdfaf8a10f
commit c79183817d
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/minimp3/SCsub
View file

@ -5,27 +5,13 @@ Import("env_modules")
env_minimp3 = env_modules.Clone()
# Thirdparty source files
thirdparty_obj = []
thirdparty_dir = "#thirdparty/minimp3/"
thirdparty_sources = [thirdparty_dir + "minimp3_ex.cpp"]
env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
env_thirdparty = env_minimp3.Clone()
env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
env.modules_sources += thirdparty_obj
# Treat minimp3 headers as system headers to avoid raising warnings. Not supported on MSVC.
if not env.msvc:
env_minimp3.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
else:
env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
# Godot source files
module_obj = []
env_minimp3.add_source_files(module_obj, "*.cpp")
env.modules_sources += module_obj
# Needed to force rebuilding the module files when the thirdparty library is updated.
env.Depends(module_obj, thirdparty_obj)
env_minimp3.add_source_files(env.modules_sources, "*.cpp")

5
modules/minimp3/audio_stream_mp3.cpp
View file

@ -28,6 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#define MINIMP3_ONLY_MP3
#define MINIMP3_FLOAT_OUTPUT
#define MINIMP3_IMPLEMENTATION
#define MINIMP3_NO_STDIO
#include "audio_stream_mp3.h"
#include "core/io/file_access.h"

1
thirdparty/README.md vendored
View file

@ -416,7 +416,6 @@ Files extracted from upstream repository:
Some changes have been made in order to fix Windows on ARM build errors, and
to solve some MSVC warnings. See the patches in the `patches` directory.
`minimp3_ex.cpp` was created to simplify the use of the single header library.
## miniupnpc

5
thirdparty/minimp3/minimp3_ex.cpp vendored
View file

@ -1,5 +0,0 @@
#define MINIMP3_IMPLEMENTATION
#define MINIMP3_FLOAT_OUTPUT
#define MINIMP3_ONLY_MP3
#define MINIMP3_NO_STDIO
#include "minimp3_ex.h"